diff --git a/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.h b/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.h
index 4e2a2b3cfb..f696766be2 100644
--- a/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.h
+++ b/extras/Introjucer/Source/Project/jucer_ProjectTreeViewBase.h
@@ -65,32 +65,32 @@ public:
     virtual ProjectTreeViewBase* findTreeViewItem (const Project::Item& itemToFind);
 
     //==============================================================================
-    void valueTreePropertyChanged (ValueTree& tree, const Identifier& property);
-    void valueTreeChildAdded (ValueTree& parentTree, ValueTree& childWhichHasBeenAdded);
-    void valueTreeChildRemoved (ValueTree& parentTree, ValueTree& childWhichHasBeenRemoved);
-    void valueTreeChildOrderChanged (ValueTree& parentTree);
-    void valueTreeParentChanged (ValueTree& tree);
+    void valueTreePropertyChanged (ValueTree& tree, const Identifier& property) override;
+    void valueTreeChildAdded (ValueTree& parentTree, ValueTree& childWhichHasBeenAdded) override;
+    void valueTreeChildRemoved (ValueTree& parentTree, ValueTree& childWhichHasBeenRemoved) override;
+    void valueTreeChildOrderChanged (ValueTree& parentTree) override;
+    void valueTreeParentChanged (ValueTree& tree) override;
 
     //==============================================================================
-    bool mightContainSubItems();
-    String getUniqueName() const;
-    void itemOpennessChanged (bool isNowOpen);
-    bool canBeSelected() const                  { return true; }
-    String getTooltip();
-    var getDragSourceDescription();
-    void addSubItems();
+    bool mightContainSubItems() override;
+    String getUniqueName() const override;
+    void itemOpennessChanged (bool isNowOpen) override;
+    bool canBeSelected() const override                  { return true; }
+    String getTooltip() override;
+    var getDragSourceDescription() override;
+    void addSubItems() override;
 
     //==============================================================================
     // Drag-and-drop stuff..
-    bool isInterestedInFileDrag (const StringArray& files);
-    void filesDropped (const StringArray& files, int insertIndex);
-    bool isInterestedInDragSource (const DragAndDropTarget::SourceDetails& dragSourceDetails);
-    void itemDropped (const DragAndDropTarget::SourceDetails& dragSourceDetails, int insertIndex);
-    int getMillisecsAllowedForDragGesture();
+    bool isInterestedInFileDrag (const StringArray& files) override;
+    void filesDropped (const StringArray& files, int insertIndex) override;
+    bool isInterestedInDragSource (const DragAndDropTarget::SourceDetails& dragSourceDetails) override;
+    void itemDropped (const DragAndDropTarget::SourceDetails& dragSourceDetails, int insertIndex) override;
+    int getMillisecsAllowedForDragGesture() override;
 
     static void getAllSelectedNodesInTree (Component* componentInTree, OwnedArray <Project::Item>& selectedNodes);
 
-    File getDraggableFile() const      { return getFile(); }
+    File getDraggableFile() const override      { return getFile(); }
 
     //==============================================================================
     Project::Item item;
@@ -102,8 +102,8 @@ protected:
     void treeChildrenChanged (const ValueTree& parentTree);
     virtual ProjectTreeViewBase* createSubItem (const Project::Item& node) = 0;
 
-    Icon getIcon() const           { return item.getIcon().withContrastingColourTo (getBackgroundColour()); }
-    bool isIconCrossedOut() const  { return item.isIconCrossedOut(); }
+    Icon getIcon() const override           { return item.getIcon().withContrastingColourTo (getBackgroundColour()); }
+    bool isIconCrossedOut() const override  { return item.isIconCrossedOut(); }
 
     //==============================================================================
     void triggerAsyncRename (const Project::Item& itemToRename);
diff --git a/modules/juce_gui_basics/buttons/juce_Button.h b/modules/juce_gui_basics/buttons/juce_Button.h
index 7010fbedd6..2228881177 100644
--- a/modules/juce_gui_basics/buttons/juce_Button.h
+++ b/modules/juce_gui_basics/buttons/juce_Button.h
@@ -171,7 +171,7 @@ public:
         virtual ~Listener()  {}
 
         /** Called when the button is clicked. */
-        virtual void buttonClicked (Button* button) = 0;
+        virtual void buttonClicked (Button*) = 0;
 
         /** Called when the button's state changes. */
         virtual void buttonStateChanged (Button*)  {}
@@ -281,10 +281,10 @@ public:
 
         @see TooltipClient, TooltipWindow
     */
-    void setTooltip (const String& newTooltip);
+    void setTooltip (const String& newTooltip) override;
 
     // (implementation of the TooltipClient method)
-    String getTooltip();
+    String getTooltip() override;
 
 
     //==============================================================================
diff --git a/modules/juce_gui_basics/components/juce_Component.cpp b/modules/juce_gui_basics/components/juce_Component.cpp
index 1cfb1985ff..299dbafb8c 100644
--- a/modules/juce_gui_basics/components/juce_Component.cpp
+++ b/modules/juce_gui_basics/components/juce_Component.cpp
@@ -1946,10 +1946,10 @@ void Component::paintEntireComponent (Graphics& g, const bool ignoreAlphaLevel)
     {
         const float scale = g.getInternalContext().getPhysicalPixelScaleFactor();
 
-        const Rectangle<int> bounds (getLocalBounds() * scale);
+        const Rectangle<int> scaledBounds (getLocalBounds() * scale);
 
         Image effectImage (flags.opaqueFlag ? Image::RGB : Image::ARGB,
-                           bounds.getWidth(), bounds.getHeight(), ! flags.opaqueFlag);
+                           scaledBounds.getWidth(), scaledBounds.getHeight(), ! flags.opaqueFlag);
         {
             Graphics g2 (effectImage);
             g2.addTransform (AffineTransform::scale (scale));
diff --git a/modules/juce_gui_basics/widgets/juce_ComboBox.h b/modules/juce_gui_basics/widgets/juce_ComboBox.h
index 41b32614a5..be225f91c7 100644
--- a/modules/juce_gui_basics/widgets/juce_ComboBox.h
+++ b/modules/juce_gui_basics/widgets/juce_ComboBox.h
@@ -161,9 +161,7 @@ public:
     String getItemText (int index) const;
 
     /** Returns the ID for one of the items in the list.
-
         Note that this doesn't include headers or separators.
-
         @param index    the item's index from 0 to (getNumItems() - 1)
     */
     int getItemId (int index) const noexcept;
@@ -318,7 +316,7 @@ public:
 
     //==============================================================================
     /** Gives the ComboBox a tooltip. */
-    void setTooltip (const String& newTooltip);
+    void setTooltip (const String& newTooltip) override;
 
 
     //==============================================================================