diff --git a/modules/juce_data_structures/values/juce_Value.cpp b/modules/juce_data_structures/values/juce_Value.cpp
index 6980f76faa..a0db0c4f33 100644
--- a/modules/juce_data_structures/values/juce_Value.cpp
+++ b/modules/juce_data_structures/values/juce_Value.cpp
@@ -162,7 +162,7 @@ public:
 private:
     var value;
 
-    JUCE_DECLARE_NON_COPYABLE (SimpleValueSource)
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SimpleValueSource)
 };
 
 
@@ -172,10 +172,10 @@ Value::Value()
 {
 }
 
-Value::Value (ValueSource* const value_)
-    : value (value_)
+Value::Value (ValueSource* const v)
+    : value (v)
 {
-    jassert (value_ != nullptr);
+    jassert (v != nullptr);
 }
 
 Value::Value (const var& initialValue)
diff --git a/modules/juce_data_structures/values/juce_ValueTree.cpp b/modules/juce_data_structures/values/juce_ValueTree.cpp
index f9362524d6..433505d88a 100644
--- a/modules/juce_data_structures/values/juce_ValueTree.cpp
+++ b/modules/juce_data_structures/values/juce_ValueTree.cpp
@@ -811,7 +811,7 @@ private:
     void valueTreeChildOrderChanged (ValueTree&) {}
     void valueTreeParentChanged (ValueTree&) {}
 
-    JUCE_DECLARE_NON_COPYABLE (ValueTreePropertyValueSource)
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ValueTreePropertyValueSource)
 };
 
 Value ValueTree::getPropertyAsValue (const Identifier& name, UndoManager* const undoManager)