diff --git a/src/fontcache.cpp b/src/fontcache.cpp
index 3b67b8bac5..1671fdae02 100644
--- a/src/fontcache.cpp
+++ b/src/fontcache.cpp
@@ -70,17 +70,17 @@ private:
 public:
 	SpriteFontCache(FontSize fs);
 	~SpriteFontCache();
-	virtual SpriteID GetUnicodeGlyph(WChar key) override;
-	virtual void SetUnicodeGlyph(WChar key, SpriteID sprite) override;
-	virtual void InitializeUnicodeGlyphMap() override;
-	virtual void ClearFontCache() override;
-	virtual const Sprite *GetGlyph(GlyphID key) override;
-	virtual uint GetGlyphWidth(GlyphID key) override;
-	virtual bool GetDrawGlyphShadow() override;
-	virtual GlyphID MapCharToGlyph(WChar key) override { assert(IsPrintable(key)); return SPRITE_GLYPH | key; }
-	virtual const void *GetFontTable(uint32 tag, size_t &length) override { length = 0; return nullptr; }
-	virtual const char *GetFontName() { return "sprite"; }
-	virtual bool IsBuiltInFont() override { return true; }
+	SpriteID GetUnicodeGlyph(WChar key) override;
+	void SetUnicodeGlyph(WChar key, SpriteID sprite) override;
+	void InitializeUnicodeGlyphMap() override;
+	void ClearFontCache() override;
+	const Sprite *GetGlyph(GlyphID key) override;
+	uint GetGlyphWidth(GlyphID key) override;
+	bool GetDrawGlyphShadow() override;
+	GlyphID MapCharToGlyph(WChar key) override { assert(IsPrintable(key)); return SPRITE_GLYPH | key; }
+	const void *GetFontTable(uint32 tag, size_t &length) override { length = 0; return nullptr; }
+	const char *GetFontName() override { return "sprite"; }
+	bool IsBuiltInFont() override { return true; }
 };
 
 /**
diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h
index 6706389e4f..c5d67766e0 100644
--- a/src/newgrf_spritegroup.h
+++ b/src/newgrf_spritegroup.h
@@ -107,7 +107,7 @@ struct RealSpriteGroup : SpriteGroup {
 	std::vector<const SpriteGroup *> loading; ///< List of loading groups (can be SpriteIDs or Callback results)
 
 protected:
-	const SpriteGroup *Resolve(ResolverObject &object) const;
+	const SpriteGroup *Resolve(ResolverObject &object) const override;
 };
 
 /* Shared by deterministic and random groups. */
diff --git a/src/pathfinder/npf/npf.cpp b/src/pathfinder/npf/npf.cpp
index 738aef3461..6a937c11ee 100644
--- a/src/pathfinder/npf/npf.cpp
+++ b/src/pathfinder/npf/npf.cpp
@@ -25,8 +25,6 @@
 static const uint NPF_HASH_BITS = 12; ///< The size of the hash used in pathfinding. Just changing this value should be sufficient to change the hash size. Should be an even value.
 /* Do no change below values */
 static const uint NPF_HASH_SIZE = 1 << NPF_HASH_BITS;
-static const uint NPF_HASH_HALFBITS = NPF_HASH_BITS / 2;
-static const uint NPF_HASH_HALFMASK = (1 << NPF_HASH_HALFBITS) - 1;
 
 /** Meant to be stored in AyStar.targetdata */
 struct NPFFindStationOrTileData {