diff --git a/extras/audio plugin host/Source/GraphEditorPanel.cpp b/extras/audio plugin host/Source/GraphEditorPanel.cpp
index 2514de2a78..e98811d5dc 100644
--- a/extras/audio plugin host/Source/GraphEditorPanel.cpp	
+++ b/extras/audio plugin host/Source/GraphEditorPanel.cpp	
@@ -108,7 +108,7 @@ PluginWindow* PluginWindow::getWindowFor (AudioProcessorGraph::Node* node,
 
 PluginWindow::~PluginWindow()
 {
-    activePluginWindows.removeValue (this);
+    activePluginWindows.removeFirstMatchingValue (this);
     clearContentComponent();
 }
 
diff --git a/extras/the jucer/src/ui/jucer_TestComponent.cpp b/extras/the jucer/src/ui/jucer_TestComponent.cpp
index 9b4e622e0c..8ded3fd1d5 100644
--- a/extras/the jucer/src/ui/jucer_TestComponent.cpp	
+++ b/extras/the jucer/src/ui/jucer_TestComponent.cpp	
@@ -45,7 +45,7 @@ TestComponent::TestComponent (JucerDocument* const ownerDocument_,
 
 TestComponent::~TestComponent()
 {
-    testComponents.removeValue (this);
+    testComponents.removeFirstMatchingValue (this);
     deleteAllChildren();
     delete loadedDocument;
 }
diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
index 40906782c8..990c4febe7 100644
--- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
@@ -311,7 +311,7 @@ public:
             deleteTempChannels();
 
             jassert (activePlugins.contains (this));
-            activePlugins.removeValue (this);
+            activePlugins.removeFirstMatchingValue (this);
         }
 
         if (activePlugins.size() == 0)
diff --git a/modules/juce_video/native/juce_mac_CameraDevice.mm b/modules/juce_video/native/juce_mac_CameraDevice.mm
index 2a471dd71f..3c225a4d56 100644
--- a/modules/juce_video/native/juce_mac_CameraDevice.mm
+++ b/modules/juce_video/native/juce_mac_CameraDevice.mm
@@ -145,7 +145,7 @@ public:
     void removeListener (CameraDevice::Listener* listenerToRemove)
     {
         const ScopedLock sl (listenerLock);
-        listeners.removeValue (listenerToRemove);
+        listeners.removeFirstMatchingValue (listenerToRemove);
 
         if (listeners.size() == 0)
             [session removeOutput: imageOutput];
diff --git a/modules/juce_video/native/juce_win32_CameraDevice.cpp b/modules/juce_video/native/juce_win32_CameraDevice.cpp
index d47ab0feca..eaf95a76c3 100644
--- a/modules/juce_video/native/juce_win32_CameraDevice.cpp
+++ b/modules/juce_video/native/juce_win32_CameraDevice.cpp
@@ -400,7 +400,7 @@ public:
     void removeListener (CameraDevice::Listener* listenerToRemove)
     {
         const ScopedLock sl (listenerLock);
-        listeners.removeValue (listenerToRemove);
+        listeners.removeFirstMatchingValue (listenerToRemove);
 
         if (listeners.size() == 0)
             removeUser();
@@ -438,7 +438,7 @@ public:
         {
             if (owner != nullptr)
             {
-                owner->viewerComps.removeValue (this);
+                owner->viewerComps.removeFirstMatchingValue (this);
                 owner->removeUser();
                 owner->removeChangeListener (this);
             }