diff --git a/extras/Projucer/Source/Licenses/jucer_LicenseController.h b/extras/Projucer/Source/Licenses/jucer_LicenseController.h
index d970d2968b..8070027cea 100644
--- a/extras/Projucer/Source/Licenses/jucer_LicenseController.h
+++ b/extras/Projucer/Source/Licenses/jucer_LicenseController.h
@@ -103,9 +103,6 @@ private:
    #if ! JUCER_ENABLE_GPL_MODE
     //==============================================================================
     struct ModalCompletionCallback;
-    friend struct ModalCompletionCallback;
-
-    friend struct ContainerDeletePolicy<LicenseThread>;
     friend struct LicenseThread;
 
     //==============================================================================
diff --git a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
index adbfa99fdb..c8a262fbc3 100644
--- a/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
+++ b/modules/juce_audio_devices/audio_io/juce_AudioDeviceManager.h
@@ -504,8 +504,6 @@ private:
 
     //==============================================================================
     class CallbackHandler;
-    friend class CallbackHandler;
-    friend struct ContainerDeletePolicy<CallbackHandler>;
     std::unique_ptr<CallbackHandler> callbackHandler;
 
     void audioDeviceIOCallbackInt (const float** inputChannelData, int totalNumInputChannels,
diff --git a/modules/juce_audio_devices/native/juce_linux_Midi.cpp b/modules/juce_audio_devices/native/juce_linux_Midi.cpp
index ad33f5517e..3e446a0765 100644
--- a/modules/juce_audio_devices/native/juce_linux_Midi.cpp
+++ b/modules/juce_audio_devices/native/juce_linux_Midi.cpp
@@ -38,6 +38,37 @@ namespace
 class AlsaClient  : public ReferenceCountedObject
 {
 public:
+    AlsaClient()
+    {
+        jassert (instance == nullptr);
+
+        snd_seq_open (&handle, "default", SND_SEQ_OPEN_DUPLEX, 0);
+
+        if (handle != nullptr)
+        {
+            snd_seq_nonblock (handle, SND_SEQ_NONBLOCK);
+            snd_seq_set_client_name (handle, JUCE_ALSA_MIDI_NAME);
+            clientId = snd_seq_client_id (handle);
+
+            // It's good idea to pre-allocate a good number of elements
+            ports.ensureStorageAllocated (32);
+        }
+    }
+
+    ~AlsaClient()
+    {
+        jassert (instance != nullptr);
+        instance = nullptr;
+
+        if (handle != nullptr)
+            snd_seq_close (handle);
+
+        jassert (activeCallbacks.get() == 0);
+
+        if (inputThread)
+            inputThread->stopThread (3000);
+    }
+
     using Ptr = ReferenceCountedObjectPtr<AlsaClient>;
 
     //==============================================================================
@@ -251,42 +282,6 @@ private:
 
     static AlsaClient* instance;
 
-    //==============================================================================
-    friend class ReferenceCountedObjectPtr<AlsaClient>;
-    friend struct ContainerDeletePolicy<AlsaClient>;
-
-    AlsaClient()
-    {
-        jassert (instance == nullptr);
-
-        snd_seq_open (&handle, "default", SND_SEQ_OPEN_DUPLEX, 0);
-
-        if (handle != nullptr)
-        {
-            snd_seq_nonblock (handle, SND_SEQ_NONBLOCK);
-            snd_seq_set_client_name (handle, JUCE_ALSA_MIDI_NAME);
-            clientId = snd_seq_client_id (handle);
-
-            // It's good idea to pre-allocate a good number of elements
-            ports.ensureStorageAllocated (32);
-        }
-    }
-
-    ~AlsaClient()
-    {
-        jassert (instance != nullptr);
-
-        instance = nullptr;
-
-        if (handle != nullptr)
-            snd_seq_close (handle);
-
-        jassert (activeCallbacks.get() == 0);
-
-        if (inputThread)
-            inputThread->stopThread (3000);
-    }
-
     //==============================================================================
     class MidiInputThread   : public Thread
     {
diff --git a/modules/juce_audio_formats/format/juce_AudioFormatWriter.h b/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
index 3231dc87c2..16f699b295 100644
--- a/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
+++ b/modules/juce_audio_formats/format/juce_AudioFormatWriter.h
@@ -240,7 +240,6 @@ public:
 
     private:
         class Buffer;
-        friend struct ContainerDeletePolicy<Buffer>;
         std::unique_ptr<Buffer> buffer;
     };
 
diff --git a/modules/juce_audio_processors/scanning/juce_PluginListComponent.h b/modules/juce_audio_processors/scanning/juce_PluginListComponent.h
index d7d71ffb77..53a228ff43 100644
--- a/modules/juce_audio_processors/scanning/juce_PluginListComponent.h
+++ b/modules/juce_audio_processors/scanning/juce_PluginListComponent.h
@@ -113,8 +113,6 @@ private:
     std::unique_ptr<TableListBoxModel> tableModel;
 
     class Scanner;
-    friend class Scanner;
-    friend struct ContainerDeletePolicy<Scanner>;
     std::unique_ptr<Scanner> currentScanner;
 
     void scanFinished (const StringArray&);
diff --git a/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.h b/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.h
index ed9557541c..3730bc95c4 100644
--- a/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.h
+++ b/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.h
@@ -197,7 +197,6 @@ public:
 
     private:
         struct Pimpl;
-        friend struct ContainerDeletePolicy<Pimpl>;
         std::unique_ptr<Pimpl> pimpl;
         JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SliderAttachment)
     };
@@ -226,7 +225,6 @@ public:
 
     private:
         struct Pimpl;
-        friend struct ContainerDeletePolicy<Pimpl>;
         std::unique_ptr<Pimpl> pimpl;
         JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ComboBoxAttachment)
     };
@@ -250,7 +248,6 @@ public:
 
     private:
         struct Pimpl;
-        friend struct ContainerDeletePolicy<Pimpl>;
         std::unique_ptr<Pimpl> pimpl;
         JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ButtonAttachment)
     };
diff --git a/modules/juce_audio_utils/audio_cd/juce_AudioCDBurner.h b/modules/juce_audio_utils/audio_cd/juce_AudioCDBurner.h
index cca1367565..b74019dda1 100644
--- a/modules/juce_audio_utils/audio_cd/juce_AudioCDBurner.h
+++ b/modules/juce_audio_utils/audio_cd/juce_AudioCDBurner.h
@@ -162,7 +162,6 @@ private:
     AudioCDBurner (const int deviceIndex);
 
     class Pimpl;
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<Pimpl> pimpl;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioCDBurner)
diff --git a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h
index f57fc69358..a589f9c415 100644
--- a/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h
+++ b/modules/juce_audio_utils/gui/juce_AudioDeviceSelectorComponent.h
@@ -105,7 +105,6 @@ private:
     const bool hideAdvancedOptionsWithButton;
 
     class MidiInputSelectorComponentListBox;
-    friend struct ContainerDeletePolicy<MidiInputSelectorComponentListBox>;
     std::unique_ptr<MidiInputSelectorComponentListBox> midiInputsList;
     std::unique_ptr<ComboBox> midiOutputSelector;
     std::unique_ptr<Label> midiInputsLabel, midiOutputLabel;
diff --git a/modules/juce_audio_utils/gui/juce_AudioThumbnail.h b/modules/juce_audio_utils/gui/juce_AudioThumbnail.h
index 2b9b19bba1..50e1bcaa59 100644
--- a/modules/juce_audio_utils/gui/juce_AudioThumbnail.h
+++ b/modules/juce_audio_utils/gui/juce_AudioThumbnail.h
@@ -201,13 +201,6 @@ private:
     class ThumbData;
     class CachedWindow;
 
-    friend class LevelDataSource;
-    friend class ThumbData;
-    friend class CachedWindow;
-    friend struct ContainerDeletePolicy<LevelDataSource>;
-    friend struct ContainerDeletePolicy<ThumbData>;
-    friend struct ContainerDeletePolicy<CachedWindow>;
-
     std::unique_ptr<LevelDataSource> source;
     std::unique_ptr<CachedWindow> window;
     OwnedArray<ThumbData> channels;
diff --git a/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h b/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h
index b3ab04107b..3608fbc38d 100644
--- a/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h
+++ b/modules/juce_audio_utils/gui/juce_AudioThumbnailCache.h
@@ -106,7 +106,6 @@ private:
     TimeSliceThread thread;
 
     class ThumbnailCacheEntry;
-    friend struct ContainerDeletePolicy<ThumbnailCacheEntry>;
     OwnedArray<ThumbnailCacheEntry> thumbs;
     CriticalSection lock;
     int maxNumThumbsToStore;
diff --git a/modules/juce_audio_utils/gui/juce_AudioVisualiserComponent.h b/modules/juce_audio_utils/gui/juce_AudioVisualiserComponent.h
index f08292a38a..d900314286 100644
--- a/modules/juce_audio_utils/gui/juce_AudioVisualiserComponent.h
+++ b/modules/juce_audio_utils/gui/juce_AudioVisualiserComponent.h
@@ -121,8 +121,6 @@ public:
 
 private:
     struct ChannelInfo;
-    friend struct ChannelInfo;
-    friend struct ContainerDeletePolicy<ChannelInfo>;
 
     OwnedArray<ChannelInfo> channels;
     int numSamples, inputSamplesPerBlock;
diff --git a/modules/juce_core/containers/juce_Variant.h b/modules/juce_core/containers/juce_Variant.h
index a50118c8ec..f4c1dfb376 100644
--- a/modules/juce_core/containers/juce_Variant.h
+++ b/modules/juce_core/containers/juce_Variant.h
@@ -286,18 +286,18 @@ public:
 
 private:
     //==============================================================================
-    class VariantType;            friend class VariantType;
-    class VariantType_Void;       friend class VariantType_Void;
-    class VariantType_Undefined;  friend class VariantType_Undefined;
-    class VariantType_Int;        friend class VariantType_Int;
-    class VariantType_Int64;      friend class VariantType_Int64;
-    class VariantType_Double;     friend class VariantType_Double;
-    class VariantType_Bool;       friend class VariantType_Bool;
-    class VariantType_String;     friend class VariantType_String;
-    class VariantType_Object;     friend class VariantType_Object;
-    class VariantType_Array;      friend class VariantType_Array;
-    class VariantType_Binary;     friend class VariantType_Binary;
-    class VariantType_Method;     friend class VariantType_Method;
+    class VariantType;
+    class VariantType_Void;
+    class VariantType_Undefined;
+    class VariantType_Int;
+    class VariantType_Int64;
+    class VariantType_Double;
+    class VariantType_Bool;
+    class VariantType_String;
+    class VariantType_Object;
+    class VariantType_Array;
+    class VariantType_Binary;
+    class VariantType_Method;
 
     union ValueUnion
     {
diff --git a/modules/juce_core/files/juce_DirectoryIterator.h b/modules/juce_core/files/juce_DirectoryIterator.h
index 631a4512c8..2ad9d3264a 100644
--- a/modules/juce_core/files/juce_DirectoryIterator.h
+++ b/modules/juce_core/files/juce_DirectoryIterator.h
@@ -118,9 +118,8 @@ public:
 
 private:
     //==============================================================================
-    class NativeIterator
+    struct NativeIterator
     {
-    public:
         NativeIterator (const File& directory, const String& wildCard);
         ~NativeIterator();
 
@@ -129,16 +128,11 @@ private:
                    Time* modTime, Time* creationTime, bool* isReadOnly);
 
         class Pimpl;
-
-    private:
-        friend class DirectoryIterator;
-        friend struct ContainerDeletePolicy<Pimpl>;
         std::unique_ptr<Pimpl> pimpl;
 
         JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (NativeIterator)
     };
 
-    friend struct ContainerDeletePolicy<NativeIterator::Pimpl>;
     StringArray wildCards;
     NativeIterator fileFinder;
     String wildCard, path;
diff --git a/modules/juce_core/maths/juce_Expression.h b/modules/juce_core/maths/juce_Expression.h
index 09ef93b734..c64143d691 100644
--- a/modules/juce_core/maths/juce_Expression.h
+++ b/modules/juce_core/maths/juce_Expression.h
@@ -243,10 +243,6 @@ private:
     //==============================================================================
     class Term;
     struct Helpers;
-    friend class Term;
-    friend struct Helpers;
-    friend struct ContainerDeletePolicy<Term>;
-    friend class ReferenceCountedObjectPtr<Term>;
     ReferenceCountedObjectPtr<Term> term;
 
     explicit Expression (Term*);
diff --git a/modules/juce_core/network/juce_URL.h b/modules/juce_core/network/juce_URL.h
index 784de7a590..2e45b4053f 100644
--- a/modules/juce_core/network/juce_URL.h
+++ b/modules/juce_core/network/juce_URL.h
@@ -537,7 +537,6 @@ private:
         JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Upload)
     };
 
-    friend struct ContainerDeletePolicy<Upload>;
     ReferenceCountedArray<Upload> filesToUpload;
 
   #if JUCE_IOS
diff --git a/modules/juce_core/text/juce_LocalisedStrings.h b/modules/juce_core/text/juce_LocalisedStrings.h
index 70793f645c..1ff0e47447 100644
--- a/modules/juce_core/text/juce_LocalisedStrings.h
+++ b/modules/juce_core/text/juce_LocalisedStrings.h
@@ -191,7 +191,6 @@ private:
     StringArray countryCodes;
     StringPairArray translations;
     std::unique_ptr<LocalisedStrings> fallback;
-    friend struct ContainerDeletePolicy<LocalisedStrings>;
 
     void loadFromText (const String&, bool ignoreCase);
 
diff --git a/modules/juce_core/threads/juce_ChildProcess.h b/modules/juce_core/threads/juce_ChildProcess.h
index 3efbc6ffd1..dc5feb20dd 100644
--- a/modules/juce_core/threads/juce_ChildProcess.h
+++ b/modules/juce_core/threads/juce_ChildProcess.h
@@ -104,7 +104,6 @@ public:
 private:
     //==============================================================================
     class ActiveProcess;
-    friend struct ContainerDeletePolicy<ActiveProcess>;
     std::unique_ptr<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 b017ea3693..2ac0db3f26 100644
--- a/modules/juce_core/threads/juce_HighResolutionTimer.h
+++ b/modules/juce_core/threads/juce_HighResolutionTimer.h
@@ -94,8 +94,6 @@ public:
 
 private:
     struct Pimpl;
-    friend struct Pimpl;
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<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 6e38766cd7..58f2e6d4cd 100644
--- a/modules/juce_core/threads/juce_InterProcessLock.h
+++ b/modules/juce_core/threads/juce_InterProcessLock.h
@@ -110,7 +110,6 @@ public:
 private:
     //==============================================================================
     class Pimpl;
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<Pimpl> pimpl;
 
     CriticalSection lock;
diff --git a/modules/juce_core/threads/juce_ThreadPool.h b/modules/juce_core/threads/juce_ThreadPool.h
index 68ab026480..a358114322 100644
--- a/modules/juce_core/threads/juce_ThreadPool.h
+++ b/modules/juce_core/threads/juce_ThreadPool.h
@@ -322,8 +322,6 @@ private:
 
     struct ThreadPoolThread;
     friend class ThreadPoolJob;
-    friend struct ThreadPoolThread;
-    friend struct ContainerDeletePolicy<ThreadPoolThread>;
     OwnedArray<ThreadPoolThread> threads;
 
     CriticalSection lock;
diff --git a/modules/juce_core/zip/juce_GZIPCompressorOutputStream.h b/modules/juce_core/zip/juce_GZIPCompressorOutputStream.h
index 4359973eb0..151c56cdf5 100644
--- a/modules/juce_core/zip/juce_GZIPCompressorOutputStream.h
+++ b/modules/juce_core/zip/juce_GZIPCompressorOutputStream.h
@@ -100,7 +100,6 @@ private:
     OptionalScopedPointer<OutputStream> destStream;
 
     class GZIPCompressorHelper;
-    friend struct ContainerDeletePolicy<GZIPCompressorHelper>;
     std::unique_ptr<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 4d0b38a757..031fad89e8 100644
--- a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h
+++ b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.h
@@ -90,7 +90,6 @@ private:
     HeapBlock<uint8> buffer;
 
     class GZIPDecompressHelper;
-    friend struct ContainerDeletePolicy<GZIPDecompressHelper>;
     std::unique_ptr<GZIPDecompressHelper> helper;
 
    #if JUCE_CATCH_DEPRECATED_CODE_MISUSE
diff --git a/modules/juce_core/zip/juce_ZipFile.h b/modules/juce_core/zip/juce_ZipFile.h
index 8aaae9d830..88fab01cba 100644
--- a/modules/juce_core/zip/juce_ZipFile.h
+++ b/modules/juce_core/zip/juce_ZipFile.h
@@ -224,7 +224,6 @@ public:
         //==============================================================================
     private:
         struct 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 3eac83abf6..dd254ec28b 100644
--- a/modules/juce_data_structures/undomanager/juce_UndoManager.h
+++ b/modules/juce_data_structures/undomanager/juce_UndoManager.h
@@ -246,7 +246,6 @@ public:
 private:
     //==============================================================================
     struct ActionSet;
-    friend struct ContainerDeletePolicy<ActionSet>;
     OwnedArray<ActionSet> transactions, stashedFutureTransactions;
     String newTransactionName;
     int totalUnitsStored = 0, maxNumUnitsToKeep = 0, minimumTransactionsToKeep = 0, nextIndex = 0;
diff --git a/modules/juce_events/interprocess/juce_ConnectedChildProcess.h b/modules/juce_events/interprocess/juce_ConnectedChildProcess.h
index 0e522e25a6..5cd8564f77 100644
--- a/modules/juce_events/interprocess/juce_ConnectedChildProcess.h
+++ b/modules/juce_events/interprocess/juce_ConnectedChildProcess.h
@@ -104,8 +104,6 @@ public:
 
 private:
     struct Connection;
-    friend struct Connection;
-    friend struct ContainerDeletePolicy<Connection>;
     std::unique_ptr<Connection> connection;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ChildProcessSlave)
@@ -194,8 +192,6 @@ private:
     std::unique_ptr<ChildProcess> childProcess;
 
     struct Connection;
-    friend struct Connection;
-    friend struct ContainerDeletePolicy<Connection>;
     std::unique_ptr<Connection> connection;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ChildProcessMaster)
diff --git a/modules/juce_events/interprocess/juce_InterprocessConnection.h b/modules/juce_events/interprocess/juce_InterprocessConnection.h
index 26b723368e..43e207a0de 100644
--- a/modules/juce_events/interprocess/juce_InterprocessConnection.h
+++ b/modules/juce_events/interprocess/juce_InterprocessConnection.h
@@ -197,9 +197,8 @@ private:
     int readData (void*, int);
 
     struct ConnectionThread;
-    friend struct ConnectionThread;
-    friend struct ContainerDeletePolicy<ConnectionThread>;
     std::unique_ptr<ConnectionThread> thread;
+
     void runThread();
     int writeData (void*, int);
 
diff --git a/modules/juce_events/messages/juce_ApplicationBase.h b/modules/juce_events/messages/juce_ApplicationBase.h
index bb083585b5..d34a3fb1a6 100644
--- a/modules/juce_events/messages/juce_ApplicationBase.h
+++ b/modules/juce_events/messages/juce_ApplicationBase.h
@@ -290,8 +290,6 @@ private:
     bool stillInitialising = true;
 
     struct MultipleInstanceHandler;
-    friend struct MultipleInstanceHandler;
-    friend struct ContainerDeletePolicy<MultipleInstanceHandler>;
     std::unique_ptr<MultipleInstanceHandler> multipleInstanceHandler;
 
     JUCE_DECLARE_NON_COPYABLE (JUCEApplicationBase)
diff --git a/modules/juce_events/messages/juce_MountedVolumeListChangeDetector.h b/modules/juce_events/messages/juce_MountedVolumeListChangeDetector.h
index d9883da2df..d1bade84a7 100644
--- a/modules/juce_events/messages/juce_MountedVolumeListChangeDetector.h
+++ b/modules/juce_events/messages/juce_MountedVolumeListChangeDetector.h
@@ -48,7 +48,6 @@ public:
 
 private:
     JUCE_PUBLIC_IN_DLL_BUILD (struct Pimpl)
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<Pimpl> pimpl;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MountedVolumeListChangeDetector)
diff --git a/modules/juce_graphics/fonts/juce_CustomTypeface.h b/modules/juce_graphics/fonts/juce_CustomTypeface.h
index 4d8de59260..4794d58f8a 100644
--- a/modules/juce_graphics/fonts/juce_CustomTypeface.h
+++ b/modules/juce_graphics/fonts/juce_CustomTypeface.h
@@ -155,9 +155,8 @@ protected:
 private:
     //==============================================================================
     class GlyphInfo;
-    friend struct ContainerDeletePolicy<GlyphInfo>;
     OwnedArray<GlyphInfo> glyphs;
-    short lookupTable [128];
+    short lookupTable[128];
 
     GlyphInfo* findGlyph (const juce_wchar character, bool loadIfNeeded) noexcept;
 
diff --git a/modules/juce_graphics/fonts/juce_Typeface.h b/modules/juce_graphics/fonts/juce_Typeface.h
index 425e2d06bf..0c6c17ac53 100644
--- a/modules/juce_graphics/fonts/juce_Typeface.h
+++ b/modules/juce_graphics/fonts/juce_Typeface.h
@@ -153,7 +153,6 @@ protected:
 
 private:
     struct HintingParams;
-    friend struct ContainerDeletePolicy<HintingParams>;
     std::unique_ptr<HintingParams> hintingParams;
     CriticalSection hintingLock;
 
diff --git a/modules/juce_graphics/native/juce_RenderingHelpers.h b/modules/juce_graphics/native/juce_RenderingHelpers.h
index 9ac3ae20b1..8561580336 100644
--- a/modules/juce_graphics/native/juce_RenderingHelpers.h
+++ b/modules/juce_graphics/native/juce_RenderingHelpers.h
@@ -208,7 +208,6 @@ public:
     }
 
 private:
-    friend struct ContainerDeletePolicy<CachedGlyphType>;
     ReferenceCountedArray<CachedGlyphType> glyphs;
     Atomic<int> accessCounter, hits, misses;
     CriticalSection lock;
diff --git a/modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h b/modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h
index 473ca1703b..ff39e0642b 100644
--- a/modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h
+++ b/modules/juce_graphics/native/juce_win32_Direct2DGraphicsContext.h
@@ -96,8 +96,6 @@ private:
     Rectangle<int> bounds;
 
     struct Pimpl;
-    friend struct Pimpl;
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<Pimpl> pimpl;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Direct2DLowLevelGraphicsContext)
diff --git a/modules/juce_gui_basics/buttons/juce_Button.h b/modules/juce_gui_basics/buttons/juce_Button.h
index edea4b7a02..e078d4b721 100644
--- a/modules/juce_gui_basics/buttons/juce_Button.h
+++ b/modules/juce_gui_basics/buttons/juce_Button.h
@@ -482,8 +482,6 @@ private:
     ListenerList<Listener> buttonListeners;
 
     struct CallbackHelper;
-    friend struct CallbackHelper;
-    friend struct ContainerDeletePolicy<CallbackHelper>;
     std::unique_ptr<CallbackHelper> callbackHelper;
     uint32 buttonPressTime = 0, lastRepeatTime = 0;
     ApplicationCommandManager* commandManagerToUse = nullptr;
diff --git a/modules/juce_gui_basics/components/juce_Component.h b/modules/juce_gui_basics/components/juce_Component.h
index c101c3ecf0..d711d94428 100644
--- a/modules/juce_gui_basics/components/juce_Component.h
+++ b/modules/juce_gui_basics/components/juce_Component.h
@@ -2280,8 +2280,6 @@ private:
     std::unique_ptr<CachedComponentImage> cachedImage;
 
     class MouseListenerList;
-    friend class MouseListenerList;
-    friend struct ContainerDeletePolicy<MouseListenerList>;
     std::unique_ptr<MouseListenerList> mouseListeners;
     std::unique_ptr<Array<KeyListener*>> keyListeners;
     ListenerList<ComponentListener> componentListeners;
diff --git a/modules/juce_gui_basics/components/juce_ModalComponentManager.h b/modules/juce_gui_basics/components/juce_ModalComponentManager.h
index 65c6a53155..631bc803fa 100644
--- a/modules/juce_gui_basics/components/juce_ModalComponentManager.h
+++ b/modules/juce_gui_basics/components/juce_ModalComponentManager.h
@@ -141,10 +141,9 @@ protected:
 
 private:
     //==============================================================================
-    struct ModalItem;
-
     friend class Component;
-    friend struct ContainerDeletePolicy<ModalItem>;
+
+    struct ModalItem;
     OwnedArray<ModalItem> stack;
 
     void startModal (Component*, bool autoDelete);
diff --git a/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h b/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h
index 6ab189b56a..83968347aa 100644
--- a/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h
+++ b/modules/juce_gui_basics/layout/juce_ConcertinaPanel.h
@@ -125,11 +125,6 @@ private:
 
     class PanelHolder;
     struct PanelSizes;
-    friend class PanelHolder;
-    friend struct PanelSizes;
-    friend struct ContainerDeletePolicy<PanelSizes>;
-    friend struct ContainerDeletePolicy<PanelHolder>;
-
     std::unique_ptr<PanelSizes> currentSizes;
     OwnedArray<PanelHolder> holders;
     ComponentAnimator animator;
diff --git a/modules/juce_gui_basics/layout/juce_ScrollBar.h b/modules/juce_gui_basics/layout/juce_ScrollBar.h
index 15e5825a8f..038a86558b 100644
--- a/modules/juce_gui_basics/layout/juce_ScrollBar.h
+++ b/modules/juce_gui_basics/layout/juce_ScrollBar.h
@@ -420,7 +420,6 @@ private:
     int initialDelayInMillisecs = 100, repeatDelayInMillisecs = 50, minimumDelayInMillisecs = 10;
     bool vertical, isDraggingThumb = false, autohides = true, userVisibilityFlag = false;
     class ScrollbarButton;
-    friend struct ContainerDeletePolicy<ScrollbarButton>;
     std::unique_ptr<ScrollbarButton> upButton, downButton;
     ListenerList<Listener> listeners;
 
diff --git a/modules/juce_gui_basics/layout/juce_TabbedButtonBar.h b/modules/juce_gui_basics/layout/juce_TabbedButtonBar.h
index 1fc8ec3b0e..1b82b8f103 100644
--- a/modules/juce_gui_basics/layout/juce_TabbedButtonBar.h
+++ b/modules/juce_gui_basics/layout/juce_TabbedButtonBar.h
@@ -359,8 +359,6 @@ private:
     int currentTabIndex = -1;
 
     class BehindFrontTabComp;
-    friend class BehindFrontTabComp;
-    friend struct ContainerDeletePolicy<BehindFrontTabComp>;
     std::unique_ptr<BehindFrontTabComp> behindFrontTab;
     std::unique_ptr<Button> extraTabsButton;
 
diff --git a/modules/juce_gui_basics/layout/juce_Viewport.h b/modules/juce_gui_basics/layout/juce_Viewport.h
index 7f7e7176e0..0bb108e903 100644
--- a/modules/juce_gui_basics/layout/juce_Viewport.h
+++ b/modules/juce_gui_basics/layout/juce_Viewport.h
@@ -322,8 +322,6 @@ private:
     bool vScrollbarRight = true, hScrollbarBottom = true;
 
     struct DragToScrollListener;
-    friend struct DragToScrollListener;
-    friend struct ContainerDeletePolicy<DragToScrollListener>;
     std::unique_ptr<DragToScrollListener> dragToScrollListener;
 
     Point<int> viewportPosToCompPos (Point<int>) const;
diff --git a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h
index 631f878e91..2749448142 100644
--- a/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h
+++ b/modules/juce_gui_basics/mouse/juce_DragAndDropContainer.h
@@ -230,8 +230,6 @@ protected:
 private:
     //==============================================================================
     class DragImageComponent;
-    friend class DragImageComponent;
-    friend struct ContainerDeletePolicy<DragImageComponent>;
     OwnedArray<DragImageComponent> dragImageComponents;
 
     const MouseInputSource* getMouseInputSourceForDrag (Component* sourceComponent, const MouseInputSource* inputSourceCausingDrag);
diff --git a/modules/juce_gui_basics/widgets/juce_Slider.h b/modules/juce_gui_basics/widgets/juce_Slider.h
index b0915897b0..51896dc7a3 100644
--- a/modules/juce_gui_basics/widgets/juce_Slider.h
+++ b/modules/juce_gui_basics/widgets/juce_Slider.h
@@ -977,8 +977,6 @@ public:
 private:
     //==============================================================================
     JUCE_PUBLIC_IN_DLL_BUILD (class Pimpl)
-    friend class Pimpl;
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<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 53dba843fd..48ec7afca7 100644
--- a/modules/juce_gui_basics/widgets/juce_TreeView.h
+++ b/modules/juce_gui_basics/widgets/juce_TreeView.h
@@ -900,15 +900,12 @@ public:
     void itemDropped (const SourceDetails&) override;
 
 private:
+    friend class TreeViewItem;
+
     class ContentComponent;
     class TreeViewport;
     class InsertPointHighlight;
     class TargetGroupHighlight;
-    friend class TreeViewItem;
-    friend class ContentComponent;
-    friend struct ContainerDeletePolicy<TreeViewport>;
-    friend struct ContainerDeletePolicy<InsertPointHighlight>;
-    friend struct ContainerDeletePolicy<TargetGroupHighlight>;
 
     std::unique_ptr<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 dd7b4c8169..31c17d5120 100644
--- a/modules/juce_gui_basics/windows/juce_DocumentWindow.h
+++ b/modules/juce_gui_basics/windows/juce_DocumentWindow.h
@@ -286,7 +286,6 @@ private:
     MenuBarModel* menuBarModel = nullptr;
 
     class ButtonListenerProxy;
-    friend struct ContainerDeletePolicy<ButtonListenerProxy>;
     std::unique_ptr<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 c171a6bc5f..c1db3976a6 100644
--- a/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
+++ b/modules/juce_gui_extra/code_editor/juce_CodeEditorComponent.h
@@ -382,13 +382,9 @@ private:
     ApplicationCommandManager* appCommandManager = nullptr;
 
     class Pimpl;
-    friend class Pimpl;
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<Pimpl> pimpl;
 
     class GutterComponent;
-    friend class GutterComponent;
-    friend struct ContainerDeletePolicy<GutterComponent>;
     std::unique_ptr<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 0bf9ef51a7..89d53723f2 100644
--- a/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h
+++ b/modules/juce_gui_extra/embedding/juce_ActiveXControlComponent.h
@@ -118,7 +118,6 @@ public:
 
 private:
     class Pimpl;
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<Pimpl> control;
     bool mouseEventsAllowed = true;
 
diff --git a/modules/juce_gui_extra/embedding/juce_UIViewComponent.h b/modules/juce_gui_extra/embedding/juce_UIViewComponent.h
index cb34180fc9..72ba9a5157 100644
--- a/modules/juce_gui_extra/embedding/juce_UIViewComponent.h
+++ b/modules/juce_gui_extra/embedding/juce_UIViewComponent.h
@@ -80,7 +80,6 @@ public:
 
 private:
     class Pimpl;
-    friend class Pimpl;
     std::unique_ptr<Pimpl> pimpl;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (UIViewComponent)
diff --git a/modules/juce_gui_extra/embedding/juce_XEmbedComponent.h b/modules/juce_gui_extra/embedding/juce_XEmbedComponent.h
index cc2f6c4fa6..97aebcdb4f 100644
--- a/modules/juce_gui_extra/embedding/juce_XEmbedComponent.h
+++ b/modules/juce_gui_extra/embedding/juce_XEmbedComponent.h
@@ -107,7 +107,6 @@ private:
     friend unsigned long juce_getCurrentFocusWindow (ComponentPeer*);
 
     class Pimpl;
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<Pimpl> pimpl;
 };
 
diff --git a/modules/juce_gui_extra/misc/juce_ColourSelector.h b/modules/juce_gui_extra/misc/juce_ColourSelector.h
index 24b8a6a1eb..7dc4fc1558 100644
--- a/modules/juce_gui_extra/misc/juce_ColourSelector.h
+++ b/modules/juce_gui_extra/misc/juce_ColourSelector.h
@@ -142,10 +142,6 @@ private:
     class ColourComponentSlider;
     class ColourSpaceMarker;
     class HueSelectorMarker;
-    friend class ColourSpaceView;
-    friend struct ContainerDeletePolicy<ColourSpaceView>;
-    friend class 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 2bae03212d..7ea4d94f17 100644
--- a/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h
+++ b/modules/juce_gui_extra/misc/juce_KeyMappingEditorComponent.h
@@ -125,9 +125,6 @@ private:
     class MappingItem;
     class CategoryItem;
     class ItemComponent;
-    friend class TopLevelItem;
-    friend struct ContainerDeletePolicy<ChangeKeyButton>;
-    friend struct ContainerDeletePolicy<TopLevelItem>;
     std::unique_ptr<TopLevelItem> treeItem;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (KeyMappingEditorComponent)
diff --git a/modules/juce_gui_extra/misc/juce_LiveConstantEditor.h b/modules/juce_gui_extra/misc/juce_LiveConstantEditor.h
index a5b8148825..7a2ccd2f18 100644
--- a/modules/juce_gui_extra/misc/juce_LiveConstantEditor.h
+++ b/modules/juce_gui_extra/misc/juce_LiveConstantEditor.h
@@ -220,8 +220,6 @@ namespace LiveConstantEditor
         OwnedArray<CodeDocument> documents;
         Array<File> documentFiles;
         class EditorWindow;
-        friend class EditorWindow;
-        friend struct ContainerDeletePolicy<EditorWindow>;
         Component::SafePointer<EditorWindow> editorWindow;
         CriticalSection lock;
 
diff --git a/modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp b/modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp
index ec05152e2a..6cfd6d0f9d 100644
--- a/modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp
+++ b/modules/juce_gui_extra/native/juce_linux_XEmbedComponent.cpp
@@ -73,9 +73,21 @@ public:
     };
 
     //==============================================================================
-    class SharedKeyWindow : public ReferenceCountedObject
+    struct SharedKeyWindow : public ReferenceCountedObject
     {
-    public:
+        SharedKeyWindow (ComponentPeer* peerToUse)
+            : keyPeer (peerToUse),
+              keyProxy (juce_createKeyProxyWindow (keyPeer))
+        {}
+
+        ~SharedKeyWindow()
+        {
+            juce_deleteKeyProxyWindow (keyPeer);
+
+            auto& keyWindows = getKeyWindows();
+            keyWindows.remove (keyPeer);
+        }
+
         using Ptr = ReferenceCountedObjectPtr<SharedKeyWindow>;
 
         //==============================================================================
@@ -110,21 +122,6 @@ public:
 
     private:
         //==============================================================================
-        friend struct ContainerDeletePolicy<SharedKeyWindow>;
-
-        SharedKeyWindow (ComponentPeer* peerToUse)
-            : keyPeer (peerToUse),
-              keyProxy (juce_createKeyProxyWindow (keyPeer))
-        {}
-
-        ~SharedKeyWindow()
-        {
-            juce_deleteKeyProxyWindow (keyPeer);
-
-            auto& keyWindows = getKeyWindows();
-            keyWindows.remove (keyPeer);
-        }
-
         ComponentPeer* keyPeer;
         Window keyProxy;
 
diff --git a/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h b/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h
index bd661e8901..ee740bc233 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h
+++ b/modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.h
@@ -123,11 +123,9 @@ public:
 
 private:
     class Pimpl;
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<Pimpl> pimpl;
 
     class SavedState;
-    friend struct ContainerDeletePolicy<SavedState>;
     std::unique_ptr<SavedState> savedState;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OpenGLFrameBuffer)
diff --git a/modules/juce_osc/osc/juce_OSCReceiver.h b/modules/juce_osc/osc/juce_OSCReceiver.h
index 4aa29ebb0c..4ad2bea1ea 100644
--- a/modules/juce_osc/osc/juce_OSCReceiver.h
+++ b/modules/juce_osc/osc/juce_OSCReceiver.h
@@ -216,8 +216,6 @@ public:
 private:
     //==============================================================================
     struct Pimpl;
-    friend struct Pimpl;
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<Pimpl> pimpl;
     friend struct OSCReceiverCallbackMessage;
 
diff --git a/modules/juce_osc/osc/juce_OSCSender.h b/modules/juce_osc/osc/juce_OSCSender.h
index 2024a5c35d..d6433ed202 100644
--- a/modules/juce_osc/osc/juce_OSCSender.h
+++ b/modules/juce_osc/osc/juce_OSCSender.h
@@ -141,8 +141,6 @@ public:
 private:
     //==============================================================================
     struct Pimpl;
-    friend struct Pimpl;
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<Pimpl> pimpl;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (OSCSender)
diff --git a/modules/juce_video/capture/juce_CameraDevice.h b/modules/juce_video/capture/juce_CameraDevice.h
index b362d1c634..db1af49ac1 100644
--- a/modules/juce_video/capture/juce_CameraDevice.h
+++ b/modules/juce_video/capture/juce_CameraDevice.h
@@ -220,8 +220,6 @@ private:
     String name;
 
     struct Pimpl;
-    friend struct Pimpl;
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<Pimpl> pimpl;
 
     struct ViewerComponent;
diff --git a/modules/juce_video/playback/juce_VideoComponent.h b/modules/juce_video/playback/juce_VideoComponent.h
index 901653dee5..851fded020 100644
--- a/modules/juce_video/playback/juce_VideoComponent.h
+++ b/modules/juce_video/playback/juce_VideoComponent.h
@@ -172,8 +172,6 @@ public:
 private:
     //==============================================================================
     struct Pimpl;
-    friend struct Pimpl;
-    friend struct ContainerDeletePolicy<Pimpl>;
     std::unique_ptr<Pimpl> pimpl;
 
     void resized() override;