diff --git a/graphics/scaler/dotmatrix.h b/graphics/scaler/dotmatrix.h
index 15095a1415c..27dbc1267d2 100644
--- a/graphics/scaler/dotmatrix.h
+++ b/graphics/scaler/dotmatrix.h
@@ -27,16 +27,16 @@
 class DotMatrixPlugin : public ScalerPluginObject {
 public:
 	DotMatrixPlugin();
-	virtual void initialize(const Graphics::PixelFormat &format);
-	virtual uint increaseFactor();
-	virtual uint decreaseFactor();
-	virtual bool canDrawCursor() const { return false; }
-	virtual uint extraPixels() const { return 0; }
-	virtual const char *getName() const;
-	virtual const char *getPrettyName() const;
+	virtual void initialize(const Graphics::PixelFormat &format) override;
+	virtual uint increaseFactor() override;
+	virtual uint decreaseFactor() override;
+	virtual bool canDrawCursor() const override { return false; }
+	virtual uint extraPixels() const override { return 0; }
+	virtual const char *getName() const override;
+	virtual const char *getPrettyName() const override;
 protected:
 	virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
-							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y);
+							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
 private:
 	// Allocate enough for 32bpp formats
 	uint32 lookup[16];
diff --git a/graphics/scaler/edge.h b/graphics/scaler/edge.h
index 4fbceff1180..69e4a5d9ea5 100644
--- a/graphics/scaler/edge.h
+++ b/graphics/scaler/edge.h
@@ -28,21 +28,21 @@ class EdgePlugin : public SourceScaler {
 public:
 
 	EdgePlugin();
-	virtual void initialize(const Graphics::PixelFormat &format);
-	virtual uint increaseFactor();
-	virtual uint decreaseFactor();
-	virtual bool canDrawCursor() const { return false; }
-	virtual bool useOldSource() const { return true; }
-	virtual uint extraPixels() const { return 1; }
-	virtual const char *getName() const;
-	virtual const char *getPrettyName() const;
+	virtual void initialize(const Graphics::PixelFormat &format) override;
+	virtual uint increaseFactor() override;
+	virtual uint decreaseFactor() override;
+	virtual bool canDrawCursor() const override { return false; }
+	virtual bool useOldSource() const override { return true; }
+	virtual uint extraPixels() const override { return 1; }
+	virtual const char *getName() const override;
+	virtual const char *getPrettyName() const override;
 
 protected:
 
 	virtual void internScale(const uint8 *srcPtr, uint32 srcPitch,
 						   uint8 *dstPtr, uint32 dstPitch,
 						   const uint8 *oldSrcPtr, uint32 oldSrcPitch,
-						   int width, int height, const uint8 *buffer, uint32 bufferPitch);
+						   int width, int height, const uint8 *buffer, uint32 bufferPitch) override;
 
 private:
 
diff --git a/graphics/scaler/hq.h b/graphics/scaler/hq.h
index 7a5833fe0cd..563bdb3d440 100644
--- a/graphics/scaler/hq.h
+++ b/graphics/scaler/hq.h
@@ -27,17 +27,17 @@
 class HQPlugin : public ScalerPluginObject {
 public:
 	HQPlugin();
-	virtual void initialize(const Graphics::PixelFormat &format);
-	virtual void deinitialize();
-	virtual uint increaseFactor();
-	virtual uint decreaseFactor();
-	virtual bool canDrawCursor() const { return false; }
-	virtual uint extraPixels() const { return 1; }
-	virtual const char *getName() const;
-	virtual const char *getPrettyName() const;
+	virtual void initialize(const Graphics::PixelFormat &format) override;
+	virtual void deinitialize() override;
+	virtual uint increaseFactor() override;
+	virtual uint decreaseFactor() override;
+	virtual bool canDrawCursor() const override { return false; }
+	virtual uint extraPixels() const override { return 1; }
+	virtual const char *getName() const override;
+	virtual const char *getPrettyName() const override;
 protected:
 	virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
-							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y);
+							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
 };
 
 
diff --git a/graphics/scaler/normal.h b/graphics/scaler/normal.h
index 970baec3ff1..a4a4e38cc7d 100644
--- a/graphics/scaler/normal.h
+++ b/graphics/scaler/normal.h
@@ -27,15 +27,15 @@
 class NormalPlugin : public ScalerPluginObject {
 public:
 	NormalPlugin();
-	virtual uint increaseFactor();
-	virtual uint decreaseFactor();
-	virtual bool canDrawCursor() const { return true; }
-	virtual uint extraPixels() const { return 0; }
-	virtual const char *getName() const;
-	virtual const char *getPrettyName() const;
+	virtual uint increaseFactor() override;
+	virtual uint decreaseFactor() override;
+	virtual bool canDrawCursor() const override { return true; }
+	virtual uint extraPixels() const override { return 0; }
+	virtual const char *getName() const override;
+	virtual const char *getPrettyName() const override;
 protected:
 	virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
-							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y);
+							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
 };
 
 
diff --git a/graphics/scaler/pm.h b/graphics/scaler/pm.h
index 4f9e7966a55..d24dd42bd94 100644
--- a/graphics/scaler/pm.h
+++ b/graphics/scaler/pm.h
@@ -28,13 +28,13 @@ class PMPlugin : public ScalerPluginObject {
 public:
 	PMPlugin();
 	virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
-							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y);
-	virtual uint increaseFactor();
-	virtual uint decreaseFactor();
-	virtual bool canDrawCursor() const { return false; }
-	virtual uint extraPixels() const { return 1; }
-	virtual const char *getName() const;
-	virtual const char *getPrettyName() const;
+							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
+	virtual uint increaseFactor() override;
+	virtual uint decreaseFactor() override;
+	virtual bool canDrawCursor() const override { return false; }
+	virtual uint extraPixels() const override { return 1; }
+	virtual const char *getName() const override;
+	virtual const char *getPrettyName() const override;
 };
 
 #endif
diff --git a/graphics/scaler/sai.h b/graphics/scaler/sai.h
index eb549e00afc..c509b5842de 100644
--- a/graphics/scaler/sai.h
+++ b/graphics/scaler/sai.h
@@ -27,43 +27,43 @@
 class SAIPlugin : public ScalerPluginObject {
 public:
 	SAIPlugin();
-	virtual uint increaseFactor();
-	virtual uint decreaseFactor();
-	virtual bool canDrawCursor() const { return false; }
-	virtual uint extraPixels() const { return 2; }
-	virtual const char *getName() const;
-	virtual const char *getPrettyName() const;
+	virtual uint increaseFactor() override;
+	virtual uint decreaseFactor() override;
+	virtual bool canDrawCursor() const override { return false; }
+	virtual uint extraPixels() const override { return 2; }
+	virtual const char *getName() const override;
+	virtual const char *getPrettyName() const override;
 protected:
 	virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
-							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y);
+							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
 };
 
 class SuperSAIPlugin : public ScalerPluginObject {
 public:
 	SuperSAIPlugin();
-	virtual uint increaseFactor();
-	virtual uint decreaseFactor();
-	virtual bool canDrawCursor() const { return false; }
-	virtual uint extraPixels() const { return 2; }
-	virtual const char *getName() const;
-	virtual const char *getPrettyName() const;
+	virtual uint increaseFactor() override;
+	virtual uint decreaseFactor() override;
+	virtual bool canDrawCursor() const override { return false; }
+	virtual uint extraPixels() const override { return 2; }
+	virtual const char *getName() const override;
+	virtual const char *getPrettyName() const override;
 protected:
 	virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
-							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y);
+							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
 };
 
 class SuperEaglePlugin : public ScalerPluginObject {
 public:
 	SuperEaglePlugin();
-	virtual uint increaseFactor();
-	virtual uint decreaseFactor();
-	virtual bool canDrawCursor() const { return false; }
-	virtual uint extraPixels() const { return 2; }
-	virtual const char *getName() const;
-	virtual const char *getPrettyName() const;
+	virtual uint increaseFactor() override;
+	virtual uint decreaseFactor() override;
+	virtual bool canDrawCursor() const override { return false; }
+	virtual uint extraPixels() const override { return 2; }
+	virtual const char *getName() const override;
+	virtual const char *getPrettyName() const override;
 protected:
 	virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
-							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y);
+							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
 };
 
 #endif
diff --git a/graphics/scaler/scalebit.h b/graphics/scaler/scalebit.h
index bf17d0ee8a8..3ccdf71c452 100644
--- a/graphics/scaler/scalebit.h
+++ b/graphics/scaler/scalebit.h
@@ -45,13 +45,13 @@ class AdvMamePlugin : public ScalerPluginObject {
 public:
 	AdvMamePlugin();
 	virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
-							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y);
-	virtual uint increaseFactor();
-	virtual uint decreaseFactor();
-	virtual bool canDrawCursor() const { return true; }
-	virtual uint extraPixels() const { return 4; }
-	virtual const char *getName() const;
-	virtual const char *getPrettyName() const;
+							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
+	virtual uint increaseFactor() override;
+	virtual uint decreaseFactor() override;
+	virtual bool canDrawCursor() const override { return true; }
+	virtual uint extraPixels() const override { return 4; }
+	virtual const char *getName() const override;
+	virtual const char *getPrettyName() const override;
 };
 
 #endif
diff --git a/graphics/scaler/tv.h b/graphics/scaler/tv.h
index 70a5650186a..c56b97d4f9a 100644
--- a/graphics/scaler/tv.h
+++ b/graphics/scaler/tv.h
@@ -27,15 +27,15 @@
 class TVPlugin : public ScalerPluginObject {
 public:
 	TVPlugin();
-	virtual uint increaseFactor();
-	virtual uint decreaseFactor();
-	virtual bool canDrawCursor() const { return false; }
-	virtual uint extraPixels() const { return 0; }
-	virtual const char *getName() const;
-	virtual const char *getPrettyName() const;
+	virtual uint increaseFactor() override;
+	virtual uint decreaseFactor() override;
+	virtual bool canDrawCursor() const override { return false; }
+	virtual uint extraPixels() const override { return 0; }
+	virtual const char *getName() const override;
+	virtual const char *getPrettyName() const override;
 private:
 	virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch,
-							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y);
+							uint8 *dstPtr, uint32 dstPitch, int width, int height, int x, int y) override;
 	template<typename ColorMask>
 	void scaleIntern(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr,
 			uint32 dstPitch, int width, int height);
diff --git a/graphics/scalerplugin.h b/graphics/scalerplugin.h
index 1d50bb98fdb..e44eaaab530 100644
--- a/graphics/scalerplugin.h
+++ b/graphics/scalerplugin.h
@@ -161,16 +161,16 @@ public:
 	SourceScaler();
 	virtual ~SourceScaler();
 
-	virtual void deinitialize();
+	virtual void deinitialize() override;
 
-	virtual void setSource(const byte *src, uint pitch, int width, int height, int padding);
+	virtual void setSource(const byte *src, uint pitch, int width, int height, int padding) final;
 
-	virtual void enableSource(bool enable) { _enable = enable; }
+	virtual void enableSource(bool enable) final { _enable = enable; }
 
 protected:
 
 	virtual void scaleIntern(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr,
-	                         uint32 dstPitch, int width, int height, int x, int y);
+	                         uint32 dstPitch, int width, int height, int x, int y) final;
 
 	/**
 	 * Scalers must implement this function. It will be called by oldSrcScale.