Add missing override and final to destructors.

Also remove some empty destructors.

171 files changed, 156 insertions, 234 deletions

diff --git a/src/gui/dialogsmanager.h b/src/gui/dialogsmanager.h
index 04ace68e2..a033ea8aa 100644
--- a/src/gui/dialogsmanager.h
+++ b/src/gui/dialogsmanager.h
@@ -40,9 +40,6 @@ class DialogsManager final : public AttributeListener,
     public:
         DialogsManager();
 
-        virtual ~DialogsManager()
-        { }
-
         A_DELETE_COPY(DialogsManager)
 
         static void closeDialogs();
diff --git a/src/gui/models/beingslistmodel.h b/src/gui/models/beingslistmodel.h
index a0a9d2920..c3f0d8fff 100644
--- a/src/gui/models/beingslistmodel.h
+++ b/src/gui/models/beingslistmodel.h
@@ -39,7 +39,7 @@ class BeingsListModel final : public AvatarListModel
 
         A_DELETE_COPY(BeingsListModel)
 
-        ~BeingsListModel()
+        ~BeingsListModel() override final
         {
             delete_all(mMembers);
             mMembers.clear();
diff --git a/src/gui/models/colorlistmodel.h b/src/gui/models/colorlistmodel.h
index bb2d413c2..6dca6341b 100644
--- a/src/gui/models/colorlistmodel.h
+++ b/src/gui/models/colorlistmodel.h
@@ -68,9 +68,6 @@ class ColorListModel final : public ListModel
 
         A_DELETE_COPY(ColorListModel)
 
-        ~ColorListModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return 14;
diff --git a/src/gui/models/colormodel.h b/src/gui/models/colormodel.h
index 9d621dfbe..b9677adf4 100644
--- a/src/gui/models/colormodel.h
+++ b/src/gui/models/colormodel.h
@@ -39,7 +39,7 @@ class ColorModel final : public ListModel
 
         A_DELETE_COPY(ColorModel)
 
-        virtual ~ColorModel();
+        ~ColorModel() override final;
 
         int getNumberOfElements() override final A_WARN_UNUSED;
 
diff --git a/src/gui/models/extendednamesmodel.h b/src/gui/models/extendednamesmodel.h
index 2e85a4b2b..c6a7f2941 100644
--- a/src/gui/models/extendednamesmodel.h
+++ b/src/gui/models/extendednamesmodel.h
@@ -32,7 +32,7 @@ class ExtendedNamesModel notfinal : public ExtendedListModel
 
         A_DELETE_COPY(ExtendedNamesModel)
 
-        virtual ~ExtendedNamesModel();
+        ~ExtendedNamesModel() override;
 
         int getNumberOfElements() override final A_WARN_UNUSED;
 
diff --git a/src/gui/models/fontsizechoicelistmodel.h b/src/gui/models/fontsizechoicelistmodel.h
index 79aecf2fb..7372a804f 100644
--- a/src/gui/models/fontsizechoicelistmodel.h
+++ b/src/gui/models/fontsizechoicelistmodel.h
@@ -74,9 +74,6 @@ class FontSizeChoiceListModel final : public ListModel
 
         A_DELETE_COPY(FontSizeChoiceListModel)
 
-        ~FontSizeChoiceListModel()
-        { }
-
         int getNumberOfElements() override final A_WARN_UNUSED
         { return maxFontSizes; }
 
diff --git a/src/gui/models/fontsmodel.h b/src/gui/models/fontsmodel.h
index b7f5fc4be..476406357 100644
--- a/src/gui/models/fontsmodel.h
+++ b/src/gui/models/fontsmodel.h
@@ -36,9 +36,6 @@ class FontsModel final : public NamesModel
         { Theme::fillFontsList(mNames); }
 
         A_DELETE_COPY(FontsModel)
-
-        ~FontsModel()
-        { }
 };
 
 #endif  // GUI_MODELS_FONTSMODEL_H
diff --git a/src/gui/models/iconsmodel.h b/src/gui/models/iconsmodel.h
index 4028895fb..64d25d75d 100644
--- a/src/gui/models/iconsmodel.h
+++ b/src/gui/models/iconsmodel.h
@@ -67,9 +67,6 @@ class IconsModel final : public ListModel
 
         A_DELETE_COPY(IconsModel)
 
-        ~IconsModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return CAST_S32(mStrings.size());
diff --git a/src/gui/models/ignorechoiceslistmodel.h b/src/gui/models/ignorechoiceslistmodel.h
index 6cd8bbe87..be328ab8c 100644
--- a/src/gui/models/ignorechoiceslistmodel.h
+++ b/src/gui/models/ignorechoiceslistmodel.h
@@ -42,9 +42,6 @@ class IgnoreChoicesListModel final : public ListModel
 
         A_DELETE_COPY(IgnoreChoicesListModel)
 
-        ~IgnoreChoicesListModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return CAST_S32(playerRelations.
diff --git a/src/gui/models/itemsmodel.h b/src/gui/models/itemsmodel.h
index a49a7cfc5..0bde3202f 100644
--- a/src/gui/models/itemsmodel.h
+++ b/src/gui/models/itemsmodel.h
@@ -66,9 +66,6 @@ class ItemsModal final : public ListModel
 
         A_DELETE_COPY(ItemsModal)
 
-        ~ItemsModal()
-        { }
-
         int getNumberOfElements() override final
         {
             return CAST_S32(mStrings.size());
diff --git a/src/gui/models/langlistmodel.h b/src/gui/models/langlistmodel.h
index f8c67ad30..e137a740b 100644
--- a/src/gui/models/langlistmodel.h
+++ b/src/gui/models/langlistmodel.h
@@ -111,7 +111,7 @@ class LangListModel final : public ExtendedListModel
 
         A_DELETE_COPY(LangListModel)
 
-        ~LangListModel()
+        ~LangListModel() override final
         {
             for (int f = 0; f < langs_count; f ++)
             {
diff --git a/src/gui/models/magicschoolmodel.h b/src/gui/models/magicschoolmodel.h
index 2dcd01880..ced4a657f 100644
--- a/src/gui/models/magicschoolmodel.h
+++ b/src/gui/models/magicschoolmodel.h
@@ -54,9 +54,6 @@ class MagicSchoolModel final : public ListModel
 
         A_DELETE_COPY(MagicSchoolModel)
 
-        ~MagicSchoolModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return 6;
diff --git a/src/gui/models/modelistmodel.h b/src/gui/models/modelistmodel.h
index ed4d449d7..1d38aca41 100644
--- a/src/gui/models/modelistmodel.h
+++ b/src/gui/models/modelistmodel.h
@@ -37,9 +37,6 @@ class ModeListModel final : public ListModel
 
         A_DELETE_COPY(ModeListModel)
 
-        ~ModeListModel()
-        { }
-
         /**
          * Returns the number of elements in container.
          */
diff --git a/src/gui/models/namesmodel.h b/src/gui/models/namesmodel.h
index a239bd9aa..ffd3c6088 100644
--- a/src/gui/models/namesmodel.h
+++ b/src/gui/models/namesmodel.h
@@ -34,7 +34,7 @@ class NamesModel notfinal : public ListModel
 
         A_DELETE_COPY(NamesModel)
 
-        virtual ~NamesModel();
+        ~NamesModel() override;
 
         int getNumberOfElements() override final A_WARN_UNUSED;
 
diff --git a/src/gui/models/opengllistmodel.h b/src/gui/models/opengllistmodel.h
index 085dd17a5..085054b6e 100644
--- a/src/gui/models/opengllistmodel.h
+++ b/src/gui/models/opengllistmodel.h
@@ -36,9 +36,6 @@ class OpenGLListModel final : public ListModel
 
         A_DELETE_COPY(OpenGLListModel)
 
-        ~OpenGLListModel()
-        { }
-
         int getNumberOfElements() override final
         { return renderModesListSize; }
 
diff --git a/src/gui/models/playerrelationlistmodel.h b/src/gui/models/playerrelationlistmodel.h
index 5e58d4905..954fec9a7 100644
--- a/src/gui/models/playerrelationlistmodel.h
+++ b/src/gui/models/playerrelationlistmodel.h
@@ -56,9 +56,6 @@ class PlayerRelationListModel final : public ListModel
 
         A_DELETE_COPY(PlayerRelationListModel)
 
-        ~PlayerRelationListModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return PlayerRelation::RELATIONS_NR;
diff --git a/src/gui/models/playertablemodel.h b/src/gui/models/playertablemodel.h
index dfb00eeb4..74f806abd 100644
--- a/src/gui/models/playertablemodel.h
+++ b/src/gui/models/playertablemodel.h
@@ -39,7 +39,7 @@ class PlayerTableModel final : public Widget2,
 
         A_DELETE_COPY(PlayerTableModel)
 
-        ~PlayerTableModel();
+        ~PlayerTableModel() override final;
 
         int getRows() const override final;
 
diff --git a/src/gui/models/questsmodel.h b/src/gui/models/questsmodel.h
index f80e7a32d..8ea102128 100644
--- a/src/gui/models/questsmodel.h
+++ b/src/gui/models/questsmodel.h
@@ -32,9 +32,6 @@ class QuestsModel final : public ExtendedNamesModel
         }
 
         A_DELETE_COPY(QuestsModel)
-
-        ~QuestsModel()
-        { }
 };
 
 #endif  // GUI_MODELS_QUESTSMODEL_H
diff --git a/src/gui/models/shopitems.h b/src/gui/models/shopitems.h
index 26c5a94e4..438713ce1 100644
--- a/src/gui/models/shopitems.h
+++ b/src/gui/models/shopitems.h
@@ -59,7 +59,7 @@ class ShopItems final : public ListModel
 
         A_DELETE_COPY(ShopItems)
 
-        ~ShopItems();
+        ~ShopItems() override final;
 
         /**
          * Adds an item to the list.
diff --git a/src/gui/models/sortlistmodelbuy.h b/src/gui/models/sortlistmodelbuy.h
index 3af489222..3ba9d67c3 100644
--- a/src/gui/models/sortlistmodelbuy.h
+++ b/src/gui/models/sortlistmodelbuy.h
@@ -54,9 +54,6 @@ class SortListModelBuy final : public ListModel
 
         A_DELETE_COPY(SortListModelBuy)
 
-        ~SortListModelBuy()
-        { }
-
         int getNumberOfElements() override final
         { return 7; }
 
diff --git a/src/gui/models/sortlistmodelinv.h b/src/gui/models/sortlistmodelinv.h
index 3561d2621..5728fe7e3 100644
--- a/src/gui/models/sortlistmodelinv.h
+++ b/src/gui/models/sortlistmodelinv.h
@@ -51,9 +51,6 @@ class SortListModelInv final : public ListModel
 
         A_DELETE_COPY(SortListModelInv)
 
-        ~SortListModelInv()
-        { }
-
         int getNumberOfElements() override final
         { return 6; }
 
diff --git a/src/gui/models/soundsmodel.h b/src/gui/models/soundsmodel.h
index ad66049a3..fefb5ec29 100644
--- a/src/gui/models/soundsmodel.h
+++ b/src/gui/models/soundsmodel.h
@@ -41,9 +41,6 @@ class SoundsModel final : public NamesModel
         }
 
         A_DELETE_COPY(SoundsModel)
-
-        ~SoundsModel()
-        { }
 };
 
 #endif  // GUI_MODELS_SOUNDSMODEL_H
diff --git a/src/gui/models/tablemodel.h b/src/gui/models/tablemodel.h
index 23f286c2e..1da26e5a5 100644
--- a/src/gui/models/tablemodel.h
+++ b/src/gui/models/tablemodel.h
@@ -103,7 +103,7 @@ class StaticTableModel final : public TableModel
 
         A_DELETE_COPY(StaticTableModel)
 
-        ~StaticTableModel();
+        ~StaticTableModel() override final;
 
         /**
          * Inserts a widget into the table model.
diff --git a/src/gui/models/targettypemodel.h b/src/gui/models/targettypemodel.h
index ec049bf66..a5eed0cdd 100644
--- a/src/gui/models/targettypemodel.h
+++ b/src/gui/models/targettypemodel.h
@@ -45,9 +45,6 @@ class TargetTypeModel final : public ListModel
 
         A_DELETE_COPY(TargetTypeModel)
 
-        ~TargetTypeModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return 3;
diff --git a/src/gui/models/themesmodel.h b/src/gui/models/themesmodel.h
index c68cc0a2f..61bb90cca 100644
--- a/src/gui/models/themesmodel.h
+++ b/src/gui/models/themesmodel.h
@@ -41,9 +41,6 @@ class ThemesModel final : public NamesModel
         }
 
         A_DELETE_COPY(ThemesModel)
-
-        ~ThemesModel()
-        { }
 };
 
 #endif  // GUI_MODELS_THEMESMODEL_H
diff --git a/src/gui/models/touchactionmodel.h b/src/gui/models/touchactionmodel.h
index 2d8cff02a..2e519d7a6 100644
--- a/src/gui/models/touchactionmodel.h
+++ b/src/gui/models/touchactionmodel.h
@@ -34,9 +34,6 @@ class TouchActionsModel final : public NamesModel
 
         A_DELETE_COPY(TouchActionsModel)
 
-        ~TouchActionsModel()
-        { }
-
         InputActionT getActionFromSelection(const int sel) const;
 
         int getSelectionFromAction(const InputActionT action) const;
diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h
index cd4ba50c3..f9e10e34e 100644
--- a/src/gui/models/updatelistmodel.h
+++ b/src/gui/models/updatelistmodel.h
@@ -51,9 +51,6 @@ class UpdateListModel final : public ListModel
 
         A_DELETE_COPY(UpdateListModel)
 
-        ~UpdateListModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return CAST_S32(mNames.size());
diff --git a/src/gui/models/updatetypemodel.h b/src/gui/models/updatetypemodel.h
index 232be8223..2476f085c 100644
--- a/src/gui/models/updatetypemodel.h
+++ b/src/gui/models/updatetypemodel.h
@@ -44,9 +44,6 @@ class UpdateTypeModel final : public ListModel
 
         A_DELETE_COPY(UpdateTypeModel)
 
-        ~UpdateTypeModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return 3;
diff --git a/src/gui/models/worldlistmodel.h b/src/gui/models/worldlistmodel.h
index 3be179c61..e5c164cf7 100644
--- a/src/gui/models/worldlistmodel.h
+++ b/src/gui/models/worldlistmodel.h
@@ -43,9 +43,6 @@ class WorldListModel final : public ListModel
 
         A_DELETE_COPY(WorldListModel)
 
-        ~WorldListModel()
-        { }
-
         int getNumberOfElements() override final
         {
             return CAST_S32(mWorlds.size());
diff --git a/src/gui/popups/beingpopup.h b/src/gui/popups/beingpopup.h
index a14f44568..f19c7dd8a 100644
--- a/src/gui/popups/beingpopup.h
+++ b/src/gui/popups/beingpopup.h
@@ -43,7 +43,7 @@ class BeingPopup final : public Popup
         /**
          * Destructor. Cleans up the being popup on deletion.
          */
-        ~BeingPopup();
+        ~BeingPopup() override final;
 
         /**
          * Sets the info to be displayed given a particular player.
diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h
index fff3b817d..9a2933ccb 100644
--- a/src/gui/popups/itempopup.h
+++ b/src/gui/popups/itempopup.h
@@ -54,7 +54,7 @@ class ItemPopup final : public Popup
         /**
          * Destructor. Cleans up the item popup on deletion.
          */
-        ~ItemPopup();
+        ~ItemPopup() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/popups/skillpopup.h b/src/gui/popups/skillpopup.h
index d62916ed0..99274bd23 100644
--- a/src/gui/popups/skillpopup.h
+++ b/src/gui/popups/skillpopup.h
@@ -49,7 +49,7 @@ class SkillPopup final : public Popup
         /**
          * Destructor. Cleans up the skill popup on deletion.
          */
-        ~SkillPopup();
+        ~SkillPopup() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/popups/spellpopup.h b/src/gui/popups/spellpopup.h
index 6b9d84238..eb6f4fa48 100644
--- a/src/gui/popups/spellpopup.h
+++ b/src/gui/popups/spellpopup.h
@@ -45,7 +45,7 @@ class SpellPopup final : public Popup
         /**
          * Destructor. Cleans up the item popup on deletion.
          */
-        ~SpellPopup();
+        ~SpellPopup() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/popups/statuspopup.h b/src/gui/popups/statuspopup.h
index 6ffff5799..0382bba01 100644
--- a/src/gui/popups/statuspopup.h
+++ b/src/gui/popups/statuspopup.h
@@ -50,7 +50,7 @@ class StatusPopup final : public Popup
         /**
          * Destructor. Cleans up the item popup on deletion.
          */
-        ~StatusPopup();
+        ~StatusPopup() override final;
 
         /**
          * Sets the location to display the item popup.
diff --git a/src/gui/popups/textboxpopup.h b/src/gui/popups/textboxpopup.h
index 8316905ac..93fc10028 100644
--- a/src/gui/popups/textboxpopup.h
+++ b/src/gui/popups/textboxpopup.h
@@ -44,7 +44,7 @@ class TextBoxPopup final : public Popup
         /**
          * Destructor. Cleans up the item popup on deletion.
          */
-        ~TextBoxPopup();
+        ~TextBoxPopup() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/popups/textpopup.h b/src/gui/popups/textpopup.h
index 8a67d5660..b517dba2d 100644
--- a/src/gui/popups/textpopup.h
+++ b/src/gui/popups/textpopup.h
@@ -46,7 +46,7 @@ class TextPopup final : public Popup
         /**
          * Destructor. Cleans up the item popup on deletion.
          */
-        ~TextPopup();
+        ~TextPopup() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/theme.h b/src/gui/theme.h
index e3cc55151..9d6c50815 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -55,7 +55,7 @@ class Theme final : public Palette,
     public:
         Theme();
 
-        ~Theme();
+        ~Theme() override final;
 
         A_DELETE_COPY(Theme)
 
diff --git a/src/gui/userpalette.h b/src/gui/userpalette.h
index bc20fb486..d2173f31b 100644
--- a/src/gui/userpalette.h
+++ b/src/gui/userpalette.h
@@ -48,7 +48,7 @@ class UserPalette final : public Palette, public ListModel
         /**
          * Destructor
          */
-        ~UserPalette();
+        ~UserPalette() override final;
 
         /**
          * Gets the committed color associated with the specified type.
diff --git a/src/gui/widgets/attrs/attrdisplay.h b/src/gui/widgets/attrs/attrdisplay.h
index f682e41f5..7a1a1c02a 100644
--- a/src/gui/widgets/attrs/attrdisplay.h
+++ b/src/gui/widgets/attrs/attrdisplay.h
@@ -45,7 +45,7 @@ class AttrDisplay notfinal : public Container
 
         A_DELETE_COPY(AttrDisplay)
 
-        virtual ~AttrDisplay();
+        ~AttrDisplay() override;
 
         virtual std::string update();
 
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 8af27256b..6d5ec67de 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -36,7 +36,7 @@ class AvatarListBox final : public ListBox,
 
         A_DELETE_COPY(AvatarListBox)
 
-        ~AvatarListBox();
+        ~AvatarListBox() override final;
 
         /**
          * Draws the list box.
diff --git a/src/gui/widgets/basiccontainer.h b/src/gui/widgets/basiccontainer.h
index 9ab658a76..36fc8191b 100644
--- a/src/gui/widgets/basiccontainer.h
+++ b/src/gui/widgets/basiccontainer.h
@@ -91,7 +91,7 @@ class BasicContainer notfinal : public Widget,
         /**
           * Destructor
           */
-        virtual ~BasicContainer();
+        ~BasicContainer() override;
 
         /**
           * Shows a certain part of a widget in the basic container.
diff --git a/src/gui/widgets/basiccontainer2.h b/src/gui/widgets/basiccontainer2.h
index e26923d74..6090d4d82 100644
--- a/src/gui/widgets/basiccontainer2.h
+++ b/src/gui/widgets/basiccontainer2.h
@@ -90,7 +90,7 @@ class BasicContainer2: public BasicContainer
         /**
           * Destructor.
           */
-        virtual ~BasicContainer2();
+        ~BasicContainer2() override;
 
         /**
           * Sets the container to be opaque or not. If the container
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 66fcae2d9..80461133c 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -61,7 +61,7 @@ class BrowserBox final : public Widget,
         /**
          * Destructor.
          */
-        ~BrowserBox();
+        ~BrowserBox() override final;
 
         /**
          * Sets the handler for links.
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 4e6b5ba16..2ef88ce00 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -148,7 +148,7 @@ class Button final : public Widget,
         /**
          * Destructor.
          */
-        ~Button();
+        ~Button() override final;
 
         /**
          * Draws the button.
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index def986b2d..6ec123e63 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -48,7 +48,7 @@ class CharacterDisplay final : public Container,
 
         A_DELETE_COPY(CharacterDisplay)
 
-        ~CharacterDisplay();
+        ~CharacterDisplay() override final;
 
         void setCharacter(Net::Character *const character);
 
diff --git a/src/gui/widgets/characterviewbase.h b/src/gui/widgets/characterviewbase.h
index ad12efb26..b444d8301 100644
--- a/src/gui/widgets/characterviewbase.h
+++ b/src/gui/widgets/characterviewbase.h
@@ -33,9 +33,6 @@ class CharacterViewBase notfinal : public Container,
     public:
         A_DELETE_COPY(CharacterViewBase)
 
-        virtual ~CharacterViewBase()
-        { }
-
         virtual void show(const int i) = 0;
 
         virtual void resize() = 0;
diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h
index 344549092..04f38a3c6 100644
--- a/src/gui/widgets/characterviewnormal.h
+++ b/src/gui/widgets/characterviewnormal.h
@@ -34,7 +34,7 @@ class CharacterViewNormal final : public CharacterViewBase
 
         A_DELETE_COPY(CharacterViewNormal)
 
-        ~CharacterViewNormal();
+        ~CharacterViewNormal() override final;
 
         void show(const int i) override final;
 
diff --git a/src/gui/widgets/characterviewsmall.h b/src/gui/widgets/characterviewsmall.h
index f363c608e..7ce3fb6bf 100644
--- a/src/gui/widgets/characterviewsmall.h
+++ b/src/gui/widgets/characterviewsmall.h
@@ -35,7 +35,7 @@ class CharacterViewSmall final : public CharacterViewBase
                            const int padding);
         A_DELETE_COPY(CharacterViewSmall)
 
-        ~CharacterViewSmall();
+        ~CharacterViewSmall() override final;
 
         void show(const int i) override final;
 
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index d3c26153b..a29f5d213 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -104,7 +104,7 @@ class CheckBox final : public Widget,
         /**
          * Destructor.
          */
-        ~CheckBox();
+        ~CheckBox() override final;
 
         /**
          * Draws the caption, then calls drawBox to draw the check box.
diff --git a/src/gui/widgets/colorpage.h b/src/gui/widgets/colorpage.h
index 6b0d4122b..cdfe522e9 100644
--- a/src/gui/widgets/colorpage.h
+++ b/src/gui/widgets/colorpage.h
@@ -34,7 +34,7 @@ class ColorPage final : public ListBox
 
         A_DELETE_COPY(ColorPage)
 
-        ~ColorPage();
+        ~ColorPage() override final;
 
         void draw(Graphics *const graphics) override final A_NONNULL(2);
 
diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h
index 2d6e59001..2643ecc8f 100644
--- a/src/gui/widgets/container.h
+++ b/src/gui/widgets/container.h
@@ -41,7 +41,7 @@ class Container notfinal : public BasicContainer2
 
         A_DELETE_COPY(Container)
 
-        virtual ~Container();
+        ~Container() override;
 
         bool safeRemove(Widget *const widget);
 
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 8a655892d..ed5fd2340 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -56,7 +56,7 @@ class Desktop final : public Container,
 
         A_DELETE_COPY(Desktop)
 
-        ~Desktop();
+        ~Desktop() override final;
 
         /**
          * Has to be called after updates have been loaded.
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index ec2e2136e..f9d398246 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -64,7 +64,7 @@ class DropDown final : public ActionListener,
 
         A_DELETE_COPY(DropDown)
 
-        ~DropDown();
+        ~DropDown() override final;
 
         /**
          * Update the alpha value to the graphic components.
diff --git a/src/gui/widgets/emotepage.h b/src/gui/widgets/emotepage.h
index a833e569f..f777be7e6 100644
--- a/src/gui/widgets/emotepage.h
+++ b/src/gui/widgets/emotepage.h
@@ -39,7 +39,7 @@ class EmotePage final : public Widget,
 
         A_DELETE_COPY(EmotePage)
 
-        ~EmotePage();
+        ~EmotePage() override final;
 
         void draw(Graphics *const graphics) override final A_NONNULL(2);
 
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 14895d7a0..b8689bd92 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -44,7 +44,7 @@ class EmoteShortcutContainer final : public ShortcutContainer
         /**
          * Destructor.
          */
-        ~EmoteShortcutContainer();
+        ~EmoteShortcutContainer() override final;
 
         /**
          * Draws the items.
diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h
index b1401ac86..99c0160f3 100644
--- a/src/gui/widgets/extendedlistbox.h
+++ b/src/gui/widgets/extendedlistbox.h
@@ -37,7 +37,7 @@ class ExtendedListBox final : public ListBox
 
         A_DELETE_COPY(ExtendedListBox)
 
-        ~ExtendedListBox();
+        ~ExtendedListBox() override final;
 
         /**
          * Draws the list box.
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index be91853a6..41329a06e 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -47,12 +47,6 @@ class FlowContainer final : public Container,
         A_DELETE_COPY(FlowContainer)
 
         /**
-         * Destructor.
-         */
-        ~FlowContainer()
-        { }
-
-        /**
          * Invoked when a widget changes its size. This is used to determine
          * the new height of the container.
          */
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 4e7d8e50b..f21e16c33 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -60,7 +60,7 @@ class GuiTable final : public Widget,
 
         A_DELETE_COPY(GuiTable)
 
-        ~GuiTable();
+        ~GuiTable() override final;
 
         /**
          * Sets the table model
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index 8d7bdc13e..c8d034009 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -55,7 +55,7 @@ class Icon final : public Widget
 
         A_DELETE_COPY(Icon)
 
-        ~Icon();
+        ~Icon() override final;
 
         /**
          * Gets the current Image.
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 38af6e821..d31e7d336 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -62,7 +62,7 @@ class ItemContainer final : public Widget,
         /**
          * Destructor.
          */
-        ~ItemContainer();
+        ~ItemContainer() override final;
 
         /**
          * Necessary for checking how full the inventory is.
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index bc90f71d1..032b0032b 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -34,7 +34,7 @@ class ItemLinkHandler final : public LinkHandler
 
         A_DELETE_COPY(ItemLinkHandler)
 
-        ~ItemLinkHandler();
+        ~ItemLinkHandler() override final;
 
         void handleLink(const std::string &link,
                         MouseEvent *event) override final;
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 146834f4d..9373c72ba 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -44,7 +44,7 @@ class ItemShortcutContainer final : public ShortcutContainer
         /**
          * Destructor.
          */
-        ~ItemShortcutContainer();
+        ~ItemShortcutContainer() override final;
 
         /**
          * Draws the items.
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 26790258c..2660e0173 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -103,7 +103,7 @@ class Label final : public Widget,
 
         A_DELETE_COPY(Label)
 
-        ~Label();
+        ~Label() override final;
 
         void init();
 
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index c0389cec3..4e8ecfdee 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -48,7 +48,7 @@ class LayoutHelper final : public WidgetListener
         /**
          * Destructor.
          */
-        ~LayoutHelper();
+        ~LayoutHelper() override final;
 
         /**
          * Gets the layout handler.
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 5c90058a8..2b5c36fc4 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -101,7 +101,7 @@ class ListBox notfinal : public Widget,
 
         A_DELETE_COPY(ListBox)
 
-        virtual ~ListBox();
+        ~ListBox() override;
 
         void postInit() override;
 
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index 55f5f11fc..d5308ce55 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -61,7 +61,7 @@ class PlayerBox final : public Widget,
         /**
          * Destructor.
          */
-        ~PlayerBox();
+        ~PlayerBox() override final;
 
         void init(std::string name, std::string selectedName);
 
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 085923d0e..ee3e13f03 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -66,7 +66,7 @@ class Popup notfinal : public Container,
         /**
          * Destructor. Deletes all the added widgets.
          */
-        virtual ~Popup();
+        ~Popup() override;
 
         /**
          * Sets the window container to be used by new popups.
diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h
index e6e27913b..94fc19d67 100644
--- a/src/gui/widgets/popuplist.h
+++ b/src/gui/widgets/popuplist.h
@@ -43,7 +43,7 @@ class PopupList final : public Popup,
                   const bool extended,
                   const Modal modal);
 
-        ~PopupList();
+        ~PopupList() override final;
 
         A_DELETE_COPY(PopupList)
 
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index 466f067b4..3c20f2ae7 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -58,7 +58,7 @@ class ProgressBar final : public Widget,
 
         A_DELETE_COPY(ProgressBar)
 
-        ~ProgressBar();
+        ~ProgressBar() override final;
 
         /**
          * Performs progress bar logic (fading colors)
diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h
index 6220a57c4..7bafb1fe9 100644
--- a/src/gui/widgets/progressindicator.h
+++ b/src/gui/widgets/progressindicator.h
@@ -39,7 +39,7 @@ class ProgressIndicator final : public Widget
 
         A_DELETE_COPY(ProgressIndicator)
 
-        ~ProgressIndicator();
+        ~ProgressIndicator() override final;
 
         void logic() override final;
 
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 10979fd39..743a52728 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -101,7 +101,7 @@ class RadioButton final : public Widget,
         /**
          * Destructor.
          */
-        ~RadioButton();
+        ~RadioButton() override final;
 
         /**
          * Draws the radiobutton, not the caption.
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index a2b6e0b78..bca169234 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -118,7 +118,7 @@ class ScrollArea final : public BasicContainer,
         /**
          * Destructor. Also deletes the content.
          */
-        ~ScrollArea();
+        ~ScrollArea() override final;
 
         /**
          * Logic function optionally adapts width or height of contents. This
diff --git a/src/gui/widgets/selldialog.h b/src/gui/widgets/selldialog.h
index e17d3116a..9f07eb8d7 100644
--- a/src/gui/widgets/selldialog.h
+++ b/src/gui/widgets/selldialog.h
@@ -64,7 +64,7 @@ class SellDialog notfinal : public Window,
         /**
          * Destructor
          */
-        ~SellDialog();
+        ~SellDialog() override;
 
         /**
          * Resets the dialog, clearing inventory.
diff --git a/src/gui/widgets/setupbuttonitem.h b/src/gui/widgets/setupbuttonitem.h
index b4f99328b..cb214f9c4 100644
--- a/src/gui/widgets/setupbuttonitem.h
+++ b/src/gui/widgets/setupbuttonitem.h
@@ -39,7 +39,7 @@ class SetupButtonItem final : public SetupItem
 
         A_DELETE_COPY(SetupButtonItem)
 
-        ~SetupButtonItem();
+        ~SetupButtonItem() override final;
 
         void createControls();
 
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index e8bcc0c8c..cb6ce462e 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -61,7 +61,7 @@ class SetupItem notfinal : public ActionListener,
 
         A_DELETE_COPY(SetupItem)
 
-        virtual ~SetupItem();
+        ~SetupItem() override;
 
         void load();
 
@@ -170,7 +170,7 @@ class SetupItemCheckBox final : public SetupItem
 
         A_DELETE_COPY(SetupItemCheckBox)
 
-        ~SetupItemCheckBox();
+        ~SetupItemCheckBox() override final;
 
         void createControls();
 
@@ -204,7 +204,7 @@ class SetupItemTextField final : public SetupItem
 
         A_DELETE_COPY(SetupItemTextField)
 
-        ~SetupItemTextField();
+        ~SetupItemTextField() override final;
 
         void createControls();
 
@@ -259,7 +259,7 @@ class SetupItemIntTextField final : public SetupItem
 
         A_DELETE_COPY(SetupItemIntTextField)
 
-        ~SetupItemIntTextField();
+        ~SetupItemIntTextField() override final;
 
         void createControls();
 
@@ -291,7 +291,7 @@ class SetupItemLabel final : public SetupItem
 
         A_DELETE_COPY(SetupItemLabel)
 
-        ~SetupItemLabel();
+        ~SetupItemLabel() override final;
 
         void createControls();
 
@@ -332,7 +332,7 @@ class SetupItemDropDown final : public SetupItem
 
         A_DELETE_COPY(SetupItemDropDown)
 
-        ~SetupItemDropDown();
+        ~SetupItemDropDown() override final;
 
         void createControls();
 
@@ -374,7 +374,7 @@ class SetupItemDropDownStr final : public SetupItem
 
         A_DELETE_COPY(SetupItemDropDownStr)
 
-        ~SetupItemDropDownStr();
+        ~SetupItemDropDownStr() override final;
 
         void createControls();
 
@@ -422,7 +422,7 @@ class SetupItemSlider final : public SetupItem
 
         A_DELETE_COPY(SetupItemSlider)
 
-        ~SetupItemSlider();
+        ~SetupItemSlider() override final;
 
         void createControls();
 
@@ -479,7 +479,7 @@ class SetupItemSlider2 final : public SetupItem
 
         A_DELETE_COPY(SetupItemSlider2)
 
-        ~SetupItemSlider2();
+        ~SetupItemSlider2() override final;
 
         void createControls();
 
@@ -517,7 +517,7 @@ class SetupItemSliderList notfinal : public SetupItem
     public:
         A_DELETE_COPY(SetupItemSliderList)
 
-        virtual ~SetupItemSliderList();
+        ~SetupItemSliderList() override;
 
         void createControls();
 
diff --git a/src/gui/widgets/setupquickitem.h b/src/gui/widgets/setupquickitem.h
index 24a9507a4..c87dd44ce 100644
--- a/src/gui/widgets/setupquickitem.h
+++ b/src/gui/widgets/setupquickitem.h
@@ -45,7 +45,7 @@ class SetupQuickItem final : public SetupItem,
 
         A_DELETE_COPY(SetupQuickItem)
 
-        ~SetupQuickItem();
+        ~SetupQuickItem() override final;
 
         void createControls();
 
diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h
index a485b1bd1..4f28c5492 100644
--- a/src/gui/widgets/setuptouchitem.h
+++ b/src/gui/widgets/setuptouchitem.h
@@ -48,7 +48,7 @@ class SetupActionDropDown final : public SetupItem
 
         A_DELETE_COPY(SetupActionDropDown)
 
-        ~SetupActionDropDown();
+        ~SetupActionDropDown() override final;
 
         void createControls();
 
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index b7076dfc2..26a043c71 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -46,7 +46,7 @@ class ShortcutContainer notfinal : public Widget,
         /**
          * Destructor.
          */
-        virtual ~ShortcutContainer();
+        ~ShortcutContainer() override;
 
         /**
          * Invoked when a widget changes its size. This is used to determine
diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h
index f09e7d4bb..fef5f9136 100644
--- a/src/gui/widgets/skilllistbox.h
+++ b/src/gui/widgets/skilllistbox.h
@@ -71,7 +71,7 @@ class SkillListBox final : public ListBox
 
         A_DELETE_COPY(SkillListBox)
 
-        ~SkillListBox()
+        ~SkillListBox() override final
         {
             delete2(mModel)
         }
diff --git a/src/gui/widgets/skillrectanglelistbox.h b/src/gui/widgets/skillrectanglelistbox.h
index 671932d89..56f2982fd 100644
--- a/src/gui/widgets/skillrectanglelistbox.h
+++ b/src/gui/widgets/skillrectanglelistbox.h
@@ -121,7 +121,7 @@ class SkillRectangleListBox final : public Widget,
 
         A_DELETE_COPY(SkillRectangleListBox)
 
-        ~SkillRectangleListBox()
+        ~SkillRectangleListBox() override final
         {
             delete2(mModel)
         }
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index 49acafc28..16823242f 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -107,7 +107,7 @@ class Slider final : public Widget,
         /**
          * Destructor.
          */
-        ~Slider();
+        ~Slider() override final;
 
         /**
          * Update the alpha value to the graphic components.
diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h
index 6f4336531..ab3d233d2 100644
--- a/src/gui/widgets/sliderlist.h
+++ b/src/gui/widgets/sliderlist.h
@@ -42,7 +42,7 @@ class SliderList final : public Container,
 
         A_DELETE_COPY(SliderList)
 
-        ~SliderList();
+        ~SliderList() override final;
 
         void postInit2(ActionListener *const listener,
                        const std::string &eventId);
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 872ca5e1a..3e5d6f431 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -44,7 +44,7 @@ class SpellShortcutContainer final : public ShortcutContainer
         /**
          * Destructor.
          */
-        ~SpellShortcutContainer();
+        ~SpellShortcutContainer() override final;
 
         /**
          * Draws the items.
diff --git a/src/gui/widgets/staticbrowserbox.h b/src/gui/widgets/staticbrowserbox.h
index 452bea681..d21b42b43 100644
--- a/src/gui/widgets/staticbrowserbox.h
+++ b/src/gui/widgets/staticbrowserbox.h
@@ -59,7 +59,7 @@ class StaticBrowserBox final : public Widget,
         /**
          * Destructor.
          */
-        ~StaticBrowserBox();
+        ~StaticBrowserBox() override final;
 
         /**
          * Sets the handler for links.
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 22e1c879e..6efcf541b 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -95,7 +95,7 @@ class TabbedArea final : public ActionListener,
 
         A_DELETE_COPY(TabbedArea)
 
-        ~TabbedArea();
+        ~TabbedArea() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/widgets/tabs/chat/battletab.h b/src/gui/widgets/tabs/chat/battletab.h
index 24f69c8b9..e8cdacd65 100644
--- a/src/gui/widgets/tabs/chat/battletab.h
+++ b/src/gui/widgets/tabs/chat/battletab.h
@@ -35,7 +35,7 @@ class BattleTab final : public ChatTab
 
         A_DELETE_COPY(BattleTab)
 
-        ~BattleTab();
+        ~BattleTab() override final;
 };
 
 extern BattleTab *battleChatTab;
diff --git a/src/gui/widgets/tabs/chat/channeltab.h b/src/gui/widgets/tabs/chat/channeltab.h
index 3ac51e59d..2f0517684 100644
--- a/src/gui/widgets/tabs/chat/channeltab.h
+++ b/src/gui/widgets/tabs/chat/channeltab.h
@@ -36,7 +36,7 @@ class ChannelTab final : public ChatTab
 
         A_DELETE_COPY(ChannelTab)
 
-        ~ChannelTab();
+        ~ChannelTab() override final;
 
     protected:
         void handleInput(const std::string &msg) override final;
diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h
index aeefe43db..088977631 100644
--- a/src/gui/widgets/tabs/chat/chattab.h
+++ b/src/gui/widgets/tabs/chat/chattab.h
@@ -72,7 +72,7 @@ class ChatTab notfinal : public Tab
 
         A_DELETE_COPY(ChatTab)
 
-        virtual ~ChatTab();
+        ~ChatTab() override;
 
         /**
          * Adds a line of text to our message list. Parameters:
diff --git a/src/gui/widgets/tabs/chat/emulateguildtab.h b/src/gui/widgets/tabs/chat/emulateguildtab.h
index 3cf3a0e59..fbe8aab00 100644
--- a/src/gui/widgets/tabs/chat/emulateguildtab.h
+++ b/src/gui/widgets/tabs/chat/emulateguildtab.h
@@ -38,7 +38,7 @@ class EmulateGuildTab final : public ChatTab,
 
         A_DELETE_COPY(EmulateGuildTab)
 
-        ~EmulateGuildTab();
+        ~EmulateGuildTab() override final;
 
         bool handleCommand(const std::string &restrict type,
                            const std::string &restrict args) override final;
diff --git a/src/gui/widgets/tabs/chat/gmtab.h b/src/gui/widgets/tabs/chat/gmtab.h
index a8dd46fd3..609f9da75 100644
--- a/src/gui/widgets/tabs/chat/gmtab.h
+++ b/src/gui/widgets/tabs/chat/gmtab.h
@@ -33,7 +33,7 @@ class GmTab final : public ChatTab
 
         A_DELETE_COPY(GmTab)
 
-        ~GmTab();
+        ~GmTab() override final;
 
     protected:
         void getAutoCompleteList(StringVect &names) const
diff --git a/src/gui/widgets/tabs/chat/guildtab.h b/src/gui/widgets/tabs/chat/guildtab.h
index 5aa540ecb..95142c682 100644
--- a/src/gui/widgets/tabs/chat/guildtab.h
+++ b/src/gui/widgets/tabs/chat/guildtab.h
@@ -36,7 +36,7 @@ class GuildTab notfinal : public ChatTab,
 
         A_DELETE_COPY(GuildTab)
 
-        virtual ~GuildTab();
+        ~GuildTab() override final;
 
         bool handleCommand(const std::string &restrict type,
                            const std::string &restrict args) override final;
diff --git a/src/gui/widgets/tabs/chat/langtab.h b/src/gui/widgets/tabs/chat/langtab.h
index 773431e85..44173c653 100644
--- a/src/gui/widgets/tabs/chat/langtab.h
+++ b/src/gui/widgets/tabs/chat/langtab.h
@@ -31,7 +31,7 @@ class LangTab final : public ChatTab
 
         A_DELETE_COPY(LangTab)
 
-        ~LangTab();
+        ~LangTab() override final;
 };
 
 extern LangTab *langChatTab;
diff --git a/src/gui/widgets/tabs/chat/partytab.h b/src/gui/widgets/tabs/chat/partytab.h
index a987c9362..71de2395f 100644
--- a/src/gui/widgets/tabs/chat/partytab.h
+++ b/src/gui/widgets/tabs/chat/partytab.h
@@ -36,7 +36,7 @@ class PartyTab notfinal : public ChatTab,
 
         A_DELETE_COPY(PartyTab)
 
-        virtual ~PartyTab();
+        ~PartyTab() override;
 
         bool handleCommand(const std::string &restrict type,
                            const std::string &restrict args) override final;
diff --git a/src/gui/widgets/tabs/chat/tradetab.h b/src/gui/widgets/tabs/chat/tradetab.h
index 26c9bf8f6..ef0f8f7cb 100644
--- a/src/gui/widgets/tabs/chat/tradetab.h
+++ b/src/gui/widgets/tabs/chat/tradetab.h
@@ -35,7 +35,7 @@ class TradeTab final : public ChatTab
 
         A_DELETE_COPY(TradeTab)
 
-        ~TradeTab();
+        ~TradeTab() override final;
 
     protected:
         void handleInput(const std::string &msg) override final;
diff --git a/src/gui/widgets/tabs/chat/whispertab.h b/src/gui/widgets/tabs/chat/whispertab.h
index 1d3c03857..53ad98b6f 100644
--- a/src/gui/widgets/tabs/chat/whispertab.h
+++ b/src/gui/widgets/tabs/chat/whispertab.h
@@ -60,7 +60,7 @@ class WhisperTab final : public ChatTab
                    const std::string &caption,
                    const std::string &nick);
 
-        ~WhisperTab();
+        ~WhisperTab() override final;
 
         void handleInput(const std::string &msg) override final;
 
diff --git a/src/gui/widgets/tabs/setup_audio.h b/src/gui/widgets/tabs/setup_audio.h
index d76add16c..7d90bd381 100644
--- a/src/gui/widgets/tabs/setup_audio.h
+++ b/src/gui/widgets/tabs/setup_audio.h
@@ -34,7 +34,7 @@ class Setup_Audio final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Audio)
 
-        ~Setup_Audio();
+        ~Setup_Audio() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h
index 1ba74f340..cb6755371 100644
--- a/src/gui/widgets/tabs/setup_colors.h
+++ b/src/gui/widgets/tabs/setup_colors.h
@@ -42,7 +42,7 @@ class Setup_Colors final : public SetupTab,
 
         A_DELETE_COPY(Setup_Colors)
 
-        ~Setup_Colors();
+        ~Setup_Colors() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_input.h b/src/gui/widgets/tabs/setup_input.h
index 2da411b2c..f22d8f960 100644
--- a/src/gui/widgets/tabs/setup_input.h
+++ b/src/gui/widgets/tabs/setup_input.h
@@ -49,7 +49,7 @@ class Setup_Input final : public SetupTab
         /**
          * Destructor
          */
-        ~Setup_Input();
+        ~Setup_Input() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_joystick.h b/src/gui/widgets/tabs/setup_joystick.h
index c66ab8687..286ebc824 100644
--- a/src/gui/widgets/tabs/setup_joystick.h
+++ b/src/gui/widgets/tabs/setup_joystick.h
@@ -38,7 +38,7 @@ class Setup_Joystick final : public SetupTab
 
         A_DELETE_COPY(Setup_Joystick)
 
-        ~Setup_Joystick();
+        ~Setup_Joystick() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_misc.h b/src/gui/widgets/tabs/setup_misc.h
index 787f4c181..2f5d8a179 100644
--- a/src/gui/widgets/tabs/setup_misc.h
+++ b/src/gui/widgets/tabs/setup_misc.h
@@ -34,7 +34,7 @@ class Setup_Misc final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Misc)
 
-        ~Setup_Misc();
+        ~Setup_Misc() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_mods.h b/src/gui/widgets/tabs/setup_mods.h
index 488915d31..71e35ff66 100644
--- a/src/gui/widgets/tabs/setup_mods.h
+++ b/src/gui/widgets/tabs/setup_mods.h
@@ -32,7 +32,7 @@ class Setup_Mods final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Mods)
 
-        ~Setup_Mods();
+        ~Setup_Mods() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_perfomance.h b/src/gui/widgets/tabs/setup_perfomance.h
index 95030a8e5..d4cadd659 100644
--- a/src/gui/widgets/tabs/setup_perfomance.h
+++ b/src/gui/widgets/tabs/setup_perfomance.h
@@ -34,7 +34,7 @@ class Setup_Perfomance final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Perfomance)
 
-        ~Setup_Perfomance();
+        ~Setup_Perfomance() override final;
 
     private:
 #ifdef USE_SDL2
diff --git a/src/gui/widgets/tabs/setup_players.h b/src/gui/widgets/tabs/setup_players.h
index d29d41781..9be4f29c5 100644
--- a/src/gui/widgets/tabs/setup_players.h
+++ b/src/gui/widgets/tabs/setup_players.h
@@ -32,7 +32,7 @@ class Setup_Players final : public SetupTabScroll
     public:
         explicit Setup_Players(const Widget2 *const widget);
 
-        ~Setup_Players();
+        ~Setup_Players() override final;
 
         A_DELETE_COPY(Setup_Players)
 
diff --git a/src/gui/widgets/tabs/setup_quick.h b/src/gui/widgets/tabs/setup_quick.h
index f174153ee..20e13d2de 100644
--- a/src/gui/widgets/tabs/setup_quick.h
+++ b/src/gui/widgets/tabs/setup_quick.h
@@ -34,7 +34,7 @@ class Setup_Quick final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Quick)
 
-        ~Setup_Quick();
+        ~Setup_Quick() override final;
 
     protected:
         NamesModel *mMoveTypeList;
diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h
index 879450891..9d5566e20 100644
--- a/src/gui/widgets/tabs/setup_relations.h
+++ b/src/gui/widgets/tabs/setup_relations.h
@@ -44,7 +44,7 @@ class Setup_Relations final : public SetupTab,
 
         A_DELETE_COPY(Setup_Relations)
 
-        ~Setup_Relations();
+        ~Setup_Relations() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h
index 57798f243..9a1702748 100644
--- a/src/gui/widgets/tabs/setup_theme.h
+++ b/src/gui/widgets/tabs/setup_theme.h
@@ -40,7 +40,7 @@ class Setup_Theme final : public SetupTab
 
         A_DELETE_COPY(Setup_Theme)
 
-        ~Setup_Theme();
+        ~Setup_Theme() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_touch.h b/src/gui/widgets/tabs/setup_touch.h
index a87a46c77..35e559934 100644
--- a/src/gui/widgets/tabs/setup_touch.h
+++ b/src/gui/widgets/tabs/setup_touch.h
@@ -33,7 +33,7 @@ class Setup_Touch final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Touch)
 
-        ~Setup_Touch();
+        ~Setup_Touch() override final;
 
     protected:
         NamesModel *mSizeList;
diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h
index e327a29d8..809323c63 100644
--- a/src/gui/widgets/tabs/setup_video.h
+++ b/src/gui/widgets/tabs/setup_video.h
@@ -45,7 +45,7 @@ class Setup_Video final : public SetupTab,
 
         A_DELETE_COPY(Setup_Video)
 
-        ~Setup_Video();
+        ~Setup_Video() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setup_visual.h b/src/gui/widgets/tabs/setup_visual.h
index 08d1c7848..756ee5096 100644
--- a/src/gui/widgets/tabs/setup_visual.h
+++ b/src/gui/widgets/tabs/setup_visual.h
@@ -35,7 +35,7 @@ class Setup_Visual final : public SetupTabScroll
 
         A_DELETE_COPY(Setup_Visual)
 
-        ~Setup_Visual();
+        ~Setup_Visual() override final;
 
         void apply() override final;
 
diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index 655b98c85..e618e0d72 100644
--- a/src/gui/widgets/tabs/setuptabscroll.h
+++ b/src/gui/widgets/tabs/setuptabscroll.h
@@ -36,7 +36,7 @@ class SetupTabScroll notfinal : public SetupTab
 
         A_DELETE_COPY(SetupTabScroll)
 
-        virtual ~SetupTabScroll();
+        ~SetupTabScroll() override;
 
         void addControl(SetupItem *const widget);
 
diff --git a/src/gui/widgets/tabs/skilltab.h b/src/gui/widgets/tabs/skilltab.h
index 9086a4d0c..52ab92bdd 100644
--- a/src/gui/widgets/tabs/skilltab.h
+++ b/src/gui/widgets/tabs/skilltab.h
@@ -57,7 +57,7 @@ class SkillTab final : public Tab
 
         A_DELETE_COPY(SkillTab)
 
-        ~SkillTab()
+        ~SkillTab() override final
         {
             delete2(mListBox)
             delete2(mRectangleListBox)
diff --git a/src/gui/widgets/tabs/socialattacktab.h b/src/gui/widgets/tabs/socialattacktab.h
index e876a60ae..e59990005 100644
--- a/src/gui/widgets/tabs/socialattacktab.h
+++ b/src/gui/widgets/tabs/socialattacktab.h
@@ -52,7 +52,7 @@ class SocialAttackTab final : public SocialTab
 
         A_DELETE_COPY(SocialAttackTab)
 
-        ~SocialAttackTab()
+        ~SocialAttackTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h
index d1cd942cd..8577af974 100644
--- a/src/gui/widgets/tabs/socialfriendstab.h
+++ b/src/gui/widgets/tabs/socialfriendstab.h
@@ -58,7 +58,7 @@ class SocialFriendsTab final : public SocialTab
 
         A_DELETE_COPY(SocialFriendsTab)
 
-        ~SocialFriendsTab()
+        ~SocialFriendsTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index a42ad1dad..d0a1f8a1d 100644
--- a/src/gui/widgets/tabs/socialguildtab.h
+++ b/src/gui/widgets/tabs/socialguildtab.h
@@ -66,7 +66,7 @@ class SocialGuildTab final : public SocialTab,
 
         A_DELETE_COPY(SocialGuildTab)
 
-        ~SocialGuildTab()
+        ~SocialGuildTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h
index c0dc123a4..f8dc661b7 100644
--- a/src/gui/widgets/tabs/socialguildtab2.h
+++ b/src/gui/widgets/tabs/socialguildtab2.h
@@ -65,7 +65,7 @@ class SocialGuildTab2 final : public SocialTab,
 
         A_DELETE_COPY(SocialGuildTab2)
 
-        ~SocialGuildTab2()
+        ~SocialGuildTab2() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h
index 1b049f055..d447cb6ce 100644
--- a/src/gui/widgets/tabs/socialnavigationtab.h
+++ b/src/gui/widgets/tabs/socialnavigationtab.h
@@ -63,7 +63,7 @@ class SocialNavigationTab final : public SocialTab
 
         A_DELETE_COPY(SocialNavigationTab)
 
-        ~SocialNavigationTab()
+        ~SocialNavigationTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index 17fcfd3f1..f296aa041 100644
--- a/src/gui/widgets/tabs/socialpartytab.h
+++ b/src/gui/widgets/tabs/socialpartytab.h
@@ -68,7 +68,7 @@ class SocialPartyTab final : public SocialTab,
 
         A_DELETE_COPY(SocialPartyTab)
 
-        ~SocialPartyTab()
+        ~SocialPartyTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h
index 93d00e81a..626cb0a10 100644
--- a/src/gui/widgets/tabs/socialpickuptab.h
+++ b/src/gui/widgets/tabs/socialpickuptab.h
@@ -52,7 +52,7 @@ class SocialPickupTab final : public SocialTab
 
         A_DELETE_COPY(SocialPickupTab)
 
-        ~SocialPickupTab()
+        ~SocialPickupTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h
index c43093fca..b71ec3be7 100644
--- a/src/gui/widgets/tabs/socialplayerstab.h
+++ b/src/gui/widgets/tabs/socialplayerstab.h
@@ -57,7 +57,7 @@ class SocialPlayersTab final : public SocialTab
 
         A_DELETE_COPY(SocialPlayersTab)
 
-        ~SocialPlayersTab()
+        ~SocialPlayersTab() override final
         {
             delete2(mList)
             delete2(mScroll)
diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h
index 1c94aaede..85aa2c880 100644
--- a/src/gui/widgets/tabs/socialtab.h
+++ b/src/gui/widgets/tabs/socialtab.h
@@ -85,7 +85,7 @@ class SocialTab notfinal : public Tab
         {
         }
 
-        virtual ~SocialTab()
+        ~SocialTab() override
         {
             // Cleanup dialogs
             if (mInviteDialog != nullptr)
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index e6a816072..ccbc34f5d 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -90,7 +90,7 @@ class Tab notfinal : public BasicContainer,
 
         A_DELETE_COPY(Tab)
 
-        virtual ~Tab();
+        ~Tab() override;
 
         enum
         {
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 6ce28ed4b..874d72f5d 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -94,7 +94,7 @@ class TextBox final : public Widget,
 
         A_DELETE_COPY(TextBox)
 
-        ~TextBox();
+        ~TextBox() override final;
 
         /**
          * Sets the text after wrapping it to the current width of the widget.
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 73ce0c525..b3e470cb5 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -103,7 +103,7 @@ class TextField notfinal : public Widget,
 
         A_DELETE_COPY(TextField)
 
-        virtual ~TextField();
+        ~TextField() override;
 
         /**
          * Draws the text field.
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index 7f4a5e873..e66e82c66 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -40,7 +40,7 @@ class TextPreview final : public Widget
 
         A_DELETE_COPY(TextPreview)
 
-        ~TextPreview();
+        ~TextPreview() override final;
 
         inline void setTextColor(const Color *color)
         { mTextColor = color; adjustSize(); }
diff --git a/src/gui/widgets/virtshortcutcontainer.h b/src/gui/widgets/virtshortcutcontainer.h
index 989a6c8d7..03d363226 100644
--- a/src/gui/widgets/virtshortcutcontainer.h
+++ b/src/gui/widgets/virtshortcutcontainer.h
@@ -46,7 +46,7 @@ class VirtShortcutContainer final : public ShortcutContainer
         /**
          * Destructor.
          */
-        ~VirtShortcutContainer();
+        ~VirtShortcutContainer() override final;
 
         /**
          * Draws the items.
diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h
index bb41054d2..fc045a24a 100644
--- a/src/gui/widgets/widget.h
+++ b/src/gui/widgets/widget.h
@@ -111,7 +111,7 @@ class Widget notfinal : public Widget2
         /**
           * Default destructor.
           */
-        virtual ~Widget();
+        ~Widget() override;
 
         /**
           * Draws the widget. It is called by the parent widget when it is time
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index cffc2f17d..72ac52baa 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -121,7 +121,7 @@ class Window notfinal : public BasicContainer2,
         /**
          * Destructor. Deletes all the added widgets.
          */
-        virtual ~Window();
+        ~Window() override;
 
         /**
          * Sets the window container to be used by new windows.
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index bfd0231c8..fa15283b8 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -55,7 +55,7 @@ class WindowMenu final : public Container,
 
         A_DELETE_COPY(WindowMenu)
 
-        ~WindowMenu();
+        ~WindowMenu() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/bankwindow.h b/src/gui/windows/bankwindow.h
index 046b11ec4..d02273c1d 100644
--- a/src/gui/windows/bankwindow.h
+++ b/src/gui/windows/bankwindow.h
@@ -44,7 +44,7 @@ class BankWindow final : public Window,
 
         A_DELETE_COPY(BankWindow)
 
-        ~BankWindow();
+        ~BankWindow() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h
index 7914c0ef3..bab391c7b 100644
--- a/src/gui/windows/buydialog.h
+++ b/src/gui/windows/buydialog.h
@@ -94,7 +94,7 @@ class BuyDialog final : public Window,
         /**
          * Destructor
          */
-        ~BuyDialog();
+        ~BuyDialog() override final;
 
         enum
         {
diff --git a/src/gui/windows/buyselldialog.h b/src/gui/windows/buyselldialog.h
index b2a527d16..baff4e6ae 100644
--- a/src/gui/windows/buyselldialog.h
+++ b/src/gui/windows/buyselldialog.h
@@ -52,7 +52,7 @@ class BuySellDialog final : public Window,
 
         A_DELETE_COPY(BuySellDialog)
 
-        ~BuySellDialog();
+        ~BuySellDialog() override final;
 
         void init();
 
diff --git a/src/gui/windows/changeemaildialog.h b/src/gui/windows/changeemaildialog.h
index c20dffd9e..be23802b7 100644
--- a/src/gui/windows/changeemaildialog.h
+++ b/src/gui/windows/changeemaildialog.h
@@ -53,7 +53,7 @@ class ChangeEmailDialog final : public Window,
         /**
          * Destructor.
          */
-        ~ChangeEmailDialog();
+        ~ChangeEmailDialog() override final;
 
         /**
          * Called when receiving actions from the widgets.
diff --git a/src/gui/windows/changepassworddialog.h b/src/gui/windows/changepassworddialog.h
index dd5c0d152..97531a7c0 100644
--- a/src/gui/windows/changepassworddialog.h
+++ b/src/gui/windows/changepassworddialog.h
@@ -53,7 +53,7 @@ class ChangePasswordDialog final : public Window,
         /**
          * Destructor
          */
-        ~ChangePasswordDialog();
+        ~ChangePasswordDialog() override final;
 
         /**
          * Called when receiving actions from the widgets.
diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h
index 9d786a35c..63d9e01c6 100644
--- a/src/gui/windows/charcreatedialog.h
+++ b/src/gui/windows/charcreatedialog.h
@@ -59,7 +59,7 @@ class CharCreateDialog final : public Window,
         /**
          * Destructor.
          */
-        ~CharCreateDialog();
+        ~CharCreateDialog() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h
index 682dcd108..dba37ccbf 100644
--- a/src/gui/windows/charselectdialog.h
+++ b/src/gui/windows/charselectdialog.h
@@ -63,7 +63,7 @@ class CharSelectDialog final : public Window,
 
         A_DELETE_COPY(CharSelectDialog)
 
-        ~CharSelectDialog();
+        ~CharSelectDialog() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 051d89288..0f27e8cbc 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -69,7 +69,7 @@ class ChatWindow final : public Window,
         /**
          * Destructor: used to write back values to the config file
          */
-        ~ChatWindow();
+        ~ChatWindow() override final;
 
         /**
          * Gets the focused tab.
diff --git a/src/gui/windows/cutinwindow.h b/src/gui/windows/cutinwindow.h
index c0aa81577..ce404c57d 100644
--- a/src/gui/windows/cutinwindow.h
+++ b/src/gui/windows/cutinwindow.h
@@ -36,7 +36,7 @@ class CutInWindow final : public Window
 
         A_DELETE_COPY(CutInWindow)
 
-        ~CutInWindow();
+        ~CutInWindow() override final;
 
         void draw(Graphics *const graphics) override final A_NONNULL(2);
 
diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h
index 6350b8820..344940deb 100644
--- a/src/gui/windows/debugwindow.h
+++ b/src/gui/windows/debugwindow.h
@@ -45,7 +45,7 @@ class DebugWindow final : public Window
 
         A_DELETE_COPY(DebugWindow)
 
-        ~DebugWindow();
+        ~DebugWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h
index 334799b61..c3f59c17c 100644
--- a/src/gui/windows/didyouknowwindow.h
+++ b/src/gui/windows/didyouknowwindow.h
@@ -45,7 +45,7 @@ class DidYouKnowWindow final : public Window,
          */
         DidYouKnowWindow();
 
-        ~DidYouKnowWindow();
+        ~DidYouKnowWindow() override final;
 
         A_DELETE_COPY(DidYouKnowWindow)
 
diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h
index e53632c00..84a8ca217 100644
--- a/src/gui/windows/editserverdialog.h
+++ b/src/gui/windows/editserverdialog.h
@@ -53,7 +53,7 @@ class EditServerDialog final : public Window,
 
         A_DELETE_COPY(EditServerDialog)
 
-        ~EditServerDialog();
+        ~EditServerDialog() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/emotewindow.h b/src/gui/windows/emotewindow.h
index 66fb0c83c..1e3c15152 100644
--- a/src/gui/windows/emotewindow.h
+++ b/src/gui/windows/emotewindow.h
@@ -39,7 +39,7 @@ class EmoteWindow final : public Window
 
         A_DELETE_COPY(EmoteWindow)
 
-        ~EmoteWindow();
+        ~EmoteWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h
index d8d4e91c9..f24bf0edd 100644
--- a/src/gui/windows/equipmentwindow.h
+++ b/src/gui/windows/equipmentwindow.h
@@ -64,7 +64,7 @@ class EquipmentWindow final : public Window,
         /**
          * Destructor.
          */
-        ~EquipmentWindow();
+        ~EquipmentWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h
index 82726e151..787a5280a 100644
--- a/src/gui/windows/inventorywindow.h
+++ b/src/gui/windows/inventorywindow.h
@@ -71,7 +71,7 @@ class InventoryWindow final : public Window,
         /**
          * Destructor.
          */
-        ~InventoryWindow();
+        ~InventoryWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h
index ca0bd4955..efeb546b5 100644
--- a/src/gui/windows/itemamountwindow.h
+++ b/src/gui/windows/itemamountwindow.h
@@ -83,7 +83,7 @@ class ItemAmountWindow final : public Window,
                                int maxRange,
                                const int tag);
 
-        ~ItemAmountWindow();
+        ~ItemAmountWindow() override final;
 
 #ifndef UNITTESTS
     private:
diff --git a/src/gui/windows/killstats.h b/src/gui/windows/killstats.h
index c701d8430..e41b51706 100644
--- a/src/gui/windows/killstats.h
+++ b/src/gui/windows/killstats.h
@@ -44,12 +44,6 @@ class KillStats final : public Window,
         A_DELETE_COPY(KillStats)
 
         /**
-         * Destructor.
-         */
-        ~KillStats()
-        { }
-
-        /**
          * Stuff.
          */
         void action(const ActionEvent &event) override final;
diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h
index c3178f079..d05c29fb7 100644
--- a/src/gui/windows/logindialog.h
+++ b/src/gui/windows/logindialog.h
@@ -59,7 +59,7 @@ class LoginDialog final : public Window,
 
         A_DELETE_COPY(LoginDialog)
 
-        ~LoginDialog();
+        ~LoginDialog() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/maileditwindow.h b/src/gui/windows/maileditwindow.h
index 2c6c5d0ef..efcd77cad 100644
--- a/src/gui/windows/maileditwindow.h
+++ b/src/gui/windows/maileditwindow.h
@@ -44,7 +44,7 @@ class MailEditWindow final : public Window,
 
         A_DELETE_COPY(MailEditWindow)
 
-        ~MailEditWindow();
+        ~MailEditWindow() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/mailviewwindow.h b/src/gui/windows/mailviewwindow.h
index 19585de03..e44a51369 100644
--- a/src/gui/windows/mailviewwindow.h
+++ b/src/gui/windows/mailviewwindow.h
@@ -42,7 +42,7 @@ class MailViewWindow final : public Window,
 
         A_DELETE_COPY(MailViewWindow)
 
-        ~MailViewWindow();
+        ~MailViewWindow() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/mailwindow.h b/src/gui/windows/mailwindow.h
index c99236499..ea4935923 100644
--- a/src/gui/windows/mailwindow.h
+++ b/src/gui/windows/mailwindow.h
@@ -47,7 +47,7 @@ class MailWindow final : public Window,
 
         A_DELETE_COPY(MailWindow)
 
-        ~MailWindow();
+        ~MailWindow() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h
index 5aad6e8be..7eff8c367 100644
--- a/src/gui/windows/minimap.h
+++ b/src/gui/windows/minimap.h
@@ -44,7 +44,7 @@ class Minimap final : public Window, public ConfigListener
 
         A_DELETE_COPY(Minimap)
 
-        ~Minimap();
+        ~Minimap() override final;
 
         /**
          * Sets the map image that should be displayed.
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index 9d6e19ac7..33192978c 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -54,7 +54,7 @@ class MiniStatusWindow final : public Window,
 
         A_DELETE_COPY(MiniStatusWindow)
 
-        ~MiniStatusWindow();
+        ~MiniStatusWindow() override final;
 
         /**
          * Sets one of the icons.
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index 71dd171b6..426e1f48f 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -76,7 +76,7 @@ class NpcDialog final : public Window,
 
         A_DELETE_COPY(NpcDialog)
 
-        ~NpcDialog();
+        ~NpcDialog() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h
index 14c7fd3ce..8ff1cc4f4 100644
--- a/src/gui/windows/outfitwindow.h
+++ b/src/gui/windows/outfitwindow.h
@@ -50,7 +50,7 @@ class OutfitWindow final : public Window,
         /**
          * Destructor.
          */
-        ~OutfitWindow();
+        ~OutfitWindow() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h
index fd4175754..8fea2fc2c 100644
--- a/src/gui/windows/questswindow.h
+++ b/src/gui/windows/questswindow.h
@@ -54,7 +54,7 @@ class QuestsWindow final : public Window,
 
         A_DELETE_COPY(QuestsWindow)
 
-        ~QuestsWindow();
+        ~QuestsWindow() override final;
 
         void action(const ActionEvent &event) override final;
 
diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h
index e12e13e7b..8cda875a7 100644
--- a/src/gui/windows/quitdialog.h
+++ b/src/gui/windows/quitdialog.h
@@ -53,7 +53,7 @@ class QuitDialog final : public Window,
         /**
          * Destructor
          */
-        ~QuitDialog();
+        ~QuitDialog() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h
index d0d0d821a..380afc7ce 100644
--- a/src/gui/windows/registerdialog.h
+++ b/src/gui/windows/registerdialog.h
@@ -57,7 +57,7 @@ class RegisterDialog final : public Window,
         /**
          * Destructor
          */
-        ~RegisterDialog();
+        ~RegisterDialog() override final;
 
         void postInit() override;
 
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index 484c28507..19373cafc 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -73,7 +73,7 @@ class ServerDialog final : public Window,
         /**
          * Destructor
          */
-        ~ServerDialog();
+        ~ServerDialog() override final;
 
         /**
          * Called when receiving actions from the widgets.
diff --git a/src/gui/windows/serverinfowindow.h b/src/gui/windows/serverinfowindow.h
index d872b1fdf..9ce7a6fa3 100644
--- a/src/gui/windows/serverinfowindow.h
+++ b/src/gui/windows/serverinfowindow.h
@@ -41,7 +41,7 @@ class ServerInfoWindow final : public Window,
 
         void postInit() override final;
 
-        ~ServerInfoWindow();
+        ~ServerInfoWindow() override final;
 
         void handleLink(const std::string &link,
                         MouseEvent *const event A_UNUSED) override final;
diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h
index 79a11a469..2457382a4 100644
--- a/src/gui/windows/setupwindow.h
+++ b/src/gui/windows/setupwindow.h
@@ -46,7 +46,7 @@ class SetupWindow final : public Window,
 
         A_DELETE_COPY(SetupWindow)
 
-        ~SetupWindow();
+        ~SetupWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h
index 19ceca838..0a8f66b1d 100644
--- a/src/gui/windows/shopwindow.h
+++ b/src/gui/windows/shopwindow.h
@@ -73,7 +73,7 @@ class ShopWindow final : public Window,
         /**
          * Destructor
          */
-        ~ShopWindow();
+        ~ShopWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h
index 8d77f9a5d..6af92d641 100644
--- a/src/gui/windows/shortcutwindow.h
+++ b/src/gui/windows/shortcutwindow.h
@@ -56,7 +56,7 @@ class ShortcutWindow final : public Window
         /**
          * Destructor.
          */
-        ~ShortcutWindow();
+        ~ShortcutWindow() override final;
 
         void addTab(const std::string &name, ShortcutContainer *const content);
 
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index 2273125f0..a69161b32 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -60,7 +60,7 @@ class SkillDialog final : public Window,
 
         A_DELETE_COPY(SkillDialog)
 
-        ~SkillDialog();
+        ~SkillDialog() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h
index 394fdf9d6..bfde9a594 100644
--- a/src/gui/windows/socialwindow.h
+++ b/src/gui/windows/socialwindow.h
@@ -51,7 +51,7 @@ class SocialWindow final : public Window,
 
         A_DELETE_COPY(SocialWindow)
 
-        ~SocialWindow();
+        ~SocialWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h
index c3567deca..295d7dc25 100644
--- a/src/gui/windows/statuswindow.h
+++ b/src/gui/windows/statuswindow.h
@@ -52,7 +52,7 @@ class StatusWindow final : public Window,
 
         A_DELETE_COPY(StatusWindow)
 
-        ~StatusWindow();
+        ~StatusWindow() override final;
 
         void setPointsNeeded(const AttributesT id,
                              const int needed);
diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h
index 88bfd48d4..c177efd2b 100644
--- a/src/gui/windows/textcommandeditor.h
+++ b/src/gui/windows/textcommandeditor.h
@@ -55,7 +55,7 @@ class TextCommandEditor final : public Window,
         /**
          * Destructor.
          */
-        ~TextCommandEditor();
+        ~TextCommandEditor() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/textdialog.h b/src/gui/windows/textdialog.h
index 3a7311e32..225a5c974 100644
--- a/src/gui/windows/textdialog.h
+++ b/src/gui/windows/textdialog.h
@@ -52,7 +52,7 @@ class TextDialog final : public Window,
 
         A_DELETE_COPY(TextDialog)
 
-        ~TextDialog();
+        ~TextDialog() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/textselectdialog.h b/src/gui/windows/textselectdialog.h
index 30e596d32..6c48288fa 100644
--- a/src/gui/windows/textselectdialog.h
+++ b/src/gui/windows/textselectdialog.h
@@ -52,7 +52,7 @@ class TextSelectDialog notfinal : public Window,
         /**
          * Destructor
          */
-        ~TextSelectDialog();
+        ~TextSelectDialog() override final;
 
         /**
          * Called when receiving actions from the widgets.
diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h
index 21461d9e7..05ca4edf1 100644
--- a/src/gui/windows/tradewindow.h
+++ b/src/gui/windows/tradewindow.h
@@ -65,7 +65,7 @@ class TradeWindow final : public Window,
         /**
          * Destructor.
          */
-        ~TradeWindow();
+        ~TradeWindow() override final;
 
         /**
          * Displays expected money in the trade window.
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index 661168a9f..5c58cd299 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -80,7 +80,7 @@ class UpdaterWindow final : public Window,
         /**
          * Destructor
          */
-        ~UpdaterWindow();
+        ~UpdaterWindow() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h
index afdb43785..5fb07e999 100644
--- a/src/gui/windows/whoisonline.h
+++ b/src/gui/windows/whoisonline.h
@@ -54,7 +54,7 @@ class WhoIsOnline final : public Window,
         /**
          * Destructor
          */
-        ~WhoIsOnline();
+        ~WhoIsOnline() override final;
 
         void postInit() override final;
 
diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h
index 4c6dc0f8c..fcfe3e3bc 100644
--- a/src/gui/windows/worldselectdialog.h
+++ b/src/gui/windows/worldselectdialog.h
@@ -58,7 +58,7 @@ class WorldSelectDialog final : public Window,
         /**
          * Destructor.
          */
-        ~WorldSelectDialog();
+        ~WorldSelectDialog() override final;
 
         /**
          * Called when receiving actions from the widgets.