diff --git a/rtengine/camconst.h b/rtengine/camconst.h
index 1096e1767..c014a3322 100644
--- a/rtengine/camconst.h
+++ b/rtengine/camconst.h
@@ -14,7 +14,7 @@ struct camera_const_levels {
     int levels[4];
 };
 
-class CameraConst
+class CameraConst final
 {
 private:
     std::string make_model;
@@ -56,7 +56,7 @@ public:
     void update_globalGreenEquilibration(bool other);
 };
 
-class CameraConstantsStore
+class CameraConstantsStore final
 {
 private:
     std::map<std::string, CameraConst *> mCameraConstants;
diff --git a/rtengine/cieimage.h b/rtengine/cieimage.h
index fea675cd4..329c0ba74 100644
--- a/rtengine/cieimage.h
+++ b/rtengine/cieimage.h
@@ -23,7 +23,7 @@
 namespace rtengine
 {
 
-class CieImage :
+class CieImage final :
     public NonCopyable
 {
 private:
diff --git a/rtengine/dcrop.h b/rtengine/dcrop.h
index c65c1e72f..8feeb4f90 100644
--- a/rtengine/dcrop.h
+++ b/rtengine/dcrop.h
@@ -35,7 +35,7 @@ using namespace procparams;
 
 class ImProcCoordinator;
 
-class Crop : public DetailedCrop, public PipetteBuffer
+class Crop final : public DetailedCrop, public PipetteBuffer
 {
 
 protected:
diff --git a/rtengine/dfmanager.h b/rtengine/dfmanager.h
index 216dcfc53..b23981ffb 100644
--- a/rtengine/dfmanager.h
+++ b/rtengine/dfmanager.h
@@ -31,7 +31,7 @@ namespace rtengine
 {
 
 class RawImage;
-class dfInfo
+class dfInfo final
 {
 public:
 
@@ -74,7 +74,7 @@ protected:
     void updateRawImage();
 };
 
-class DFManager
+class DFManager final
 {
 public:
     void init(const Glib::ustring &pathname);
diff --git a/rtengine/ffmanager.h b/rtengine/ffmanager.h
index 80ef5fa1c..f3303f12b 100644
--- a/rtengine/ffmanager.h
+++ b/rtengine/ffmanager.h
@@ -29,7 +29,7 @@ namespace rtengine
 {
 
 class RawImage;
-class ffInfo
+class ffInfo final
 {
 public:
 
@@ -71,7 +71,7 @@ protected:
     void updateRawImage();
 };
 
-class FFManager
+class FFManager final
 {
 public:
     void init(const Glib::ustring &pathname);
diff --git a/rtengine/iccstore.h b/rtengine/iccstore.h
index 731a155bb..117124122 100644
--- a/rtengine/iccstore.h
+++ b/rtengine/iccstore.h
@@ -39,7 +39,7 @@ namespace procparams
 
 typedef const double(*TMatrix)[3];
 
-class ProfileContent
+class ProfileContent final
 {
 public:
     ProfileContent();
@@ -54,7 +54,7 @@ private:
     std::string data;
 };
 
-class ICCStore
+class ICCStore final
 {
 public:
     enum class ProfileType {
diff --git a/rtengine/iimage.h b/rtengine/iimage.h
index f44c01320..c4e6b7d14 100644
--- a/rtengine/iimage.h
+++ b/rtengine/iimage.h
@@ -658,7 +658,7 @@ public:
 
     /* If any of the required allocation fails, "width" and "height" are set to -1, and all remaining buffer are freed
      * Can be safely used to reallocate an existing image */
-    void allocate (int W, int H) override final
+    void allocate (int W, int H) final
     {
 
         if (W == width && H == height) {
@@ -746,7 +746,7 @@ public:
         }
     }
 
-    void rotate (int deg) override final
+    void rotate (int deg) final
     {
 
         if (deg == 90) {
@@ -873,7 +873,7 @@ public:
         }
     }
 
-    void hflip () override final
+    void hflip () final
     {
         int width2 = width / 2;
 
@@ -905,7 +905,7 @@ public:
 #endif
     }
 
-    void vflip () override final
+    void vflip () final
     {
 
         int height2 = height / 2;
@@ -989,7 +989,7 @@ public:
         }
     }
 
-    void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const override final
+    void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const final
     {
         histogram.clear();
         avg_r = avg_g = avg_b = 0.;
@@ -1328,7 +1328,7 @@ public:
      * If any of the required allocation fails, "width" and "height" are set to -1, and all remaining buffer are freed
      * Can be safely used to reallocate an existing image or to free up it's memory with "allocate (0,0);"
      */
-    void allocate (int W, int H) override final
+    void allocate (int W, int H) final
     {
 
         if (W == width && H == height) {
@@ -1382,7 +1382,7 @@ public:
         memcpy (dest->data, data, 3 * width * height * sizeof(T));
     }
 
-    void rotate (int deg) override final
+    void rotate (int deg) final
     {
 
         if (deg == 90) {
@@ -1516,7 +1516,7 @@ public:
         }
     }
 
-    void hflip () override final
+    void hflip () final
     {
         int width2 = width / 2;
 
@@ -1552,7 +1552,7 @@ public:
         }
     }
 
-    void vflip () override final
+    void vflip () final
     {
 
         AlignedBuffer<T> lBuffer(3 * width);
@@ -1619,7 +1619,7 @@ public:
         }
     }
 
-    void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const override final
+    void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const final
     {
         histogram.clear();
         avg_r = avg_g = avg_b = 0.;
diff --git a/rtengine/imagesource.h b/rtengine/imagesource.h
index d1fa5896e..75b160e10 100644
--- a/rtengine/imagesource.h
+++ b/rtengine/imagesource.h
@@ -143,11 +143,11 @@ public:
 
     virtual void        setProgressListener (ProgressListener* pl) {}
 
-    void        increaseRef () override final
+    void        increaseRef () final
     {
         references++;
     }
-    void        decreaseRef () override final
+    void        decreaseRef () final
     {
         references--;
 
@@ -175,15 +175,15 @@ public:
         return dirpyrdenoiseExpComp;
     }
     // functions inherited from the InitialImage interface
-    Glib::ustring getFileName () override final
+    Glib::ustring getFileName () final
     {
         return fileName;
     }
-    cmsHPROFILE getEmbeddedProfile () override final
+    cmsHPROFILE getEmbeddedProfile () final
     {
         return embProfile;
     }
-    const FramesMetaData* getMetaData () override final
+    const FramesMetaData* getMetaData () final
     {
         return idata;
     }
diff --git a/rtengine/labimage.h b/rtengine/labimage.h
index 79f003b07..7140d9de0 100644
--- a/rtengine/labimage.h
+++ b/rtengine/labimage.h
@@ -23,7 +23,7 @@
 namespace rtengine
 {
 
-class LabImage
+class LabImage final
 {
 private:
     void allocLab(size_t w, size_t h);
diff --git a/rtgui/thresholdselector.h b/rtgui/thresholdselector.h
index 886b82fbd..4ae86560e 100644
--- a/rtgui/thresholdselector.h
+++ b/rtgui/thresholdselector.h
@@ -113,10 +113,10 @@ protected:
     void updateBackBuffer();
 
     Gtk::SizeRequestMode get_request_mode_vfunc () const override;
-    void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const override final;
-    void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override final;
-    void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const override final;
-    void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const override final;
+    void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const final;
+    void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const final;
+    void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const final;
+    void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const final;
     void on_realize () override;
     bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
     bool on_button_press_event (GdkEventButton* event) override;
diff --git a/rtgui/thumbbrowserbase.h b/rtgui/thumbbrowserbase.h
index e1f24594c..69017b183 100644
--- a/rtgui/thumbbrowserbase.h
+++ b/rtgui/thumbbrowserbase.h
@@ -60,10 +60,10 @@ class ThumbBrowserBase :
         bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
 
         Gtk::SizeRequestMode get_request_mode_vfunc () const override;
-        void get_preferred_height_vfunc (int &minimum_height, int &natural_height) const override final;
-        void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override final;
-        void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const override final;
-        void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const override final;
+        void get_preferred_height_vfunc (int &minimum_height, int &natural_height) const final;
+        void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const final;
+        void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const final;
+        void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const final;
 
         bool on_button_press_event (GdkEventButton* event) override;
         bool on_button_release_event (GdkEventButton* event) override;
diff --git a/rtgui/toolpanel.h b/rtgui/toolpanel.h
index 069654128..12b3eebcc 100644
--- a/rtgui/toolpanel.h
+++ b/rtgui/toolpanel.h
@@ -164,11 +164,11 @@ public:
 
     FoldableToolPanel(Gtk::Box* content, Glib::ustring toolName, Glib::ustring UILabel, bool need11 = false, bool useEnabled = false);
 
-    MyExpander* getExpander() override final
+    MyExpander* getExpander() final
     {
         return exp;
     }
-    void setExpanded (bool expanded) override final
+    void setExpanded (bool expanded) final
     {
         if (exp) {
             exp->set_expanded( expanded );
@@ -186,7 +186,7 @@ public:
             exp->show();
         }
     }
-    bool getExpanded () override final
+    bool getExpanded () final
     {
         if (exp) {
             return exp->get_expanded();
@@ -194,11 +194,11 @@ public:
 
         return false;
     }
-    void setParent (Gtk::Box* parent) override final
+    void setParent (Gtk::Box* parent) final
     {
         parentContainer = parent;
     }
-    Gtk::Box* getParent () override final
+    Gtk::Box* getParent () final
     {
         return parentContainer;
     }
diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h
index 17f14673d..0fc1a9070 100644
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -314,11 +314,11 @@ public:
 
     // imageareatoollistener interface
     void spotWBselected(int x, int y, Thumbnail* thm = nullptr) override;
-    void sharpMaskSelected(bool sharpMask) override;
+    void sharpMaskSelected(bool sharpMask) override final;
     int getSpotWBRectSize() const override;
     void cropSelectionReady() override;
     void rotateSelectionReady(double rotate_deg, Thumbnail* thm = nullptr) override;
-    ToolBar* getToolBar() const override final;
+    ToolBar* getToolBar() const final;
     CropGUIListener* startCropEditing(Thumbnail* thm = nullptr) override;
 
     void updateTPVScrollbar (bool hide);
@@ -326,7 +326,7 @@ public:
 
     // ToolBarListener interface
     void toolSelected (ToolMode tool) override;
-    void editModeSwitchedOff () override final;
+    void editModeSwitchedOff () final;
 
     void setEditProvider (EditDataProvider *provider);