diff --git a/engines/ultima/detection.h b/engines/ultima/detection.h
index a69ff2ec22e..4d592e14350 100644
--- a/engines/ultima/detection.h
+++ b/engines/ultima/detection.h
@@ -61,30 +61,30 @@ struct UltimaGameDescription {
 class UltimaMetaEngine : public AdvancedMetaEngine {
 public:
 	UltimaMetaEngine();
-	virtual ~UltimaMetaEngine();
+	~UltimaMetaEngine() override;
 
-	virtual const char *getEngineId() const override {
+	const char *getEngineId() const override {
 		return "ultima";
 	}
 
-	virtual const char *getName() const override {
+	const char *getName() const override {
 		return "Ultima";
 	}
 
-	virtual const char *getOriginalCopyright() const override {
+	const char *getOriginalCopyright() const override {
 		return "Ultima Games (C) 1980-1995 Origin Systems Inc.";
 	}
 
-	virtual const char *getSavegamePattern(const char *target = nullptr) const override;
-	virtual const char *getSavegameFile(int saveGameIdx, const char *target = nullptr) const override;
+	const char *getSavegamePattern(const char *target = nullptr) const override;
+	const char *getSavegameFile(int saveGameIdx, const char *target = nullptr) const override;
 
-	virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
-	virtual int getMaximumSaveSlot() const override;
+	bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+	int getMaximumSaveSlot() const override;
 
 	/**
 	 * Return a list of all save states associated with the given target.
 	 */
-	virtual SaveStateList listSaves(const char *target) const override;
+	SaveStateList listSaves(const char *target) const override;
 };
 
 namespace Ultima {
diff --git a/engines/ultima/nuvie/actors/md_actor.h b/engines/ultima/nuvie/actors/md_actor.h
index 5abd32613c4..2de7d6fa956 100644
--- a/engines/ultima/nuvie/actors/md_actor.h
+++ b/engines/ultima/nuvie/actors/md_actor.h
@@ -34,9 +34,9 @@ protected:
 public:
 
 	MDActor(Map *m, ObjManager *om, GameClock *c);
-	~MDActor();
+	~MDActor() override;
 
-	virtual bool init(uint8 unused = 0) override;
+	bool init(uint8 unused = 0) override;
 	bool will_not_talk() override;
 	uint8 get_maxhp() override {
 		return (((level * 24 + strength * 2) < 255) ? (level * 24 + strength * 2) : 255);
@@ -47,7 +47,7 @@ public:
 	bool is_immobile() override;
 
 	bool check_move(uint16 new_x, uint16 new_y, uint8 new_z, ActorMoveFlags flags = 0) override;
-	virtual uint16 get_downward_facing_tile_num() override;
+	uint16 get_downward_facing_tile_num() override;
 	void set_direction(uint8 d) override;
 	bool is_passable() override;
 
diff --git a/engines/ultima/nuvie/actors/se_actor.h b/engines/ultima/nuvie/actors/se_actor.h
index 3dab3447c4c..e85dd470fc1 100644
--- a/engines/ultima/nuvie/actors/se_actor.h
+++ b/engines/ultima/nuvie/actors/se_actor.h
@@ -35,9 +35,9 @@ protected:
 public:
 
 	SEActor(Map *m, ObjManager *om, GameClock *c);
-	~SEActor();
+	~SEActor() override;
 
-	virtual bool init(uint8 unused = 0) override;
+	bool init(uint8 unused = 0) override;
 	bool will_not_talk() override;
 	uint8 get_maxhp() override {
 		return (((level * 4 + strength * 2) < 255) ? (level * 4 + strength * 2) : 255);
diff --git a/engines/ultima/nuvie/actors/u6_actor.h b/engines/ultima/nuvie/actors/u6_actor.h
index b70f8a7c16d..7f0a8e5f79a 100644
--- a/engines/ultima/nuvie/actors/u6_actor.h
+++ b/engines/ultima/nuvie/actors/u6_actor.h
@@ -69,64 +69,64 @@ protected:
 public:
 
 	U6Actor(Map *m, ObjManager *om, GameClock *c);
-	~U6Actor();
+	~U6Actor() override;
 
-	bool init(uint8 obj_status = NO_OBJ_STATUS);
-	virtual uint16 get_downward_facing_tile_num();
-	bool updateSchedule(uint8 hour, bool teleport = false);
-	void set_worktype(uint8 new_worktype, bool init = false);
-	void revert_worktype();
-	void change_base_obj_n(uint16 val);
-	void set_direction(uint8 d);
-	void face_location(uint16 lx, uint16 ly);
-	void clear();
-	bool move(uint16 new_x, uint16 new_y, uint8 new_z, ActorMoveFlags flags = 0);
-	bool check_move(uint16 new_x, uint16 new_y, uint8 new_z, ActorMoveFlags flags = 0);
-	void twitch();
+	bool init(uint8 obj_status = NO_OBJ_STATUS) override;
+	uint16 get_downward_facing_tile_num() override;
+	bool updateSchedule(uint8 hour, bool teleport = false) override;
+	void set_worktype(uint8 new_worktype, bool init = false) override;
+	void revert_worktype() override;
+	void change_base_obj_n(uint16 val) override;
+	void set_direction(uint8 d) override;
+	void face_location(uint16 lx, uint16 ly) override;
+	void clear() override;
+	bool move(uint16 new_x, uint16 new_y, uint8 new_z, ActorMoveFlags flags = 0) override;
+	bool check_move(uint16 new_x, uint16 new_y, uint8 new_z, ActorMoveFlags flags = 0) override;
+	void twitch() override;
 	void do_twitch();
-	void die(bool create_body = true);
-	void set_paralyzed(bool paralyzed);
-	void set_protected(bool val);
-	void set_charmed(bool val);
-	void set_corpser_flag(bool val);
-	void set_cursed(bool val);
-	void set_asleep(bool val);
-	void set_ethereal(bool val) {
+	void die(bool create_body = true) override;
+	void set_paralyzed(bool paralyzed) override;
+	void set_protected(bool val) override;
+	void set_charmed(bool val) override;
+	void set_corpser_flag(bool val) override;
+	void set_cursed(bool val) override;
+	void set_asleep(bool val) override;
+	void set_ethereal(bool val) override {
 		current_movetype = val ? MOVETYPE_U6_ETHEREAL : actor_type->movetype;
 		ethereal = val;
 	}
 
-	uint8 get_object_readiable_location(Obj *obj);
-	const CombatType *get_object_combat_type(uint16 objN);
-	ActorTileType get_tile_type() {
+	uint8 get_object_readiable_location(Obj *obj) override;
+	const CombatType *get_object_combat_type(uint16 objN) override;
+	ActorTileType get_tile_type() override {
 		return (actor_type->tile_type);
 	}
-	Obj *inventory_get_food(Obj *container = 0);
-	uint8 get_maxhp() {
+	Obj *inventory_get_food(Obj *container = 0) override;
+	uint8 get_maxhp() override {
 		return (((level * 30) <= 255) ? (level * 30) : 255);    // U6
 	}
-	uint8 get_maxmagic();
+	uint8 get_maxmagic() override;
 
-	bool weapon_can_hit(const CombatType *weapon, Actor *target, uint16 *hit_x, uint16 *hit_y);
+	bool weapon_can_hit(const CombatType *weapon, Actor *target, uint16 *hit_x, uint16 *hit_y) override;
 
-	bool is_immobile(); // frozen by worktype or status
+	bool is_immobile() override; // frozen by worktype or status
 	bool can_twitch();
 
-	bool get_corpser_flag() {
+	bool get_corpser_flag() override {
 		return (movement_flags & ACTOR_MOVEMENT_FLAGS_CORPSER);
 	}
-	bool can_be_passed(Actor *other);
-	bool will_not_talk();
+	bool can_be_passed(Actor *other) override;
+	bool will_not_talk() override;
 
 	void set_actor_obj_n(uint16 new_obj_n);
-	void pathfind_to(MapCoord &d);
-	void handle_lightsource(uint8 hour);
+	void pathfind_to(MapCoord &d) override;
+	void handle_lightsource(uint8 hour) override;
 
-	uint8 get_hp_text_color();
-	uint8 get_str_text_color() {
+	uint8 get_hp_text_color() override;
+	uint8 get_str_text_color() override {
 		return 0x48;
 	}
-	uint8 get_dex_text_color() {
+	uint8 get_dex_text_color() override {
 		return 0x48;
 	}
 
@@ -166,10 +166,10 @@ protected:
 	inline void clear_surrounding_objs_list(bool delete_objs = false);
 	inline void init_surrounding_obj(uint16 x, uint16 y, uint8 z, uint16 actor_obj_n, uint16 obj_frame_n);
 
-	const CombatType *get_hand_combat_type();
+	const CombatType *get_hand_combat_type() override;
 
-	void print();
-	const char *get_worktype_string(uint32 wt);
+	void print() override;
+	const char *get_worktype_string(uint32 wt) override;
 	void inventory_make_all_objs_ok_to_take();
 };
 
diff --git a/engines/ultima/nuvie/actors/wou_actor.h b/engines/ultima/nuvie/actors/wou_actor.h
index 04e0d52b6a6..1d381f619d3 100644
--- a/engines/ultima/nuvie/actors/wou_actor.h
+++ b/engines/ultima/nuvie/actors/wou_actor.h
@@ -34,10 +34,10 @@ protected:
 public:
 
 	WOUActor(Map *m, ObjManager *om, GameClock *c) : Actor(m, om, c) { }
-	~WOUActor() { }
+	~WOUActor() override { }
 
-	virtual bool can_carry_object(uint16 obj_n, uint32 qty = 0);
-	virtual bool can_carry_object(Obj *obj);
+	bool can_carry_object(uint16 obj_n, uint32 qty = 0) override;
+	bool can_carry_object(Obj *obj) override;
 
 };
 
diff --git a/engines/ultima/nuvie/core/anim_manager.h b/engines/ultima/nuvie/core/anim_manager.h
index 5940cbd0a50..312d9318d4f 100644
--- a/engines/ultima/nuvie/core/anim_manager.h
+++ b/engines/ultima/nuvie/core/anim_manager.h
@@ -137,7 +137,7 @@ protected:
 
 public:
 	NuvieAnim();
-	~NuvieAnim();
+	~NuvieAnim() override;
 
 	void pause() {
 		paused = true;
@@ -208,13 +208,13 @@ protected:
 
 	vector<PositionedTile *> tiles;
 
-	virtual void display();
+	void display() override;
 
 public:
 	TileAnim();
-	~TileAnim();
+	~TileAnim() override;
 
-	MapCoord get_location() {
+	MapCoord get_location() override {
 		return (MapCoord(tx, ty, 0));
 	}
 	void get_offset(uint32 &x_add, uint32 &y_add) {
@@ -223,13 +223,13 @@ public:
 	}
 	sint32 get_tile_id(PositionedTile *find_tile);
 
-	void move(uint32 x, uint32 y, uint32 add_x = 0, uint32 add_y = 0) {
+	void move(uint32 x, uint32 y, uint32 add_x = 0, uint32 add_y = 0) override {
 		tx = x;
 		ty = y;
 		px = add_x;
 		py = add_y;
 	}
-	void shift(sint32 sx, sint32 sy);
+	void shift(sint32 sx, sint32 sy) override;
 	void shift_tile(uint32 ptile_num, sint32 sx, sint32 sy);
 	void move_tile(PositionedTile *ptile, uint32 x, uint32 y);
 
@@ -249,7 +249,7 @@ public:
 	TimedAnim()  {
 		timer = NULL;
 	}
-	~TimedAnim() {
+	~TimedAnim() override {
 		stop_timer();
 	}
 	void start_timer(uint32 delay) {
@@ -262,7 +262,7 @@ public:
 		}
 	}
 
-	void stop() {
+	void stop() override {
 		stop_timer();
 		NuvieAnim::stop();
 	}
@@ -297,19 +297,19 @@ protected:
 	float x_left, y_left; // when unable to move in a call, fractional movement values are collected here
 	uint16 x_dist, y_dist; // distances from start->target on X-axis & Y-axis
 
-	bool update();
-	MapCoord get_location();
+	bool update() override;
+	MapCoord get_location() override;
 
-	virtual void display();
+	void display() override;
 
 public:
 	TossAnim(Tile *tile, const MapCoord &start, const MapCoord &stop, uint16 pixels_per_sec, uint8 stop_flags = 0);
 	TossAnim(Obj *obj, uint16 degrees, const MapCoord &start, const MapCoord &stop, uint16 pixels_per_sec, uint8 stop_flags = 0);
-	~TossAnim();
+	~TossAnim() override;
 
 	void init(Tile *tile, uint16 degrees, const MapCoord &start, const MapCoord &stop, uint16 pixels_per_sec, uint8 stop_flags);
-	void start();
-	void stop();
+	void start() override;
+	void stop() override;
 	uint32 update_position(uint32 max_move = 0);
 	inline void accumulate_moves(float moves, sint32 &x_move, sint32 &y_move, sint8 xdir, sint8 ydir);
 
@@ -346,9 +346,9 @@ class ExplosiveAnim : public TimedAnim {
 
 public:
 	ExplosiveAnim(MapCoord *start, uint32 size);
-	~ExplosiveAnim();
+	~ExplosiveAnim() override;
 	void start() override;
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 	bool update() override;
 	bool already_hit(MapEntity ent);
 	void hit_object(Obj *obj);
@@ -380,10 +380,10 @@ class ProjectileAnim : public TileAnim {
 	bool leaveTrailFlag;
 public:
 	ProjectileAnim(uint16 tileNum, MapCoord *start, vector<MapCoord> target, uint8 animSpeed, bool leaveTrailFlag = false, uint16 initialTileRotation = 0, uint16 rotationAmount = 0, uint8 src_y_offset = 0);
-	~ProjectileAnim();
-	void start();
+	~ProjectileAnim() override;
+	void start() override;
 
-	bool update();
+	bool update() override;
 
 protected:
 	void hit_entity(MapEntity entity);
@@ -403,9 +403,9 @@ class WingAnim : public TileAnim {
 
 public:
 	WingAnim(MapCoord target);
-	~WingAnim();
-	void start();
-	bool update();
+	~WingAnim() override;
+	void start() override;
+	bool update() override;
 
 };
 
@@ -427,9 +427,9 @@ class HailstormAnim : public TileAnim {
 
 public:
 	HailstormAnim(MapCoord t);
-	~HailstormAnim();
-	void start();
-	bool update();
+	~HailstormAnim() override;
+	void start() override;
+	bool update() override;
 
 protected:
 	sint8 find_free_hailstone();
@@ -447,7 +447,7 @@ public:
 	HitAnim(MapCoord *loc);
 	HitAnim(Actor *actor);
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *msg_data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *msg_data) override;
 	void start() override {
 		start_timer(300);
 	}
@@ -460,13 +460,13 @@ class TextAnim : public TimedAnim {
 
 public:
 	TextAnim(Std::string text, MapCoord loc, uint32 dur);
-	~TextAnim();
-	uint16 callback(uint16 msg, CallBack *caller, void *msg_data);
-	void start()                    {
+	~TextAnim() override;
+	uint16 callback(uint16 msg, CallBack *caller, void *msg_data) override;
+	void start() override                    {
 		start_timer(duration);
 	}
 
-	void display();
+	void display() override;
 };
 
 class TileFadeAnim : public TileAnim {
@@ -481,9 +481,9 @@ public:
 	TileFadeAnim();
 	TileFadeAnim(MapCoord *loc, Tile *from, Tile *to, uint16 speed);
 	TileFadeAnim(MapCoord *loc, Tile *from, uint8 color_from, uint8 color_to, bool reverse, uint16 speed);
-	~TileFadeAnim();
+	~TileFadeAnim() override;
 
-	bool update();
+	bool update() override;
 protected:
 	void init(uint16 speed);
 };
diff --git a/engines/ultima/nuvie/core/converse_interpret.h b/engines/ultima/nuvie/core/converse_interpret.h
index 5ff1c65b138..2472785676f 100644
--- a/engines/ultima/nuvie/core/converse_interpret.h
+++ b/engines/ultima/nuvie/core/converse_interpret.h
@@ -320,7 +320,7 @@ public:
 	WOUConverseInterpret(Converse *owner) : ConverseInterpret(owner) { }
 
 protected:
-	virtual bool op_create_new(stack<converse_typed_value> &i);
+	bool op_create_new(stack<converse_typed_value> &i) override;
 };
 
 class SETalkInterpret : public ConverseInterpret {
diff --git a/engines/ultima/nuvie/core/debugger.h b/engines/ultima/nuvie/core/debugger.h
index de2cbfb4ad4..8cf5c88956a 100644
--- a/engines/ultima/nuvie/core/debugger.h
+++ b/engines/ultima/nuvie/core/debugger.h
@@ -34,7 +34,7 @@ namespace Nuvie {
 class Debugger : public Shared::Debugger {
 public:
 	Debugger();
-    virtual ~Debugger() {}
+    ~Debugger() override {}
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/core/effect.h b/engines/ultima/nuvie/core/effect.h
index 2e3f757d8f9..3a64eed3b9b 100644
--- a/engines/ultima/nuvie/core/effect.h
+++ b/engines/ultima/nuvie/core/effect.h
@@ -75,7 +75,7 @@ protected:
 
 public:
 	Effect();
-	~Effect();
+	~Effect() override;
 
 	void retain() {
 		retain_count++;
@@ -95,7 +95,7 @@ public:
 	bool is_defunct()  {
 		return (defunct);
 	}
-	uint16 callback(uint16, CallBack *, void *) {
+	uint16 callback(uint16, CallBack *, void *) override {
 		return (0);
 	}
 };
@@ -117,7 +117,7 @@ public:
 	CannonballEffect(Obj *src_obj, sint8 direction = -1);
 //    CannonballEffect(Actor *src_actor, Actor *target_actor); from a ship
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 class ProjectileEffect : public Effect {
@@ -152,7 +152,7 @@ public:
 
 	void init(uint16 tileNum, MapCoord start, vector<MapCoord> t, uint8 speed, bool trailFlag, uint16 initialTileRotation, uint16 rotationAmount, uint8 src_y_offset);
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 
 	vector<MapEntity> *get_hit_entities() {
 		return &hit_entities;
@@ -167,7 +167,7 @@ class ExpEffect : public ProjectileEffect {
 	uint16 exp_tile_num;
 
 protected:
-	void start_anim();
+	void start_anim() override;
 public:
 	ExpEffect(uint16 tileNum, MapCoord location);
 
@@ -187,7 +187,7 @@ public:
 		timer = NULL;
 		start_timer(delay);
 	}
-	~TimedEffect()                 {
+	~TimedEffect() override                 {
 		stop_timer();
 	}
 
@@ -199,7 +199,7 @@ public:
 		Effect::delete_self();
 	}
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override {
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override {
 		if (msg == MESG_TIMED) delete_self();    //= 0;
 		return (0);
 	}
@@ -219,8 +219,8 @@ class QuakeEffect : public TimedEffect {
 
 public:
 	QuakeEffect(uint8 magnitude, uint32 duration, Actor *keep_on = NULL);
-	~QuakeEffect();
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	~QuakeEffect() override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 
 	void init_directions();
 	void recenter_map();
@@ -234,7 +234,7 @@ class HitEffect : public Effect {
 public:
 	HitEffect(Actor *target, uint32 duration = 300);
 	HitEffect(MapCoord location);
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 /* Print text to MapWindow for a given duration
@@ -244,7 +244,7 @@ class TextEffect : public Effect {
 public:
 	TextEffect(Std::string text);
 	TextEffect(Std::string text, MapCoord location);
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 
@@ -263,7 +263,7 @@ protected:
 
 public:
 	ExplosiveEffect(uint16 x, uint16 y, uint32 size, uint16 dmg = 0);
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 
 	// children can override
 	virtual void delete_self() {
@@ -286,8 +286,8 @@ public:
 	UseCodeExplosiveEffect(Obj *src_obj, uint16 x, uint16 y, uint32 size, uint16 dmg = 0, Obj *dont_hit_me = NULL)
 		: ExplosiveEffect(x, y, size, dmg), obj(src_obj), original_obj(dont_hit_me) {
 	}
-	void delete_self();
-	bool hit_object(Obj *hit_obj); // explosion hit something
+	void delete_self() override;
+	bool hit_object(Obj *hit_obj) override; // explosion hit something
 
 
 
@@ -312,12 +312,12 @@ protected:
 
 public:
 	ThrowObjectEffect();
-	virtual ~ThrowObjectEffect() { }
+	~ThrowObjectEffect() override { }
 
 	void hit_target(); // stops effect
 	void start_anim();
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) = 0;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override = 0;
 };
 
 
@@ -333,7 +333,7 @@ public:
 	void hit_target();
 
 	void get_obj(Obj *obj, uint16 qty);
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 #define MISSILE_DEFAULT_SPEED 200
@@ -366,7 +366,7 @@ public:
 	          const MapCoord &target, uint32 dmg, uint8 intercept, uint32 speed);
 	void hit_target();
 	void hit_blocking();
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 #if 0
@@ -398,9 +398,9 @@ class SleepEffect : public Effect {
 public:
 	SleepEffect(Std::string until);
 	SleepEffect(uint8 to_hour);
-	~SleepEffect();
+	~SleepEffect() override;
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 	void delete_self();
 };
 
@@ -438,8 +438,8 @@ public:
 	FadeEffect(FadeType fade, FadeDirection dir, uint32 color = 0, uint32 speed = 0);
 	FadeEffect(FadeType fade, FadeDirection dir, Graphics::ManagedSurface *capture, uint32 speed = 0);
 	FadeEffect(FadeType fade, FadeDirection dir, Graphics::ManagedSurface *capture, uint16 x, uint16 y, uint32 speed = 0);
-	~FadeEffect();
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	~FadeEffect() override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 
 	bool pixelated_fade_out();
 	bool pixelated_fade_in();
@@ -465,8 +465,8 @@ protected:
 class GameFadeInEffect : public FadeEffect {
 public:
 	GameFadeInEffect(uint32 color);
-	~GameFadeInEffect();
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	~GameFadeInEffect() override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 
@@ -479,8 +479,8 @@ class FadeObjectEffect : public Effect {
 	FadeDirection fade_dir;
 public:
 	FadeObjectEffect(Obj *obj, FadeDirection dir);
-	~FadeObjectEffect();
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	~FadeObjectEffect() override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 
@@ -493,8 +493,8 @@ class VanishEffect : public Effect {
 	bool input_blocked;
 public:
 	VanishEffect(bool pause_user = VANISH_NOWAIT);
-	~VanishEffect();
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	~VanishEffect() override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 class TileFadeEffect : public TimedEffect {
@@ -511,8 +511,8 @@ public:
 	TileFadeEffect(MapCoord loc, Tile *from, Tile *to, FadeType type, uint16 speed);
 	//TileFadeEffect(MapCoord loc, Tile *from, uint8 color_from, uint8 color_to, bool reverse, uint16 speed);
 	TileFadeEffect(Actor *a, uint16 speed);
-	~TileFadeEffect();
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	~TileFadeEffect() override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 
 protected:
 	void add_actor_anim();
@@ -532,8 +532,8 @@ class TileBlackFadeEffect : public TimedEffect {
 public:
 	TileBlackFadeEffect(Actor *a, uint8 fade_color, uint16 speed);
 	TileBlackFadeEffect(Obj *o, uint8 fade_color, uint16 speed);
-	~TileBlackFadeEffect();
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	~TileBlackFadeEffect() override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 protected:
 	void init(uint8 fade_color, uint16 speed);
 	void add_actor_anim();
@@ -555,10 +555,10 @@ class XorEffect : public TimedEffect {
 public:
 	/* eff_ms=length of visual effect */
 	XorEffect(uint32 eff_ms);
-	~XorEffect() { }
+	~XorEffect() override { }
 
 	/* Called by the timer between each effect stage. */
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 /* Briefly modify the mapwindow colors, disable map-blacking and player
@@ -577,10 +577,10 @@ class U6WhitePotionEffect : public TimedEffect {
 public:
 	/* eff_ms=length of visual effect; delay_ms=length of x-ray effect */
 	U6WhitePotionEffect(uint32 eff_ms, uint32 delay_ms, Obj *callback_obj = NULL);
-	~U6WhitePotionEffect() { }
+	~U6WhitePotionEffect() override { }
 
 	/* Called by the timer between each effect stage. */
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 
@@ -591,21 +591,21 @@ class XRayEffect : public TimedEffect {
 public:
 	/* eff_ms=length of x-ray effect */
 	XRayEffect(uint32 eff_ms);
-	~XRayEffect() { }
+	~XRayEffect() override { }
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 /* Pause the game, create an effect, and wait for user input to continue. */
 class PauseEffect: public Effect {
 public:
 	/* Called by the Effect handler when input is available. */
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 	virtual void delete_self() {
 		Effect::delete_self();
 	}
 	PauseEffect();
-	~PauseEffect() { }
+	~PauseEffect() override { }
 };
 
 /* Gather text from scroll input then continue. */
@@ -613,9 +613,9 @@ class TextInputEffect: public Effect {
 	Std::string input;
 public:
 	/* Called by the Effect handler when input is available. */
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 	TextInputEffect(const char *allowed_chars, bool can_escape);
-	~TextInputEffect() { }
+	~TextInputEffect() override { }
 	Std::string get_input() {
 		return input;
 	}
@@ -624,12 +624,12 @@ public:
 class WizardEyeEffect: public Effect {
 public:
 	/* Called by the Effect handler when input is available. */
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 	virtual void delete_self() {
 		Effect::delete_self();
 	}
 	WizardEyeEffect(MapCoord location, uint16 duration);
-	~WizardEyeEffect() { }
+	~WizardEyeEffect() override { }
 };
 
 /* colors for PeerEffect */
@@ -668,9 +668,9 @@ class PeerEffect : public PauseEffect {
 
 public:
 	PeerEffect(uint16 x, uint16 y, uint8 z, Obj *callback_obj = 0);
-	~PeerEffect() { }
+	~PeerEffect() override { }
 	void init_effect();
-	void delete_self();
+	void delete_self() override;
 };
 
 class WingStrikeEffect : public Effect {
@@ -681,7 +681,7 @@ protected:
 public:
 	WingStrikeEffect(Actor *target_actor);
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 class HailStormEffect : public Effect {
@@ -690,7 +690,7 @@ protected:
 public:
 	HailStormEffect(MapCoord target);
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 #define EFFECT_PROCESS_GUI_INPUT true
@@ -703,9 +703,9 @@ protected:
 
 public:
 	AsyncEffect(Effect *e);
-	~AsyncEffect();
+	~AsyncEffect() override;
 	void run(bool process_gui_input = false);
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/core/events.h b/engines/ultima/nuvie/core/events.h
index db652159b63..a633c7233cd 100644
--- a/engines/ultima/nuvie/core/events.h
+++ b/engines/ultima/nuvie/core/events.h
@@ -236,14 +236,14 @@ private:
 protected:
 	inline uint32 TimeLeft();
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data = NULL) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data = NULL) override;
 	bool handleSDL_KEYDOWN(const Common::Event *event);
 	const char *print_mode(EventMode mode);
 	void try_next_attack();
 
 public:
 	Events(Shared::EventsCallback *callback, Configuration *cfg);
-	virtual ~Events();
+	~Events() override;
 
 	void clear();
 
diff --git a/engines/ultima/nuvie/core/magic.h b/engines/ultima/nuvie/core/magic.h
index 2c13aea550e..f13622a72a6 100644
--- a/engines/ultima/nuvie/core/magic.h
+++ b/engines/ultima/nuvie/core/magic.h
@@ -94,7 +94,7 @@ private:
 	 */
 public:
 	Magic();
-	~Magic();
+	~Magic() override;
 	bool init(Events *evt);
 
 	bool read_spell_list();
@@ -107,7 +107,7 @@ public:
 	bool cast();
 	void cast_spell_directly(uint8 spell_num);
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data = NULL) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data = NULL) override;
 	bool process_script_return(uint8 ret);
 	bool resume(MapCoord location);
 	bool resume(uint8 dir);
diff --git a/engines/ultima/nuvie/core/timed_event.h b/engines/ultima/nuvie/core/timed_event.h
index 421f45babea..fd5fd3dfdc8 100644
--- a/engines/ultima/nuvie/core/timed_event.h
+++ b/engines/ultima/nuvie/core/timed_event.h
@@ -126,7 +126,7 @@ public:
 		: TimedEvent(reltime), msg(m) {
 		repeat_count = repeat ? -1 : 0;
 	}
-	void timed(uint32 evtime) {
+	void timed(uint32 evtime) override {
 		DEBUG(0, LEVEL_NOTIFICATION, "Activate! evtime=%d msg=\"%s\"\n", evtime, msg.c_str());
 	}
 };
@@ -151,11 +151,11 @@ public:
 	TimedPartyMove(MapCoord *d, MapCoord *t, uint32 step_delay = 500);
 	TimedPartyMove(MapCoord *d, MapCoord *t, Obj *use_obj, uint32 step_delay = 500);
 	TimedPartyMove(uint32 step_delay = 500);
-	~TimedPartyMove();
+	~TimedPartyMove() override;
 	void init(MapCoord *d, MapCoord *t, Obj *use_obj);
 	void timed(uint32 evtime) override;
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data = NULL) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data = NULL) override;
 
 protected:
 	bool move_party();
@@ -171,7 +171,7 @@ class TimedPartyMoveToVehicle : public TimedPartyMove {
 	Obj *ship_obj; // vehicle center
 public:
 	TimedPartyMoveToVehicle(MapCoord *d, Obj *obj, uint32 step_delay = 125);
-	void timed(uint32 evtime);
+	void timed(uint32 evtime) override;
 };
 
 
@@ -199,7 +199,7 @@ class TimedContainerSearch : public TimedEvent {
 	Obj *prev_obj; // removed from container
 public:
 	TimedContainerSearch(Obj *obj);
-	void timed(uint32 evtime);
+	void timed(uint32 evtime) override;
 };
 
 
@@ -211,8 +211,8 @@ class TimedCallback : public TimedEvent, public CallBack {
 public:
 	TimedCallback(CallBack *t, void *d, uint32 wait_time,
 	              bool repeat = false);
-	virtual ~TimedCallback() {  }
-	virtual void timed(uint32 evtime);
+	~TimedCallback() override {  }
+	void timed(uint32 evtime) override;
 	void clear_target() {
 		set_target(NULL);
 	}
@@ -222,7 +222,7 @@ public:
 class GameTimedCallback : public TimedCallback {
 public:
 	GameTimedCallback(CallBack *t, void *d, uint32 wait_time, bool repeat = false);
-	~GameTimedCallback() {  }
+	~GameTimedCallback() override {  }
 };
 
 
@@ -241,11 +241,11 @@ protected:
 public:
 	TimedAdvance(uint8 hours, uint16 r = 60);
 	TimedAdvance(Std::string timestring, uint16 r = 60); // "HH:MM"
-	virtual ~TimedAdvance() { }
+	~TimedAdvance() override { }
 
 	void init(uint16 min, uint16 r); // start time advance
 
-	virtual void timed(uint32 evtime);
+	void timed(uint32 evtime) override;
 	bool time_passed(); // returns true if stop time has passed
 	void get_time_from_string(uint8 &hour, uint8 &minute, Std::string timestring);
 };
@@ -258,7 +258,7 @@ class TimedRestGather : public TimedPartyMove {
 public:
 	TimedRestGather(uint16 x, uint16 y);
 
-	void timed(uint32 evtime);
+	void timed(uint32 evtime) override;
 
 protected:
 	bool move_party();
@@ -278,9 +278,9 @@ class TimedRest : public TimedAdvance {
 	uint8 number_that_had_food;
 public:
 	TimedRest(uint8 hours, Actor *lookout, Obj *campfire_obj);
-	~TimedRest();
+	~TimedRest() override;
 
-	void timed(uint32 evtime);
+	void timed(uint32 evtime) override;
 	void eat(Actor *actor);
 	void bard_play();
 	void sleep();
diff --git a/engines/ultima/nuvie/core/weather.h b/engines/ultima/nuvie/core/weather.h
index 780bc730e93..3fe0534de50 100644
--- a/engines/ultima/nuvie/core/weather.h
+++ b/engines/ultima/nuvie/core/weather.h
@@ -58,7 +58,7 @@ class Weather: public CallBack {
 public:
 
 	Weather(Configuration *cfg, GameClock *c, nuvie_game_t type);
-	~Weather();
+	~Weather() override;
 
 	bool load(NuvieIO *objlist);
 	bool save(NuvieIO *objlist);
@@ -79,7 +79,7 @@ public:
 	bool is_eclipse();
 	bool is_moon_visible();
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data = NULL) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data = NULL) override;
 
 protected:
 
diff --git a/engines/ultima/nuvie/files/nuvie_io.h b/engines/ultima/nuvie/files/nuvie_io.h
index 0e29410d3cc..7a5371bf4bb 100644
--- a/engines/ultima/nuvie/files/nuvie_io.h
+++ b/engines/ultima/nuvie/files/nuvie_io.h
@@ -112,28 +112,28 @@ protected:
 
 public:
 	NuvieIOBuffer();
-	virtual ~NuvieIOBuffer();
+	~NuvieIOBuffer() override;
 
 	bool open(unsigned char *buf, uint32 buf_size, bool copy_buf = NUVIE_BUF_COPY);
 
-	void close();
+	void close() override;
 
 	unsigned char *get_raw_data() {
 		return data;
 	}; //hehe evil
 
-	uint8 read1();
-	uint16 read2();
-	uint32 read4();
-	bool readToBuf(unsigned char *buf, uint32 buf_size);
+	uint8 read1() override;
+	uint16 read2() override;
+	uint32 read4() override;
+	bool readToBuf(unsigned char *buf, uint32 buf_size) override;
 
-	bool write1(uint8 src);
-	bool write2(uint16 src);
-	bool write4(uint32 src);
-	uint32 writeBuf(const unsigned char *src, uint32 src_size);
-	uint32 write(NuvieIO *src);
+	bool write1(uint8 src) override;
+	bool write2(uint16 src) override;
+	bool write4(uint32 src) override;
+	uint32 writeBuf(const unsigned char *src, uint32 src_size) override;
+	uint32 write(NuvieIO *src) override;
 
-	void seek(uint32 new_pos);
+	void seek(uint32 new_pos) override;
 };
 
 extern char *strgets(char *str, int n, Common::ReadStream *stream);
diff --git a/engines/ultima/nuvie/files/nuvie_io_file.h b/engines/ultima/nuvie/files/nuvie_io_file.h
index 4e891519d94..2500cc9ba2f 100644
--- a/engines/ultima/nuvie/files/nuvie_io_file.h
+++ b/engines/ultima/nuvie/files/nuvie_io_file.h
@@ -35,7 +35,7 @@ namespace Nuvie {
 class NuvieIOFile : public NuvieIO {
 public:
 	NuvieIOFile() {}
-	virtual ~NuvieIOFile() {}
+	~NuvieIOFile() override {}
 
 	virtual bool open(const Common::String &filename) {
 		return false;
@@ -48,18 +48,18 @@ private:
 	Common::File _srcFile;
 public:
 	NuvieIOFileRead() : NuvieIOFile(), _file(nullptr) {}
-	virtual ~NuvieIOFileRead();
+	~NuvieIOFileRead() override;
 
-	virtual bool open(const Common::String &filename) override;
+	bool open(const Common::String &filename) override;
 	virtual bool open(Common::InSaveFile *saveFile);
-	virtual void close() override;
-	virtual void seek(uint32 new_pos) override;
+	void close() override;
+	void seek(uint32 new_pos) override;
 
-	virtual uint8 read1() override;
-	virtual uint16 read2() override;
-	virtual uint32 read4() override;
+	uint8 read1() override;
+	uint16 read2() override;
+	uint32 read4() override;
 
-	virtual bool readToBuf(unsigned char *buf, uint32 buf_size) override;
+	bool readToBuf(unsigned char *buf, uint32 buf_size) override;
 
 	bool isOpen() const {
 		return _file != nullptr;
@@ -86,10 +86,10 @@ protected:
 	}
 public:
 	NuvieIOFileWrite();
-	virtual ~NuvieIOFileWrite();
-	virtual bool open(const Common::String &filename) override;
-	virtual void close() override;
-	virtual void seek(uint32 new_pos) override;
+	~NuvieIOFileWrite() override;
+	bool open(const Common::String &filename) override;
+	void close() override;
+	void seek(uint32 new_pos) override;
 
 	bool write1(uint8 src) override;
 	bool write2(uint16 src) override;
@@ -98,7 +98,7 @@ public:
 		_description = desc;
 	}
 
-	virtual uint32 writeBuf(const unsigned char *src, uint32 src_size) override;
+	uint32 writeBuf(const unsigned char *src, uint32 src_size) override;
 	uint32 write(NuvieIO *src) override;
 };
 
diff --git a/engines/ultima/nuvie/files/u6_bmp.h b/engines/ultima/nuvie/files/u6_bmp.h
index af81d6646e2..5262c6f2c56 100644
--- a/engines/ultima/nuvie/files/u6_bmp.h
+++ b/engines/ultima/nuvie/files/u6_bmp.h
@@ -37,9 +37,9 @@ private:
 public:
 
 	U6Bmp();
-	~U6Bmp();
+	~U6Bmp() override;
 
-	bool load(Std::string filename);
+	bool load(Std::string filename) override;
 
 };
 
diff --git a/engines/ultima/nuvie/fonts/bmp_font.h b/engines/ultima/nuvie/fonts/bmp_font.h
index de132e21333..4ff81548c30 100644
--- a/engines/ultima/nuvie/fonts/bmp_font.h
+++ b/engines/ultima/nuvie/fonts/bmp_font.h
@@ -43,17 +43,17 @@ class BMPFont : public Font {
 public:
 
 	BMPFont();
-	~BMPFont();
+	~BMPFont() override;
 
 	bool init(Std::string bmp_filename, bool dual_fontmap = false);
 
-	uint16 getCharWidth(uint8 c);
-	uint16 getCharHeight() {
+	uint16 getCharWidth(uint8 c) override;
+	uint16 getCharHeight() override {
 		return 16;
 	}
 	uint16 drawChar(Screen *screen, uint8 char_num, uint16 x, uint16 y,
-	                uint8 color);
-	uint16 getStringWidth(const char *str, uint16 string_len);
+	                uint8 color) override;
+	uint16 getStringWidth(const char *str, uint16 string_len) override;
 protected:
 
 };
diff --git a/engines/ultima/nuvie/fonts/conv_font.h b/engines/ultima/nuvie/fonts/conv_font.h
index 10c9497c8ba..5513fa7dea6 100644
--- a/engines/ultima/nuvie/fonts/conv_font.h
+++ b/engines/ultima/nuvie/fonts/conv_font.h
@@ -38,16 +38,16 @@ class ConvFont : public Font {
 public:
 
 	ConvFont();
-	~ConvFont();
+	~ConvFont() override;
 
 	bool init(unsigned char *data, uint8 *width_data, uint16 num_chars, uint16 char_offset);
 
-	uint16 getCharWidth(uint8 c);
-	uint16 getCharHeight() {
+	uint16 getCharWidth(uint8 c) override;
+	uint16 getCharHeight() override {
 		return 0;
 	}
 	uint16 drawChar(Screen *screen, uint8 char_num, uint16 x, uint16 y,
-	                uint8 color);
+	                uint8 color) override;
 protected:
 
 };
diff --git a/engines/ultima/nuvie/fonts/u6_font.h b/engines/ultima/nuvie/fonts/u6_font.h
index 136b7017d5e..8adc70c4ea6 100644
--- a/engines/ultima/nuvie/fonts/u6_font.h
+++ b/engines/ultima/nuvie/fonts/u6_font.h
@@ -41,18 +41,18 @@ private:
 public:
 
 	U6Font();
-	~U6Font();
+	~U6Font() override;
 
 	bool init(unsigned char *data, uint16 num_chars, uint16 char_offset);
 
-	uint16 getCharWidth(uint8 c) {
+	uint16 getCharWidth(uint8 c) override {
 		return 8;
 	}
-	uint16 getCharHeight() {
+	uint16 getCharHeight() override {
 		return 8;
 	}
 	uint16 drawChar(Screen *screen, uint8 char_num, uint16 x, uint16 y,
-	                uint8 color);
+	                uint8 color) override;
 protected:
 
 };
diff --git a/engines/ultima/nuvie/fonts/wou_font.h b/engines/ultima/nuvie/fonts/wou_font.h
index 3c468770906..df7a5eb5404 100644
--- a/engines/ultima/nuvie/fonts/wou_font.h
+++ b/engines/ultima/nuvie/fonts/wou_font.h
@@ -42,20 +42,20 @@ private:
 public:
 
 	WOUFont();
-	virtual ~WOUFont();
+	~WOUFont() override;
 
 	bool init(const char *filename);
 	bool initWithBuffer(unsigned char *buffer, uint32 buffer_len);
 
 
-	virtual uint16 drawChar(Screen *screen, uint8 char_num, uint16 x, uint16 y,
-	                        uint8 color);
+	uint16 drawChar(Screen *screen, uint8 char_num, uint16 x, uint16 y,
+	                        uint8 color) override;
 
 	uint16 drawStringToShape(U6Shape *shp, const char *str, uint16 x, uint16 y, uint8 color);
 	uint8 drawCharToShape(U6Shape *shp, uint8 char_num, uint16 x, uint16 y, uint8 color);
 
-	virtual uint16 getCharWidth(uint8 c);
-	virtual uint16 getCharHeight() {
+	uint16 getCharWidth(uint8 c) override;
+	uint16 getCharHeight() override {
 		return height;
 	}
 private:
diff --git a/engines/ultima/nuvie/gui/gui_area.h b/engines/ultima/nuvie/gui/gui_area.h
index 267589c9440..c1252fc0295 100644
--- a/engines/ultima/nuvie/gui/gui_area.h
+++ b/engines/ultima/nuvie/gui/gui_area.h
@@ -45,10 +45,10 @@ public:
 	         uint8 fr, uint8 fg, uint8 fb, int fthick, int aShape = AREA_ANGULAR);
 
 	/* Map the color to the display */
-	virtual void SetDisplay(Screen *s);
+	void SetDisplay(Screen *s) override;
 
 	/* Show the widget  */
-	virtual void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
 
 protected:
diff --git a/engines/ultima/nuvie/gui/gui_button.h b/engines/ultima/nuvie/gui/gui_button.h
index b8b55f707c6..5d7502a0bfb 100644
--- a/engines/ultima/nuvie/gui/gui_button.h
+++ b/engines/ultima/nuvie/gui/gui_button.h
@@ -84,18 +84,18 @@ public:
 	           GUI_Font *font, int alignment, int is_checkbutton,
 	           GUI_CallBack *callback, int flat = 0);
 
-	~GUI_Button();
+	~GUI_Button() override;
 
 	/* change features of a text button (if one of the dimensions is negativ, it's ignored) */
 	virtual void ChangeTextButton(int x, int y, int w, int h, const char *text, int alignment);
 
 	/* Show the widget  */
-	virtual void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
 	/* Mouse hits activate us */
-	virtual GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseMotion(int x, int y, uint8 state);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override;
 
 	/* Clickable or not ... */
 	virtual void Disable();
diff --git a/engines/ultima/nuvie/gui/gui_console.h b/engines/ultima/nuvie/gui/gui_console.h
index fca8c79d591..a492ebadb8b 100644
--- a/engines/ultima/nuvie/gui/gui_console.h
+++ b/engines/ultima/nuvie/gui/gui_console.h
@@ -43,18 +43,18 @@ class GUI_Console : public GUI_Widget {
 
 public:
 	GUI_Console(uint16 x, uint16 y, uint16 w, uint16 h);
-	~GUI_Console();
+	~GUI_Console() override;
 
 	/* Map the color to the display */
-	virtual void SetDisplay(Screen *s);
+	void SetDisplay(Screen *s) override;
 
 	/* Show the widget  */
-	virtual void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
 	/* events, used for dragging the area. */
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	GUI_status MouseMotion(int x, int y, uint8 state);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override;
 
 	virtual void AddLine(Std::string line);
 
diff --git a/engines/ultima/nuvie/gui/gui_dialog.h b/engines/ultima/nuvie/gui/gui_dialog.h
index c65cdb6b275..9fe47691181 100644
--- a/engines/ultima/nuvie/gui/gui_dialog.h
+++ b/engines/ultima/nuvie/gui/gui_dialog.h
@@ -50,18 +50,18 @@ class GUI_Dialog : public GUI_Widget {
 public:
 	/* Passed the area, color and shape */
 	GUI_Dialog(int x, int y, int w, int h, uint8 r, uint8 g, uint8 b, bool is_moveable);
-	~GUI_Dialog();
+	~GUI_Dialog() override;
 	/* Map the color to the display */
-	virtual void SetDisplay(Screen *s);
+	void SetDisplay(Screen *s) override;
 
 	/* Show the widget  */
-	virtual void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
 	/* events, used for dragging the area. */
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	GUI_status MouseMotion(int x, int y, uint8 state);
-	void MoveRelative(int dx, int dy);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override;
+	void MoveRelative(int dx, int dy) override;
 protected:
 	bool can_drag;
 	void loadBorderImages();
diff --git a/engines/ultima/nuvie/gui/gui_scroll_bar.h b/engines/ultima/nuvie/gui/gui_scroll_bar.h
index 5c45184f6bd..f6a2185bcd1 100644
--- a/engines/ultima/nuvie/gui/gui_scroll_bar.h
+++ b/engines/ultima/nuvie/gui/gui_scroll_bar.h
@@ -73,16 +73,16 @@ public:
 	void set_slider_position(float percentage);
 
 	/* Map the color to the display */
-	virtual void SetDisplay(Screen *s);
+	void SetDisplay(Screen *s) override;
 
 	/* Show the widget  */
-	virtual void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
 	/* events, used for dragging the area. */
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	GUI_status MouseMotion(int x, int y, uint8 state);
-	GUI_status MouseWheel(sint32 x, sint32 y);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override;
+	GUI_status MouseWheel(sint32 x, sint32 y) override;
 
 protected:
 	void loadButtons();
@@ -90,7 +90,7 @@ protected:
 
 	void send_slider_moved_msg();
 	bool move_slider(int new_slider_y);
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 
 	void send_up_button_msg();
 	void send_down_button_msg();
diff --git a/engines/ultima/nuvie/gui/gui_scroller.h b/engines/ultima/nuvie/gui/gui_scroller.h
index f0a08504293..0779f4bad47 100644
--- a/engines/ultima/nuvie/gui/gui_scroller.h
+++ b/engines/ultima/nuvie/gui/gui_scroller.h
@@ -48,8 +48,8 @@ public:
 	GUI_Scroller(int x, int y, int w, int h, uint8 r, uint8 g, uint8 b, uint16 r_height);
 
 	/* Map the color to the display */
-	virtual void SetDisplay(Screen *s);
-	void PlaceOnScreen(Screen *s, GUI_DragManager *dm, int x, int y);
+	void SetDisplay(Screen *s) override;
+	void PlaceOnScreen(Screen *s, GUI_DragManager *dm, int x, int y) override;
 	void move_up();
 	void move_down();
 	void page_up(bool all = false);
@@ -58,18 +58,18 @@ public:
 	int AddWidget(GUI_Widget *widget);
 
 	/* Show the widget  */
-	virtual void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
 	/* events, used for dragging the area. */
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	GUI_status MouseMotion(int x, int y, uint8 state);
-	GUI_status MouseWheel(sint32 x, sint32 y);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override;
+	GUI_status MouseWheel(sint32 x, sint32 y) override;
 
 protected:
 	void update_viewport(bool update_slider);
 	void move_percentage(float offset_percentage);
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/gui/gui_text.h b/engines/ultima/nuvie/gui/gui_text.h
index e9f5b80bf5d..ee8683ec8e1 100644
--- a/engines/ultima/nuvie/gui/gui_text.h
+++ b/engines/ultima/nuvie/gui/gui_text.h
@@ -40,10 +40,10 @@ protected:
 public:
 	GUI_Text(int x, int y, uint8 r, uint8 g, uint8 b, GUI_Font *gui_font, uint16 line_length);
 	GUI_Text(int x, int y, uint8 r, uint8 g, uint8 b, const char *str, GUI_Font *gui_font, uint16 line_length = 0);
-	~GUI_Text();
+	~GUI_Text() override;
 
 	/* Show the widget  */
-	virtual void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
 };
 
diff --git a/engines/ultima/nuvie/gui/gui_text_input.h b/engines/ultima/nuvie/gui/gui_text_input.h
index 4ad604f2453..df309e7bdb6 100644
--- a/engines/ultima/nuvie/gui/gui_text_input.h
+++ b/engines/ultima/nuvie/gui/gui_text_input.h
@@ -48,12 +48,12 @@ public:
 
 	GUI_TextInput(int x, int y, uint8 r, uint8 g, uint8 b,
 	              const char *str, GUI_Font *gui_font, uint16 width, uint16 height, GUI_CallBack *callback);
-	~GUI_TextInput();
+	~GUI_TextInput() override;
 
-	void release_focus();
+	void release_focus() override;
 
-	GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	GUI_status KeyDown(const Common::KeyState &key);
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status KeyDown(const Common::KeyState &key) override;
 
 	void add_char(char c);
 	void remove_char();
@@ -61,11 +61,11 @@ public:
 	char *get_text() {
 		return text;
 	}
-	void SetDisplay(Screen *s);
+	void SetDisplay(Screen *s) override;
 	void display_cursor();
 
 	/* Show the widget  */
-	virtual void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
 };
 
diff --git a/engines/ultima/nuvie/gui/gui_text_toggle_button.h b/engines/ultima/nuvie/gui/gui_text_toggle_button.h
index 73a906818f3..203f787322d 100644
--- a/engines/ultima/nuvie/gui/gui_text_toggle_button.h
+++ b/engines/ultima/nuvie/gui/gui_text_toggle_button.h
@@ -43,12 +43,12 @@ public:
 	                     GUI_Font *font, int alignment,
 	                     GUI_CallBack *callback, int flat = 0);
 
-	~GUI_TextToggleButton();
+	~GUI_TextToggleButton() override;
 
 	virtual int GetSelection() const;
 
-	virtual GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	virtual GUI_status Activate_button(int x = 0, int y = 0, Shared::MouseButton button = Shared::BUTTON_LEFT);
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status Activate_button(int x = 0, int y = 0, Shared::MouseButton button = Shared::BUTTON_LEFT) override;
 
 protected:
 	int selection;
diff --git a/engines/ultima/nuvie/gui/gui_yes_no_dialog.h b/engines/ultima/nuvie/gui/gui_yes_no_dialog.h
index 08bc31327f7..0d1d2294d4e 100644
--- a/engines/ultima/nuvie/gui/gui_yes_no_dialog.h
+++ b/engines/ultima/nuvie/gui/gui_yes_no_dialog.h
@@ -47,11 +47,11 @@ private:
 public:
 	GUI_YesNoDialog(GUI *gui, int x, int y, int w, int h, const char *msg,
         CallBack *yesCallback, CallBack *noCallback);
-	~GUI_YesNoDialog();
+	~GUI_YesNoDialog() override;
 
-	GUI_status KeyDown(const Common::KeyState &key);
+	GUI_status KeyDown(const Common::KeyState &key) override;
 
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/gui/widgets/background.h b/engines/ultima/nuvie/gui/widgets/background.h
index 75e4e6d8436..c058434afc1 100644
--- a/engines/ultima/nuvie/gui/widgets/background.h
+++ b/engines/ultima/nuvie/gui/widgets/background.h
@@ -42,15 +42,15 @@ class Background: public GUI_Widget {
 public:
 
 	Background(Configuration *cfg);
-	~Background();
+	~Background() override;
 
 	bool init();
 	uint16 get_border_width() {
 		return border_width;
 	}
-	void Display(bool full_redraw);
-	bool drag_accept_drop(int x, int y, int message, void *data); // needed for original+_full_map
-	void drag_perform_drop(int x, int y, int message, void *data); // needed for original+_full_map
+	void Display(bool full_redraw) override;
+	bool drag_accept_drop(int x, int y, int message, void *data) override; // needed for original+_full_map
+	void drag_perform_drop(int x, int y, int message, void *data) override; // needed for original+_full_map
 	U6Shape *get_bg_shape() {
 		return background;
 	}
diff --git a/engines/ultima/nuvie/gui/widgets/command_bar.h b/engines/ultima/nuvie/gui/widgets/command_bar.h
index 6bf3f3b8728..4975c518c71 100644
--- a/engines/ultima/nuvie/gui/widgets/command_bar.h
+++ b/engines/ultima/nuvie/gui/widgets/command_bar.h
@@ -69,11 +69,11 @@ protected:
 public:
 	CommandBar();
 	CommandBar(Game *g);
-	~CommandBar();
+	~CommandBar() override;
 	virtual bool init_buttons();
 
-	virtual void Display(bool full_redraw) override;
-	virtual GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	void Display(bool full_redraw) override;
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
 	void update() {
 		update_display = true;
 	}
@@ -90,10 +90,10 @@ public:
 		return selected_action;
 	}
 
-	virtual GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override {
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override {
 		return GUI_PASS;
 	}
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 	bool load(NuvieIO *objlist);
 	bool save(NuvieIO *objlist);
 	bool drag_accept_drop(int x, int y, int message, void *data) override; // needed for !orig_style
diff --git a/engines/ultima/nuvie/gui/widgets/command_bar_new_ui.h b/engines/ultima/nuvie/gui/widgets/command_bar_new_ui.h
index bc10aae03af..ba09ee40840 100644
--- a/engines/ultima/nuvie/gui/widgets/command_bar_new_ui.h
+++ b/engines/ultima/nuvie/gui/widgets/command_bar_new_ui.h
@@ -50,12 +50,12 @@ protected:
 	Font *font;
 public:
 	CommandBarNewUI(Game *g);
-	~CommandBarNewUI();
+	~CommandBarNewUI() override;
 
-	virtual void Display(bool full_redraw);
-	virtual GUI_status KeyDown(const Common::KeyState &key);
-	virtual GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseUp(int x, int y, Shared::MouseButton button);
+	void Display(bool full_redraw) override;
+	GUI_status KeyDown(const Common::KeyState &key) override;
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
 
 private:
 	const char *get_command_name(sint8 command_num);
diff --git a/engines/ultima/nuvie/gui/widgets/console.h b/engines/ultima/nuvie/gui/widgets/console.h
index 0dc78b259c0..1620226ce9b 100644
--- a/engines/ultima/nuvie/gui/widgets/console.h
+++ b/engines/ultima/nuvie/gui/widgets/console.h
@@ -41,9 +41,9 @@ protected:
 
 public:
 	Console(Configuration *c, Screen *s, GUI *g, uint16 x, uint16 y, uint16 w, uint16 h);
-	~Console();
+	~Console() override;
 
-	void AddLine(Std::string line);
+	void AddLine(Std::string line) override;
 
 protected:
 
diff --git a/engines/ultima/nuvie/gui/widgets/converse_gump.h b/engines/ultima/nuvie/gui/widgets/converse_gump.h
index a4ff43da403..5f7b7feeae7 100644
--- a/engines/ultima/nuvie/gui/widgets/converse_gump.h
+++ b/engines/ultima/nuvie/gui/widgets/converse_gump.h
@@ -66,47 +66,47 @@ class ConverseGump: public MsgScroll {
 public:
 
 	ConverseGump(Configuration *cfg, Font *f, Screen *s);
-	~ConverseGump();
+	~ConverseGump() override;
 
 	void set_actor_portrait(Actor *a);
 	unsigned char *create_framed_portrait(Actor *a);
-	virtual bool parse_token(MsgText *token);
-	virtual Std::string get_token_string_at_pos(uint16 x, uint16 y);
-	virtual void display_string(Std::string s, Font *f, bool include_on_map_window);
-	virtual void set_talking(bool state, Actor *actor = NULL);
-	virtual void set_font(uint8 font_type) {}
+	bool parse_token(MsgText *token) override;
+	Std::string get_token_string_at_pos(uint16 x, uint16 y) override;
+	void display_string(Std::string s, Font *f, bool include_on_map_window) override;
+	void set_talking(bool state, Actor *actor = NULL) override;
+	void set_font(uint8 font_type) override {}
 //bool get_solid_bg() { return solid_bg; }
 	void set_solid_bg(bool val) {
 		solid_bg = val;
 	}
 
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
-	GUI_status KeyDown(const Common::KeyState &key);
-	GUI_status MouseUp(int x, int y, Shared::MouseButton button);
+	GUI_status KeyDown(const Common::KeyState &key) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
 
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseMotion(int x, int y, uint8 state) {
+	GUI_status MouseMotion(int x, int y, uint8 state) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseEnter(uint8 state) {
+	GUI_status MouseEnter(uint8 state) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseLeave(uint8 state) {
+	GUI_status MouseLeave(uint8 state) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseClick(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseClick(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseDouble(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseDouble(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseHeld(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseHeld(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
 
@@ -114,21 +114,21 @@ public:
 		found_break_char = val;
 	}
 
-	virtual bool input_buf_add_char(char c);
-	virtual bool input_buf_remove_char();
+	bool input_buf_add_char(char c) override;
+	bool input_buf_remove_char() override;
 
-	virtual bool is_converse_finished() {
+	bool is_converse_finished() override {
 		return (is_holding_buffer_empty() && msg_buf.size() == 1 && msg_buf.back()->total_length == 0);
 	}
 
-	virtual void drawCursor(uint16 x, uint16 y);
+	void drawCursor(uint16 x, uint16 y) override;
 
 protected:
 	Std::string strip_whitespace_after_break(Std::string s);
 	void add_keyword(Std::string keyword);
 
-	virtual void set_permitted_input(const char *allowed);
-	virtual void clear_permitted_input();
+	void set_permitted_input(const char *allowed) override;
+	void clear_permitted_input() override;
 
 	bool cursor_at_input_section() {
 		return (keyword_list && cursor_position == keyword_list->size());
diff --git a/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h b/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
index 1daec8872de..e103099cd2f 100644
--- a/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
+++ b/engines/ultima/nuvie/gui/widgets/converse_gump_wou.h
@@ -52,52 +52,52 @@ class ConverseGumpWOU: public MsgScroll {
 public:
 
 	ConverseGumpWOU(Configuration *cfg, Font *f, Screen *s);
-	~ConverseGumpWOU();
+	~ConverseGumpWOU() override;
 
-	virtual void set_talking(bool state, Actor *actor = NULL);
-	virtual void set_font(uint8 font_type) {}
-	virtual void display_converse_prompt();
+	void set_talking(bool state, Actor *actor = NULL) override;
+	void set_font(uint8 font_type) override {}
+	void display_converse_prompt() override;
 
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
-	GUI_status MouseUp(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
 
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseMotion(int x, int y, uint8 state) {
+	GUI_status MouseMotion(int x, int y, uint8 state) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseEnter(uint8 state) {
+	GUI_status MouseEnter(uint8 state) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseLeave(uint8 state) {
+	GUI_status MouseLeave(uint8 state) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseClick(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseClick(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseDouble(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseDouble(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseHeld(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseHeld(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
 
-	virtual bool is_converse_finished() {
+	bool is_converse_finished() override {
 		return (is_holding_buffer_empty() && !page_break);
 	}
 
 protected:
 
 	void input_add_string(Std::string token_str);
-	virtual void process_page_break();
-	virtual uint8 get_input_font_color() {
+	void process_page_break() override;
+	uint8 get_input_font_color() override {
 		return FONT_COLOR_WOU_CONVERSE_INPUT;
 	}
 	void display_bg();
diff --git a/engines/ultima/nuvie/gui/widgets/fps_counter.h b/engines/ultima/nuvie/gui/widgets/fps_counter.h
index 92f0c1c0e4d..1ff53a8af63 100644
--- a/engines/ultima/nuvie/gui/widgets/fps_counter.h
+++ b/engines/ultima/nuvie/gui/widgets/fps_counter.h
@@ -41,11 +41,11 @@ protected:
 
 public:
 	FpsCounter(Game *g);
-	~FpsCounter();
+	~FpsCounter() override;
 
 	void setFps(float fps);
 
-	virtual void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
 	void update() {
 		update_display = true;
diff --git a/engines/ultima/nuvie/gui/widgets/gui_widget.h b/engines/ultima/nuvie/gui/widgets/gui_widget.h
index 32bd882cc5e..d141ad29936 100644
--- a/engines/ultima/nuvie/gui/widgets/gui_widget.h
+++ b/engines/ultima/nuvie/gui/widgets/gui_widget.h
@@ -85,7 +85,7 @@ public:
 
 	GUI_Widget(void *data);
 	GUI_Widget(void *data, int x, int y, int w, int h);
-	virtual ~GUI_Widget();
+	~GUI_Widget() override;
 
 	int AddWidget(GUI_Widget *widget);
 
@@ -184,8 +184,8 @@ public:
 	virtual GUI_status MouseHeld(int x, int y, Shared::MouseButton button);
 	// </SB-X>
 
-	bool drag_accept_drop(int x, int y, int message, void *data);
-	void drag_perform_drop(int x, int y, int message, void *data);
+	bool drag_accept_drop(int x, int y, int message, void *data) override;
+	void drag_perform_drop(int x, int y, int message, void *data) override;
 
 	/* Main event handler function.
 	   This function gets raw SDL events from the GUI.
diff --git a/engines/ultima/nuvie/gui/widgets/map_window.h b/engines/ultima/nuvie/gui/widgets/map_window.h
index e338e75d9df..5f5c00ca2df 100644
--- a/engines/ultima/nuvie/gui/widgets/map_window.h
+++ b/engines/ultima/nuvie/gui/widgets/map_window.h
@@ -150,7 +150,7 @@ class MapWindow: public GUI_Widget {
 public:
 
 	MapWindow(Configuration *cfg, Map *m);
-	~MapWindow();
+	~MapWindow() override;
 
 	bool init(TileManager *tm, ObjManager *om, ActorManager *am);
 
@@ -289,31 +289,31 @@ public:
 	void updateBlacking();
 	void updateAmbience();
 	void update();
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
-	virtual GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseMotion(int x, int y, uint8 state);
-	GUI_status MouseDouble(int x, int y, Shared::MouseButton button);
-	GUI_status MouseClick(int x, int y, Shared::MouseButton button);
-	GUI_status Idle(void);
-	GUI_status MouseLeave(uint8 state);
-	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button);
-	GUI_status MouseHeld(int x, int y, Shared::MouseButton button);
-	GUI_status KeyDown(const Common::KeyState &key);
-	GUI_status MouseWheel(sint32 x, sint32 y);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override;
+	GUI_status MouseDouble(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseClick(int x, int y, Shared::MouseButton button) override;
+	GUI_status Idle(void) override;
+	GUI_status MouseLeave(uint8 state) override;
+	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseHeld(int x, int y, Shared::MouseButton button) override;
+	GUI_status KeyDown(const Common::KeyState &key) override;
+	GUI_status MouseWheel(sint32 x, sint32 y) override;
 
-	void drag_drop_success(int x, int y, int message, void *data);
-	void drag_drop_failed(int x, int y, int message, void *data);
+	void drag_drop_success(int x, int y, int message, void *data) override;
+	void drag_drop_failed(int x, int y, int message, void *data) override;
 
-	bool drag_accept_drop(int x, int y, int message, void *data);
-	void drag_perform_drop(int x, int y, int message, void *data);
+	bool drag_accept_drop(int x, int y, int message, void *data) override;
+	void drag_perform_drop(int x, int y, int message, void *data) override;
 	bool move_on_drop(Obj *obj);
 	void set_interface();
 	InterfaceType get_interface();
 	bool is_interface_fullscreen_in_combat();
 
-	void drag_draw(int x, int y, int message, void *data);
+	void drag_draw(int x, int y, int message, void *data) override;
 
 	void update_mouse_cursor(uint32 mx, uint32 my);
 
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll.h b/engines/ultima/nuvie/gui/widgets/msg_scroll.h
index 770aa483fa1..96a672086b6 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll.h
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll.h
@@ -204,7 +204,7 @@ public:
 		discard_whitespace = false;
 		left_margin = 0;
 	}
-	~MsgScroll();
+	~MsgScroll() override;
 
 	void init(Configuration *cfg, Font *f);
 
@@ -278,12 +278,12 @@ public:
 		return (page_break);
 	}
 
-	GUI_status KeyDown(const Common::KeyState &key);
-	GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	GUI_status MouseWheel(sint32 x, sint32 y);
+	GUI_status KeyDown(const Common::KeyState &key) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseWheel(sint32 x, sint32 y) override;
 	virtual Std::string get_token_string_at_pos(uint16 x, uint16 y);
 //void updateScroll();
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
 	void clearCursor(uint16 x, uint16 y);
 	virtual void drawCursor(uint16 x, uint16 y);
diff --git a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
index f9d52a14e02..8df0b88ef88 100644
--- a/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
+++ b/engines/ultima/nuvie/gui/widgets/msg_scroll_new_ui.h
@@ -62,12 +62,12 @@ class MsgScrollNewUI: public MsgScroll {
 public:
 
 	MsgScrollNewUI(Configuration *cfg, Screen *s);
-	~MsgScrollNewUI();
+	~MsgScrollNewUI() override;
 
-	virtual GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override {
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override {
 		return GUI_PASS;
 	}
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data) override;
 	bool can_display_prompt() override {
 		return false;
 	}
diff --git a/engines/ultima/nuvie/menus/audio_dialog.h b/engines/ultima/nuvie/menus/audio_dialog.h
index ad2894b119a..8a9b8e0acd5 100644
--- a/engines/ultima/nuvie/menus/audio_dialog.h
+++ b/engines/ultima/nuvie/menus/audio_dialog.h
@@ -46,12 +46,12 @@ protected:
 
 public:
 	AudioDialog(GUI_CallBack *callback);
-	~AudioDialog();
+	~AudioDialog() override;
 	bool init();
 
 	GUI_status close_dialog();
-	GUI_status KeyDown(const Common::KeyState &key);
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status KeyDown(const Common::KeyState &key) override;
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/menus/cheats_dialog.h b/engines/ultima/nuvie/menus/cheats_dialog.h
index 187380ef8f0..2c17b8b13c2 100644
--- a/engines/ultima/nuvie/menus/cheats_dialog.h
+++ b/engines/ultima/nuvie/menus/cheats_dialog.h
@@ -44,12 +44,12 @@ protected:
 
 public:
 	CheatsDialog(GUI_CallBack *callback);
-	~CheatsDialog();
+	~CheatsDialog() override;
 	bool init();
 
 	GUI_status close_dialog();
-	GUI_status KeyDown(const Common::KeyState &key);
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status KeyDown(const Common::KeyState &key) override;
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/menus/game_menu_dialog.h b/engines/ultima/nuvie/menus/game_menu_dialog.h
index 83734f9eaa7..77cfd99c1d3 100644
--- a/engines/ultima/nuvie/menus/game_menu_dialog.h
+++ b/engines/ultima/nuvie/menus/game_menu_dialog.h
@@ -45,12 +45,12 @@ protected:
 	GUI_Button *button_index[9]; // add to here when you add a button. Keep buttons in order by height
 public:
 	GameMenuDialog(CallBack *callback);
-	~GameMenuDialog();
+	~GameMenuDialog() override;
 	bool init();
 
 	GUI_status close_dialog();
-	GUI_status KeyDown(const Common::KeyState &key);
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status KeyDown(const Common::KeyState &key) override;
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/menus/gameplay_dialog.h b/engines/ultima/nuvie/menus/gameplay_dialog.h
index 0434c2e55d3..07273b2de87 100644
--- a/engines/ultima/nuvie/menus/gameplay_dialog.h
+++ b/engines/ultima/nuvie/menus/gameplay_dialog.h
@@ -48,12 +48,12 @@ protected:
 
 public:
 	GameplayDialog(GUI_CallBack *callback);
-	~GameplayDialog();
+	~GameplayDialog() override;
 	bool init();
 
 	GUI_status close_dialog();
-	GUI_status KeyDown(const Common::KeyState &key);
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status KeyDown(const Common::KeyState &key) override;
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/menus/input_dialog.h b/engines/ultima/nuvie/menus/input_dialog.h
index 238e5ba9e48..3fddd41460f 100644
--- a/engines/ultima/nuvie/menus/input_dialog.h
+++ b/engines/ultima/nuvie/menus/input_dialog.h
@@ -47,12 +47,12 @@ protected:
 
 public:
 	InputDialog(GUI_CallBack *callback);
-	~InputDialog();
+	~InputDialog() override;
 	bool init();
 
 	GUI_status close_dialog();
-	GUI_status KeyDown(const Common::KeyState &key);
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status KeyDown(const Common::KeyState &key) override;
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/menus/video_dialog.h b/engines/ultima/nuvie/menus/video_dialog.h
index 58c76a4ade5..5feb2207d02 100644
--- a/engines/ultima/nuvie/menus/video_dialog.h
+++ b/engines/ultima/nuvie/menus/video_dialog.h
@@ -47,12 +47,12 @@ protected:
 	void rebuild_buttons(bool init);
 public:
 	VideoDialog(GUI_CallBack *callback);
-	~VideoDialog();
+	~VideoDialog() override;
 	bool init();
 
 	GUI_status close_dialog();
-	GUI_status KeyDown(const Common::KeyState &key);
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status KeyDown(const Common::KeyState &key) override;
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/nuvie.h b/engines/ultima/nuvie/nuvie.h
index b747ffbe706..5924cf2f1e1 100644
--- a/engines/ultima/nuvie/nuvie.h
+++ b/engines/ultima/nuvie/nuvie.h
@@ -55,41 +55,41 @@ private:
 
 	bool playIntro();
 protected:
-    virtual bool initialize() override;
+    bool initialize() override;
 
     /**
      * Returns the data archive folder and version that's required
      */
-    virtual bool isDataRequired(Common::String &folder, int &majorVersion, int &minorVersion) override;
+    bool isDataRequired(Common::String &folder, int &majorVersion, int &minorVersion) override;
 public:
 	const Std::string c_empty_string;
 public:
 	NuvieEngine(OSystem *syst, const Ultima::UltimaGameDescription *gameDesc);
-	~NuvieEngine();
+	~NuvieEngine() override;
 
 	/**
 	 * Play the game
 	 */
-	virtual Common::Error run() override;
+	Common::Error run() override;
 
 	/**
 	 * Indicates whether a game state can be loaded.
 	 * @param isAutosave	Flags whether it's an autosave check
 	 */
-	virtual bool canLoadGameStateCurrently(bool isAutosave) override;
+	bool canLoadGameStateCurrently(bool isAutosave) override;
 
 	/**
 	 * Indicates whether a game state can be saved.
 	 * @param isAutosave	Flags whether it's an autosave check
 	 */
-	virtual bool canSaveGameStateCurrently(bool isAutosave) override;
+	bool canSaveGameStateCurrently(bool isAutosave) override;
 
 	/**
 	 * Load a game state.
 	 * @param slot	the slot from which a savestate should be loaded
 	 * @return returns kNoError on success, else an error code.
 	 */
-	virtual Common::Error loadGameState(int slot) override;
+	Common::Error loadGameState(int slot) override;
 
 	/**
 	 * Save a game state.
@@ -98,9 +98,9 @@ public:
 	 * @param isAutosave If true, autosave is being created
 	 * @return returns kNoError on success, else an error code.
 	 */
-	virtual Common::Error saveGameState(int slot, const Common::String &desc, bool isAutosave) override;
+	Common::Error saveGameState(int slot, const Common::String &desc, bool isAutosave) override;
 
-	virtual ::GUI::Debugger *getDebugger() override {
+	::GUI::Debugger *getDebugger() const override {
 		return _debugger;
 	}
 
diff --git a/engines/ultima/nuvie/pathfinder/actor_path_finder.h b/engines/ultima/nuvie/pathfinder/actor_path_finder.h
index 803942fa804..dd44186f83d 100644
--- a/engines/ultima/nuvie/pathfinder/actor_path_finder.h
+++ b/engines/ultima/nuvie/pathfinder/actor_path_finder.h
@@ -37,21 +37,21 @@ protected:
 
 public:
 	ActorPathFinder(Actor *a, MapCoord g);
-	virtual ~ActorPathFinder();
+	~ActorPathFinder() override;
 	void set_actor(Actor *a);
 
 	virtual bool update_location(); /* get location from actor (use any time) */
 	virtual void actor_moved(); /* the actor moved ON PATH...
                                    (use after get_next_move()) */
 
-	virtual bool check_loc(const MapCoord &loc);
+	bool check_loc(const MapCoord &loc) override;
 
 	void get_closest_dir(MapCoord &rel_step); // relative dir loc->goal
-	virtual bool get_next_move(MapCoord &step);
+	bool get_next_move(MapCoord &step) override;
 
 protected:
 	bool search_towards_target(const MapCoord &g, MapCoord &rel_step);
-	virtual bool check_dir(const MapCoord &loc, MapCoord &rel, sint8 rot = 0);
+	bool check_dir(const MapCoord &loc, MapCoord &rel, sint8 rot = 0) override;
 	bool check_dir_and_distance(MapCoord loc, MapCoord g, MapCoord &rel_step, sint8 rotate);
 };
 
diff --git a/engines/ultima/nuvie/pathfinder/astar_path.h b/engines/ultima/nuvie/pathfinder/astar_path.h
index a89f3abd0b2..deb6f270a79 100644
--- a/engines/ultima/nuvie/pathfinder/astar_path.h
+++ b/engines/ultima/nuvie/pathfinder/astar_path.h
@@ -55,18 +55,18 @@ protected:
 	                       sint32 &nnode_to_neighbor);
 public:
 	AStarPath();
-	~AStarPath() { }
-	bool path_search(MapCoord &start, MapCoord &goal);
-	virtual uint32 path_cost_est(MapCoord &s, MapCoord &g)  {
+	~AStarPath() override { }
+	bool path_search(MapCoord &start, MapCoord &goal) override;
+	uint32 path_cost_est(MapCoord &s, MapCoord &g) override  {
 		return (Path::path_cost_est(s, g));
 	}
-	virtual uint32 get_max_score(uint32 cost) {
+	uint32 get_max_score(uint32 cost) override {
 		return (Path::get_max_score(cost));
 	}
 	uint32 path_cost_est(astar_node &n1, astar_node &n2) {
 		return (Path::path_cost_est(n1.loc, n2.loc));
 	}
-	sint32 step_cost(MapCoord &c1, MapCoord &c2);
+	sint32 step_cost(MapCoord &c1, MapCoord &c2) override;
 protected:
 	/* FIXME: These node functions can be replaced with a priority_queue and a list. */
 	astar_node *find_open_node(astar_node *ncmp);
diff --git a/engines/ultima/nuvie/pathfinder/combat_path_finder.h b/engines/ultima/nuvie/pathfinder/combat_path_finder.h
index e79af4c34b3..1a890a25f44 100644
--- a/engines/ultima/nuvie/pathfinder/combat_path_finder.h
+++ b/engines/ultima/nuvie/pathfinder/combat_path_finder.h
@@ -39,14 +39,14 @@ protected:
 	Actor *target;
 	CombatPathFinderMode target_mode;
 
-	bool update_location();
+	bool update_location() override;
 
 	uint8 max_dist;
 
 public:
 	CombatPathFinder(Actor *a);
 	CombatPathFinder(Actor *a, Actor *t);
-	~CombatPathFinder();
+	~CombatPathFinder() override;
 	bool set_flee_mode(Actor *actor);
 	bool set_chase_mode(Actor *actor);
 	bool set_mode(CombatPathFinderMode mode, Actor *actor);
@@ -54,8 +54,8 @@ public:
 		max_dist = dist;
 	}
 
-	bool get_next_move(MapCoord &step);
-	bool reached_goal();
+	bool get_next_move(MapCoord &step) override;
+	bool reached_goal() override;
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/pathfinder/sched_path_finder.h b/engines/ultima/nuvie/pathfinder/sched_path_finder.h
index ce70801534f..168f4d1f793 100644
--- a/engines/ultima/nuvie/pathfinder/sched_path_finder.h
+++ b/engines/ultima/nuvie/pathfinder/sched_path_finder.h
@@ -38,13 +38,13 @@ public:
 	/* Pass 'path_type' to define search rules and methods to be used. The
 	   PathFinder is responsible for deleting it when finished. */
 	SchedPathFinder(Actor *a, MapCoord g, Path *path_type);
-	~SchedPathFinder();
+	~SchedPathFinder() override;
 
-	bool get_next_move(MapCoord &step); /* returns the next step in the path */
-	bool find_path(); /* gets a NEW path from location->goal */
-	void actor_moved(); /* update location and step counters */
+	bool get_next_move(MapCoord &step) override; /* returns the next step in the path */
+	bool find_path() override; /* gets a NEW path from location->goal */
+	void actor_moved() override; /* update location and step counters */
 
-	virtual bool check_loc(const MapCoord &loc); // ignores other actors
+	bool check_loc(const MapCoord &loc) override; // ignores other actors
 protected:
 	bool is_location_in_path();
 	void incr_step();
diff --git a/engines/ultima/nuvie/pathfinder/seek_path.h b/engines/ultima/nuvie/pathfinder/seek_path.h
index b033ac21897..2d0685e1278 100644
--- a/engines/ultima/nuvie/pathfinder/seek_path.h
+++ b/engines/ultima/nuvie/pathfinder/seek_path.h
@@ -45,11 +45,11 @@ protected:
 
 public:
 	SeekPath();
-	~SeekPath();
-	sint32 step_cost(MapCoord &c1, MapCoord &c2) {
+	~SeekPath() override;
+	sint32 step_cost(MapCoord &c1, MapCoord &c2) override {
 		return -1;
 	}
-	bool path_search(MapCoord &start, MapCoord &goal);
+	bool path_search(MapCoord &start, MapCoord &goal) override;
 	void delete_path() {
 		Path::delete_path();
 		delete_nodes();
diff --git a/engines/ultima/nuvie/pathfinder/u6_astar_path.h b/engines/ultima/nuvie/pathfinder/u6_astar_path.h
index 208730f0002..f0198643aa3 100644
--- a/engines/ultima/nuvie/pathfinder/u6_astar_path.h
+++ b/engines/ultima/nuvie/pathfinder/u6_astar_path.h
@@ -31,8 +31,8 @@ namespace Nuvie {
 /* This provides a U6-specific step_cost() method. */
 class U6AStarPath: public AStarPath {
 public:
-	sint32 step_cost(MapCoord &c1, MapCoord &c2);
-	uint32 path_cost_est(MapCoord &s, MapCoord &g);
+	sint32 step_cost(MapCoord &c1, MapCoord &c2) override;
+	uint32 path_cost_est(MapCoord &s, MapCoord &g) override;
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/portraits/portrait_md.h b/engines/ultima/nuvie/portraits/portrait_md.h
index fe58b4908a7..bc98e8df4dd 100644
--- a/engines/ultima/nuvie/portraits/portrait_md.h
+++ b/engines/ultima/nuvie/portraits/portrait_md.h
@@ -39,13 +39,13 @@ class PortraitMD : public Portrait {
 public:
 	PortraitMD(Configuration *cfg): Portrait(cfg) {};
 
-	bool init();
-	bool load(NuvieIO *objlist);
-	unsigned char *get_portrait_data(Actor *actor);
+	bool init() override;
+	bool load(NuvieIO *objlist) override;
+	unsigned char *get_portrait_data(Actor *actor) override;
 
 protected:
 
-	uint8 get_portrait_num(Actor *actor);
+	uint8 get_portrait_num(Actor *actor) override;
 
 private:
 	U6Shape *get_background_shape(uint8 actor_num);
diff --git a/engines/ultima/nuvie/portraits/portrait_se.h b/engines/ultima/nuvie/portraits/portrait_se.h
index 7df74673cec..5d7682aa355 100644
--- a/engines/ultima/nuvie/portraits/portrait_se.h
+++ b/engines/ultima/nuvie/portraits/portrait_se.h
@@ -40,15 +40,15 @@ class PortraitSE : public Portrait {
 public:
 	PortraitSE(Configuration *cfg): Portrait(cfg) {};
 
-	bool init();
-	bool load(NuvieIO *objlist);
-	unsigned char *get_portrait_data(Actor *actor);
+	bool init() override;
+	bool load(NuvieIO *objlist) override;
+	unsigned char *get_portrait_data(Actor *actor) override;
 
 private:
 
 	U6Shape *get_background_shape(Actor *actor);
 	uint8 get_background_shape_num(Actor *actor);
-	uint8 get_portrait_num(Actor *actor);
+	uint8 get_portrait_num(Actor *actor) override;
 
 };
 
diff --git a/engines/ultima/nuvie/portraits/portrait_u6.h b/engines/ultima/nuvie/portraits/portrait_u6.h
index d2be79c690c..c9796f6435a 100644
--- a/engines/ultima/nuvie/portraits/portrait_u6.h
+++ b/engines/ultima/nuvie/portraits/portrait_u6.h
@@ -41,15 +41,15 @@ class PortraitU6 : public Portrait {
 public:
 
 	PortraitU6(Configuration *cfg) : Portrait(cfg) {};
-	~PortraitU6() {};
+	~PortraitU6() override {};
 
-	bool init();
-	bool load(NuvieIO *objlist);
-	unsigned char *get_portrait_data(Actor *actor);
+	bool init() override;
+	bool load(NuvieIO *objlist) override;
+	unsigned char *get_portrait_data(Actor *actor) override;
 
 private:
 
-	uint8 get_portrait_num(Actor *actor);
+	uint8 get_portrait_num(Actor *actor) override;
 
 };
 
diff --git a/engines/ultima/nuvie/script/script_cutscene.h b/engines/ultima/nuvie/script/script_cutscene.h
index 3999261424d..509743ab3ad 100644
--- a/engines/ultima/nuvie/script/script_cutscene.h
+++ b/engines/ultima/nuvie/script/script_cutscene.h
@@ -81,8 +81,8 @@ private:
 	} stars[STAR_FIELD_NUM_STARS];
 public:
 	CSStarFieldImage(U6Shape *shape);
-	virtual ~CSStarFieldImage() {}
-	virtual void updateEffect();
+	~CSStarFieldImage() override {}
+	void updateEffect() override;
 };
 
 struct CSSprite {
@@ -137,7 +137,7 @@ private:
 
 public:
 	ScriptCutscene(GUI *g, Configuration *cfg, SoundManager *sm);
-	~ScriptCutscene();
+	~ScriptCutscene() override;
 
 	Std::vector<Std::string> load_text(const char *filename, uint8 idx);
 
@@ -164,8 +164,8 @@ public:
 	void update();
 
 	void wait();
-	void Display(bool full_redraw);
-	virtual void Hide();
+	void Display(bool full_redraw) override;
+	void Hide() override;
 
 	void print_text(CSImage *image, const char *string, uint16 *x, uint16 *y, uint16 startx, uint16 width, uint8 color);
 
diff --git a/engines/ultima/nuvie/sound/adlib_sfx_manager.h b/engines/ultima/nuvie/sound/adlib_sfx_manager.h
index a41d3297381..761e6f3ec19 100644
--- a/engines/ultima/nuvie/sound/adlib_sfx_manager.h
+++ b/engines/ultima/nuvie/sound/adlib_sfx_manager.h
@@ -35,10 +35,10 @@ namespace Nuvie {
 class AdLibSfxManager : public SfxManager {
 public:
 	AdLibSfxManager(Configuration *cfg, Audio::Mixer *m);
-	virtual ~AdLibSfxManager();
+	~AdLibSfxManager() override;
 
-	bool playSfx(SfxIdType sfx_id, uint8 volume);
-	bool playSfxLooping(SfxIdType sfx_id, Audio::SoundHandle *handle, uint8 volume);
+	bool playSfx(SfxIdType sfx_id, uint8 volume) override;
+	bool playSfxLooping(SfxIdType sfx_id, Audio::SoundHandle *handle, uint8 volume) override;
 
 private:
 	void playSoundSample(Audio::AudioStream *stream, Audio::SoundHandle *looping_handle, uint8 volume);
diff --git a/engines/ultima/nuvie/sound/adplug/emu_opl.h b/engines/ultima/nuvie/sound/adplug/emu_opl.h
index 1972b5e09db..93c4bfec718 100644
--- a/engines/ultima/nuvie/sound/adplug/emu_opl.h
+++ b/engines/ultima/nuvie/sound/adplug/emu_opl.h
@@ -32,7 +32,7 @@ namespace Nuvie {
 class CEmuopl: public Copl {
 public:
 	CEmuopl(int rate, bool bit16, bool usestereo);  // rate = sample rate
-	virtual ~CEmuopl();
+	~CEmuopl() override;
 
 	int getRate() {
 		return oplRate;
@@ -41,8 +41,8 @@ public:
 	void update(short *buf, int samples);   // fill buffer
 
 	// template methods
-	void write(int reg, int val);
-	void init();
+	void write(int reg, int val) override;
+	void init() override;
 
 private:
 	bool    use16bit, stereo;
diff --git a/engines/ultima/nuvie/sound/adplug/mid.h b/engines/ultima/nuvie/sound/adplug/mid.h
index 7eafcdb9e8b..18cd341a047 100644
--- a/engines/ultima/nuvie/sound/adplug/mid.h
+++ b/engines/ultima/nuvie/sound/adplug/mid.h
@@ -32,29 +32,29 @@ public:
 	static CPlayer *factory(Copl *newopl);
 
 	CmidPlayer(Copl *newopl);
-	~CmidPlayer();
+	~CmidPlayer() override;
 
-	bool load(const Std::string &filename);
+	bool load(const Std::string &filename) override;
 	bool load(Std::string &filename, int song_index);
 	//bool load(const Std::string &filename, const CFileProvider &fp);
-	bool update();
-	void rewind(int subsong);
-	float getrefresh();
+	bool update() override;
+	void rewind(int subsong) override;
+	float getrefresh() override;
 
-	Std::string gettype();
-	Std::string gettitle() {
+	Std::string gettype() override;
+	Std::string gettitle() override {
 		return Std::string(title);
 	}
-	Std::string getauthor() {
+	Std::string getauthor() override {
 		return Std::string(author);
 	}
-	Std::string getdesc() {
+	Std::string getdesc() override {
 		return Std::string(remarks);
 	}
-	unsigned int getinstruments() {
+	unsigned int getinstruments() override {
 		return tins;
 	}
-	unsigned int getsubsongs() {
+	unsigned int getsubsongs() override {
 		return subsongs;
 	}
 
diff --git a/engines/ultima/nuvie/sound/adplug/opl_class.h b/engines/ultima/nuvie/sound/adplug/opl_class.h
index a3c3ca34298..90531cb3e80 100644
--- a/engines/ultima/nuvie/sound/adplug/opl_class.h
+++ b/engines/ultima/nuvie/sound/adplug/opl_class.h
@@ -213,7 +213,7 @@ private:
 
 public:
 	OplClass(int rate, bool bit16, bool usestereo); // rate = sample rate
-	~OplClass() {
+	~OplClass() override {
 		YM3812Shutdown();
 	}
 
@@ -224,8 +224,8 @@ public:
 	void update(short *buf, int samples);   // fill buffer
 
 	// template methods
-	void write(int reg, int val);
-	void init();
+	void write(int reg, int val) override;
+	void init() override;
 
 private:
 	int  YM3812Init(int num, int clock, int rate);
diff --git a/engines/ultima/nuvie/sound/adplug/silent_opl.h b/engines/ultima/nuvie/sound/adplug/silent_opl.h
index 2c1ff295810..c0c8aa723f9 100644
--- a/engines/ultima/nuvie/sound/adplug/silent_opl.h
+++ b/engines/ultima/nuvie/sound/adplug/silent_opl.h
@@ -27,8 +27,8 @@ namespace Nuvie {
 
 class CSilentopl : public Copl {
 public:
-	void write(int reg, int val) { };
-	void init() { };
+	void write(int reg, int val) override { };
+	void init() override { };
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/sound/adplug/u6m.h b/engines/ultima/nuvie/sound/adplug/u6m.h
index 4bf66c8f324..509ff51e8b0 100644
--- a/engines/ultima/nuvie/sound/adplug/u6m.h
+++ b/engines/ultima/nuvie/sound/adplug/u6m.h
@@ -37,16 +37,16 @@ public:
 		songend(0), song_pos(0), loop_position(0), read_delay(0) {
 	}
 
-	~Cu6mPlayer();
+	~Cu6mPlayer() override;
 
 
 
-	bool load(const Std::string &filename);
-	bool update();
-	void rewind(int subsong);
-	float getrefresh();
+	bool load(const Std::string &filename) override;
+	bool update() override;
+	void rewind(int subsong) override;
+	float getrefresh() override;
 
-	Std::string gettype() {
+	Std::string gettype() override {
 		return Std::string("Ultima 6 Music");
 	};
 
diff --git a/engines/ultima/nuvie/sound/custom_sfx_manager.h b/engines/ultima/nuvie/sound/custom_sfx_manager.h
index f73d1b3ec89..749d42748e1 100644
--- a/engines/ultima/nuvie/sound/custom_sfx_manager.h
+++ b/engines/ultima/nuvie/sound/custom_sfx_manager.h
@@ -36,10 +36,10 @@ namespace Nuvie {
 class CustomSfxManager : public SfxManager {
 public:
 	CustomSfxManager(Configuration *cfg, Audio::Mixer *m);
-	virtual ~CustomSfxManager();
+	~CustomSfxManager() override;
 
-	bool playSfx(SfxIdType sfx_id, uint8 volume);
-	bool playSfxLooping(SfxIdType sfx_id, Audio::SoundHandle *handle, uint8 volume);
+	bool playSfx(SfxIdType sfx_id, uint8 volume) override;
+	bool playSfxLooping(SfxIdType sfx_id, Audio::SoundHandle *handle, uint8 volume) override;
 
 	void playSoundSample(uint16 sample_num, Audio::SoundHandle *looping_handle, uint8 volume);
 
diff --git a/engines/ultima/nuvie/sound/decoder/adlib_sfx_stream.h b/engines/ultima/nuvie/sound/decoder/adlib_sfx_stream.h
index c298ab32595..c28ead229a1 100644
--- a/engines/ultima/nuvie/sound/decoder/adlib_sfx_stream.h
+++ b/engines/ultima/nuvie/sound/decoder/adlib_sfx_stream.h
@@ -44,21 +44,21 @@ public:
 	}
 
 	AdLibSfxStream(Configuration *cfg, int rate, uint8 channel, sint8 note, uint8 velocity, uint8 program_number, uint32 d);
-	~AdLibSfxStream();
+	~AdLibSfxStream() override;
 
-	int readBuffer(sint16 *buffer, const int numSamples);
+	int readBuffer(sint16 *buffer, const int numSamples) override;
 
 	/** Is this a stereo stream? */
-	bool isStereo() const {
+	bool isStereo() const override {
 		return true;
 	}
 
 	/** Sample rate of the stream. */
-	int getRate() const {
+	int getRate() const override {
 		return opl->getRate();
 	}
 
-	bool rewind() {
+	bool rewind() override {
 		return false;
 	}
 
@@ -69,7 +69,7 @@ public:
 	 * This is used by e.g. a rate converter to decide whether to keep on
 	 * converting data or stop.
 	 */
-	bool endOfData() const {
+	bool endOfData() const override {
 		if (total_samples_played >= duration) {
 			return true;
 		}
diff --git a/engines/ultima/nuvie/sound/decoder/fm_towns_decoder_stream.h b/engines/ultima/nuvie/sound/decoder/fm_towns_decoder_stream.h
index 521bc3d8f9b..802c4bdfdde 100644
--- a/engines/ultima/nuvie/sound/decoder/fm_towns_decoder_stream.h
+++ b/engines/ultima/nuvie/sound/decoder/fm_towns_decoder_stream.h
@@ -40,19 +40,19 @@ public:
 
 	FMtownsDecoderStream(unsigned char *buf, uint32 len);
 	FMtownsDecoderStream(Std::string filename, uint16 sample_num, bool isCompressed = true);
-	~FMtownsDecoderStream();
+	~FMtownsDecoderStream() override;
 
 	uint32 getLengthInMsec();
 
-	int readBuffer(sint16 *buffer, const int numSamples);
+	int readBuffer(sint16 *buffer, const int numSamples) override;
 
 	/** Is this a stereo stream? */
-	bool isStereo() const {
+	bool isStereo() const override {
 		return false;
 	}
 
 	/** Sample rate of the stream. */
-	int getRate() const {
+	int getRate() const override {
 		return 14700;
 	}
 
@@ -63,11 +63,11 @@ public:
 	 * This is used by e.g. a rate converter to decide whether to keep on
 	 * converting data or stop.
 	 */
-	bool endOfData() const {
+	bool endOfData() const override {
 		return (buf_pos >= buf_len);
 	}
 
-	bool rewind() {
+	bool rewind() override {
 		buf_pos = 0;
 		return true;
 	}
diff --git a/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h b/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h
index f4b7c1054ad..06a2cf3a1d9 100644
--- a/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h
+++ b/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h
@@ -37,17 +37,17 @@ public:
 		finished = false;
 	}
 
-	~PCSpeakerStream() {
+	~PCSpeakerStream() override {
 		delete pcspkr;
 	}
 
 	/** Is this a stereo stream? */
-	bool isStereo() const {
+	bool isStereo() const override {
 		return false;
 	}
 
 	/** Sample rate of the stream. */
-	int getRate() const {
+	int getRate() const override {
 		return SPKR_OUTPUT_RATE;
 	}
 
@@ -58,11 +58,11 @@ public:
 	 * This is used by e.g. a rate converter to decide whether to keep on
 	 * converting data or stop.
 	 */
-	bool endOfData() const {
+	bool endOfData() const override {
 		return finished;
 	}
 
-	bool rewind() {
+	bool rewind() override {
 		return false;
 	}
 
@@ -79,9 +79,9 @@ public:
 	}
 
 	PCSpeakerFreqStream(uint start, uint16 d);
-	~PCSpeakerFreqStream();
+	~PCSpeakerFreqStream() override;
 	uint32 getLengthInMsec();
-	int readBuffer(sint16 *buffer, const int numSamples);
+	int readBuffer(sint16 *buffer, const int numSamples) override;
 
 protected:
 
@@ -98,9 +98,9 @@ public:
 	}
 
 	PCSpeakerSweepFreqStream(uint start, uint end, uint16 d, uint16 s);
-	~PCSpeakerSweepFreqStream();
+	~PCSpeakerSweepFreqStream() override;
 	uint32 getLengthInMsec();
-	int readBuffer(sint16 *buffer, const int numSamples);
+	int readBuffer(sint16 *buffer, const int numSamples) override;
 
 protected:
 
@@ -126,10 +126,10 @@ public:
 	}
 
 	PCSpeakerRandomStream(uint start, uint16 d, uint16 s);
-	~PCSpeakerRandomStream();
+	~PCSpeakerRandomStream() override;
 	uint32 getLengthInMsec();
 	uint16 getNextFreqValue();
-	int readBuffer(sint16 *buffer, const int numSamples);
+	int readBuffer(sint16 *buffer, const int numSamples) override;
 
 protected:
 
@@ -153,9 +153,9 @@ public:
 	}
 
 	PCSpeakerStutterStream(sint16 a0, uint16 a2, uint16 a4, uint16 a6, uint16 a8);
-	~PCSpeakerStutterStream();
+	~PCSpeakerStutterStream() override;
 	uint32 getLengthInMsec();
-	int readBuffer(sint16 *buffer, const int numSamples);
+	int readBuffer(sint16 *buffer, const int numSamples) override;
 
 protected:
 
diff --git a/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp b/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp
index a2382e59db0..ef7d1d10ffc 100644
--- a/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp
+++ b/engines/ultima/nuvie/sound/decoder/random_collection_audio_stream.cpp
@@ -68,24 +68,24 @@ public:
 			_currentStream = NULL;
 	}
 
-	~RandomCollectionAudioStreamImpl();
+	~RandomCollectionAudioStreamImpl() override;
 
 	// Implement the AudioStream API
-	virtual int readBuffer(int16 *buffer, const int numSamples);
-	virtual bool isStereo() const {
+	int readBuffer(int16 *buffer, const int numSamples) override;
+	bool isStereo() const override {
 		return _stereo;
 	}
-	virtual int getRate() const {
+	int getRate() const override {
 		return _rate;
 	}
-	virtual bool endOfData() const {
+	bool endOfData() const override {
 		return false;
 	}
-	virtual bool endOfStream() const {
+	bool endOfStream() const override {
 		return _finished;
 	}
 
-	virtual void finish() {
+	void finish() override {
 		_finished = true;
 	}
 };
diff --git a/engines/ultima/nuvie/sound/decoder/u6_adplug_decoder_stream.h b/engines/ultima/nuvie/sound/decoder/u6_adplug_decoder_stream.h
index 76eaa12d01b..8f4545afaca 100644
--- a/engines/ultima/nuvie/sound/decoder/u6_adplug_decoder_stream.h
+++ b/engines/ultima/nuvie/sound/decoder/u6_adplug_decoder_stream.h
@@ -44,21 +44,21 @@ public:
 	}
 
 	U6AdPlugDecoderStream(CEmuopl *o, Std::string filename, uint16 song_num);
-	~U6AdPlugDecoderStream();
+	~U6AdPlugDecoderStream() override;
 
-	int readBuffer(sint16 *buffer, const int numSamples);
+	int readBuffer(sint16 *buffer, const int numSamples) override;
 
 	/** Is this a stereo stream? */
-	bool isStereo() const {
+	bool isStereo() const override {
 		return true;
 	}
 
 	/** Sample rate of the stream. */
-	int getRate() const {
+	int getRate() const override {
 		return opl->getRate();
 	}
 
-	bool rewind() {
+	bool rewind() override {
 		if (player) {
 			player->rewind();    //FIXME this would need to be locked if called outside mixer thread.
 			return true;
@@ -73,7 +73,7 @@ public:
 	 * This is used by e.g. a rate converter to decide whether to keep on
 	 * converting data or stop.
 	 */
-	bool endOfData() const {
+	bool endOfData() const override {
 		return false;
 	}
 private:
diff --git a/engines/ultima/nuvie/sound/pc_speaker_sfx_manager.h b/engines/ultima/nuvie/sound/pc_speaker_sfx_manager.h
index d186ea60ff1..fef5db4c528 100644
--- a/engines/ultima/nuvie/sound/pc_speaker_sfx_manager.h
+++ b/engines/ultima/nuvie/sound/pc_speaker_sfx_manager.h
@@ -35,10 +35,10 @@ namespace Nuvie {
 class PCSpeakerSfxManager : public SfxManager {
 public:
 	PCSpeakerSfxManager(Configuration *cfg, Audio::Mixer *m);
-	virtual ~PCSpeakerSfxManager();
+	~PCSpeakerSfxManager() override;
 
-	bool playSfx(SfxIdType sfx_id, uint8 volume);
-	bool playSfxLooping(SfxIdType sfx_id, Audio::SoundHandle *handle, uint8 volume);
+	bool playSfx(SfxIdType sfx_id, uint8 volume) override;
+	bool playSfxLooping(SfxIdType sfx_id, Audio::SoundHandle *handle, uint8 volume) override;
 
 private:
 	void playSoundSample(Audio::AudioStream *stream, Audio::SoundHandle *looping_handle, uint8 volume);
diff --git a/engines/ultima/nuvie/sound/song.h b/engines/ultima/nuvie/sound/song.h
index 1f5380d4c3f..e5905008ad8 100644
--- a/engines/ultima/nuvie/sound/song.h
+++ b/engines/ultima/nuvie/sound/song.h
@@ -34,16 +34,16 @@ public:
 	virtual bool Init(const char *filename) {
 		return false;
 	}
-	bool Play(bool looping = false) {
+	bool Play(bool looping = false) override {
 		return false;
 	}
-	bool Stop() {
+	bool Stop() override {
 		return false;
 	}
-	bool SetVolume(uint8 volume) {
+	bool SetVolume(uint8 volume) override {
 		return false;
 	}
-	bool FadeOut(float seconds) {
+	bool FadeOut(float seconds) override {
 		return false;
 	}
 
diff --git a/engines/ultima/nuvie/sound/song_adplug.h b/engines/ultima/nuvie/sound/song_adplug.h
index 0b5c7ff55cb..b691dc50161 100644
--- a/engines/ultima/nuvie/sound/song_adplug.h
+++ b/engines/ultima/nuvie/sound/song_adplug.h
@@ -37,15 +37,15 @@ public:
 	uint16 samples_left;
 
 	SongAdPlug(Audio::Mixer *m, CEmuopl *o);
-	~SongAdPlug();
-	bool Init(const char *filename) {
+	~SongAdPlug() override;
+	bool Init(const char *filename) override {
 		return Init(filename, 0);
 	}
 	bool Init(const char *filename, uint16 song_num);
-	bool Play(bool looping = false);
-	bool Stop();
-	bool SetVolume(uint8 volume);
-	bool FadeOut(float seconds) {
+	bool Play(bool looping = false) override;
+	bool Stop() override;
+	bool SetVolume(uint8 volume) override;
+	bool FadeOut(float seconds) override {
 		return false;
 	}
 	CEmuopl *get_opl() {
diff --git a/engines/ultima/nuvie/sound/towns_sfx_manager.h b/engines/ultima/nuvie/sound/towns_sfx_manager.h
index 7908f6e8e85..963f8f17060 100644
--- a/engines/ultima/nuvie/sound/towns_sfx_manager.h
+++ b/engines/ultima/nuvie/sound/towns_sfx_manager.h
@@ -43,10 +43,10 @@ typedef struct {
 class TownsSfxManager : public SfxManager {
 public:
 	TownsSfxManager(Configuration *cfg, Audio::Mixer *m);
-	virtual ~TownsSfxManager();
+	~TownsSfxManager() override;
 
-	bool playSfx(SfxIdType sfx_id, uint8 volume);
-	bool playSfxLooping(SfxIdType sfx_id, Audio::SoundHandle *handle, uint8 volume);
+	bool playSfx(SfxIdType sfx_id, uint8 volume) override;
+	bool playSfxLooping(SfxIdType sfx_id, Audio::SoundHandle *handle, uint8 volume) override;
 
 private:
 	Std::string sounds2dat_filepath;
diff --git a/engines/ultima/nuvie/usecode/u6_usecode.h b/engines/ultima/nuvie/usecode/u6_usecode.h
index e43351b6771..df8d89bbede 100644
--- a/engines/ultima/nuvie/usecode/u6_usecode.h
+++ b/engines/ultima/nuvie/usecode/u6_usecode.h
@@ -74,7 +74,7 @@ class U6UseCode: public UseCode, public CallBack {
 public:
 
 	U6UseCode(Game *g, Configuration *cfg);
-	~U6UseCode();
+	~U6UseCode() override;
 
 	bool use_obj(Obj *obj, Actor *actor) override;
 	bool look_obj(Obj *obj, Actor *actor) override;
@@ -142,7 +142,7 @@ public:
 	bool is_container(uint16 obj_n, uint8 frame_n) override;
 	bool is_readable(Obj *obj) override;
 
-	virtual uint16 callback(uint16 msg, CallBack *caller, void *data = NULL) override;
+	uint16 callback(uint16 msg, CallBack *caller, void *data = NULL) override;
 
 protected:
 	bool uc_event(const U6ObjectType *type, UseCodeEvent ev, Obj *obj);
diff --git a/engines/ultima/nuvie/views/actor_view.h b/engines/ultima/nuvie/views/actor_view.h
index a2ddb691a90..51f66112ff9 100644
--- a/engines/ultima/nuvie/views/actor_view.h
+++ b/engines/ultima/nuvie/views/actor_view.h
@@ -50,13 +50,13 @@ class ActorView : public View {
 
 public:
 	ActorView(Configuration *cfg);
-	~ActorView();
+	~ActorView() override;
 
 	bool init(Screen *tmp_screen, void *view_manager, uint16 x, uint16 y, Font *f, Party *p, TileManager *tm, ObjManager *om, Portrait *port);
 
-	bool set_party_member(uint8 party_member);
+	bool set_party_member(uint8 party_member) override;
 
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 	void update() {
 		update_display = true;
 	}
@@ -69,9 +69,9 @@ protected:
 	void display_name();
 	void display_actor_stats();
 	bool in_party;
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	GUI_status KeyDown(const Common::KeyState &key);
-	GUI_status MouseWheel(sint32 x, sint32 y);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status KeyDown(const Common::KeyState &key) override;
+	GUI_status MouseWheel(sint32 x, sint32 y) override;
 	void update_cursor();
 	void select_button();
 };
diff --git a/engines/ultima/nuvie/views/container_view_gump.h b/engines/ultima/nuvie/views/container_view_gump.h
index 6e719aa73fd..c3c1b7d72c3 100644
--- a/engines/ultima/nuvie/views/container_view_gump.h
+++ b/engines/ultima/nuvie/views/container_view_gump.h
@@ -57,11 +57,11 @@ class ContainerViewGump : public DraggableView {
 
 public:
 	ContainerViewGump(Configuration *cfg);
-	~ContainerViewGump();
+	~ContainerViewGump() override;
 
 	bool init(Screen *tmp_screen, void *view_manager, uint16 x, uint16 y, Font *f, Party *p, TileManager *tm, ObjManager *om, Obj *container_obj_type);
 
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
 	void set_actor(Actor *a);
 	Actor *get_actor() {
@@ -76,20 +76,20 @@ public:
 		return (container_obj == NULL);
 	}
 
-	GUI_status KeyDown(const Common::KeyState &key);
+	GUI_status KeyDown(const Common::KeyState &key) override;
 
-	virtual GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseMotion(int x, int y, uint8 state) {
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override {
 		return DraggableView::MouseMotion(x, y, state);
 	}
-	virtual GUI_status MouseWheel(sint32 x, sint32 y);
-	virtual void MoveRelative(int dx, int dy) {
+	GUI_status MouseWheel(sint32 x, sint32 y) override;
+	void MoveRelative(int dx, int dy) override {
 		return DraggableView::MoveRelative(dx, dy);
 	}
 
 
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 protected:
 
 	void init_container_type(Std::string datadir, Obj *obj_type);
diff --git a/engines/ultima/nuvie/views/container_widget.h b/engines/ultima/nuvie/views/container_widget.h
index 4c037a457ac..00982922bed 100644
--- a/engines/ultima/nuvie/views/container_widget.h
+++ b/engines/ultima/nuvie/views/container_widget.h
@@ -65,7 +65,7 @@ protected:
 
 public:
 	ContainerWidget(Configuration *cfg, GUI_CallBack *callback = NULL);
-	~ContainerWidget();
+	~ContainerWidget() override;
 
 	bool init(Actor *a, uint16 x, uint16 y, TileManager *tm, ObjManager *om, Font *f);
 	virtual void set_actor(Actor *a);
@@ -83,22 +83,22 @@ public:
 	bool is_showing_container() {
 		return (container_obj != NULL ? true : false);
 	}
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
-	virtual GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseMotion(int x, int y, uint8 state);
-	GUI_status MouseDouble(int x, int y, Shared::MouseButton button);
-	GUI_status MouseClick(int x, int y, Shared::MouseButton button);
-	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override;
+	GUI_status MouseDouble(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseClick(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button) override;
 
-	void drag_drop_success(int x, int y, int message, void *data);
-	void drag_drop_failed(int x, int y, int message, void *data);
+	void drag_drop_success(int x, int y, int message, void *data) override;
+	void drag_drop_failed(int x, int y, int message, void *data) override;
 
-	bool drag_accept_drop(int x, int y, int message, void *data);
-	void drag_perform_drop(int x, int y, int message, void *data);
+	bool drag_accept_drop(int x, int y, int message, void *data) override;
+	void drag_perform_drop(int x, int y, int message, void *data) override;
 
-	void drag_draw(int x, int y, int message, void *data);
+	void drag_draw(int x, int y, int message, void *data) override;
 
 protected:
 
diff --git a/engines/ultima/nuvie/views/container_widget_gump.h b/engines/ultima/nuvie/views/container_widget_gump.h
index c8e24f8af06..f7de4618f65 100644
--- a/engines/ultima/nuvie/views/container_widget_gump.h
+++ b/engines/ultima/nuvie/views/container_widget_gump.h
@@ -46,14 +46,14 @@ private:
 
 public:
 	ContainerWidgetGump(Configuration *cfg, GUI_CallBack *callback = NULL);
-	~ContainerWidgetGump();
+	~ContainerWidgetGump() override;
 
 	bool init(Actor *a, uint16 x, uint16 y, uint8 Cols, uint8 Rows, TileManager *tm, ObjManager *om, Font *f, uint8 check_xoff, uint8 check_yoff);
 
-	void Display(bool full_redraw);
-	GUI_status KeyDown(const Common::KeyState &key);
+	void Display(bool full_redraw) override;
+	GUI_status KeyDown(const Common::KeyState &key) override;
 
-	virtual void set_actor(Actor *a);
+	void set_actor(Actor *a) override;
 private:
 
 	void cursor_right();
diff --git a/engines/ultima/nuvie/views/doll_view_gump.h b/engines/ultima/nuvie/views/doll_view_gump.h
index 687ca090542..c01baaf30fa 100644
--- a/engines/ultima/nuvie/views/doll_view_gump.h
+++ b/engines/ultima/nuvie/views/doll_view_gump.h
@@ -61,7 +61,7 @@ class DollViewGump : public DraggableView {
 
 public:
 	DollViewGump(Configuration *cfg);
-	~DollViewGump();
+	~DollViewGump() override;
 
 	bool init(Screen *tmp_screen, void *view_manager, uint16 x, uint16 y, Actor *a, Font *f, Party *p, TileManager *tm, ObjManager *om);
 
@@ -70,20 +70,20 @@ public:
 		return actor;
 	}
 
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
-	virtual GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseMotion(int x, int y, uint8 state) {
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override {
 		return DraggableView::MouseMotion(x, y, state);
 	}
-	virtual GUI_status MouseWheel(sint32 xpos, sint32 ypos);
-	virtual void MoveRelative(int dx, int dy) {
+	GUI_status MouseWheel(sint32 xpos, sint32 ypos) override;
+	void MoveRelative(int dx, int dy) override {
 		return DraggableView::MoveRelative(dx, dy);
 	}
 
 
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 protected:
 
 	void displayEquipWeight();
@@ -98,7 +98,7 @@ private:
 	void setColorKey(Graphics::ManagedSurface *image);
 	GUI_status set_cursor_pos(gumpCursorPos pos);
 	GUI_status moveCursorRelative(uint8 direction);
-	GUI_status KeyDown(const Common::KeyState &key);
+	GUI_status KeyDown(const Common::KeyState &key) override;
 
 };
 
diff --git a/engines/ultima/nuvie/views/doll_widget.h b/engines/ultima/nuvie/views/doll_widget.h
index e59298f2bac..dc2e75ea4c5 100644
--- a/engines/ultima/nuvie/views/doll_widget.h
+++ b/engines/ultima/nuvie/views/doll_widget.h
@@ -56,28 +56,28 @@ class DollWidget : public GUI_Widget {
 
 public:
 	DollWidget(Configuration *cfg, GUI_CallBack *callback = NULL);
-	~DollWidget();
+	~DollWidget() override;
 
 	bool init(Actor *a, uint16 x, uint16 y, TileManager *tm, ObjManager *om, bool in_portrat_view = false);
 	void free_doll_shapes();
 	void setColorKey(Graphics::ManagedSurface *image);
 	void set_actor(Actor *a);
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
-	virtual GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseMotion(int x, int y, uint8 state);
-	GUI_status MouseDouble(int x, int y, Shared::MouseButton button);
-	GUI_status MouseClick(int x, int y, Shared::MouseButton button);
-	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override;
+	GUI_status MouseDouble(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseClick(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button) override;
 
-	void drag_drop_success(int x, int y, int message, void *data);
-	void drag_drop_failed(int x, int y, int message, void *data);
+	void drag_drop_success(int x, int y, int message, void *data) override;
+	void drag_drop_failed(int x, int y, int message, void *data) override;
 
-	bool drag_accept_drop(int x, int y, int message, void *data);
-	void drag_perform_drop(int x, int y, int message, void *data);
+	bool drag_accept_drop(int x, int y, int message, void *data) override;
+	void drag_perform_drop(int x, int y, int message, void *data) override;
 
-	void drag_draw(int x, int y, int message, void *data);
+	void drag_draw(int x, int y, int message, void *data) override;
 
 	Common::Rect *get_item_hit_rect(uint8 location);
 
diff --git a/engines/ultima/nuvie/views/draggable_view.h b/engines/ultima/nuvie/views/draggable_view.h
index ddac5e11265..a72bee42b69 100644
--- a/engines/ultima/nuvie/views/draggable_view.h
+++ b/engines/ultima/nuvie/views/draggable_view.h
@@ -43,13 +43,13 @@ private:
 
 public:
 	DraggableView(Configuration *config);
-	virtual ~DraggableView();
+	~DraggableView() override;
 
 	/* events, used for dragging the area. */
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	GUI_status MouseMotion(int x, int y, uint8 state);
-	void MoveRelative(int dx, int dy);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override;
+	void MoveRelative(int dx, int dy) override;
 
 protected:
 	void set_bg_color_key(uint8 r, uint8 g, uint8 b);
diff --git a/engines/ultima/nuvie/views/inventory_view.h b/engines/ultima/nuvie/views/inventory_view.h
index 9b7fc2ad28e..d4e987998b6 100644
--- a/engines/ultima/nuvie/views/inventory_view.h
+++ b/engines/ultima/nuvie/views/inventory_view.h
@@ -64,10 +64,10 @@ class InventoryView : public View {
 
 public:
 	InventoryView(Configuration *cfg);
-	~InventoryView();
+	~InventoryView() override;
 
 	bool init(Screen *tmp_screen, void *view_manager, uint16 x, uint16 y, Font *f, Party *p, TileManager *tm, ObjManager *om);
-	bool set_party_member(uint8 party_member);
+	bool set_party_member(uint8 party_member) override;
 	bool set_actor(Actor *actor, bool pickpocket = false);
 	void set_show_cursor(bool state);
 	void moveCursorToSlot(uint8 slot_num);
@@ -82,9 +82,9 @@ public:
 		return (inventory_widget);
 	};
 
-	void Display(bool full_redraw);
-	void PlaceOnScreen(Screen *s, GUI_DragManager *dm, int x, int y);
-	GUI_status KeyDown(const Common::KeyState &key);
+	void Display(bool full_redraw) override;
+	void PlaceOnScreen(Screen *s, GUI_DragManager *dm, int x, int y) override;
+	GUI_status KeyDown(const Common::KeyState &key) override;
 	void simulate_CB_callback();
 	bool is_picking_pocket() {
 		return picking_pocket;
@@ -102,9 +102,9 @@ protected:
 	void update_cursor();
 	void hide_buttons();
 	void show_buttons();
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	GUI_status MouseWheel(sint32 x, sint32 y);
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseWheel(sint32 x, sint32 y) override;
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/views/inventory_widget.h b/engines/ultima/nuvie/views/inventory_widget.h
index 437a25cc24f..212316b6184 100644
--- a/engines/ultima/nuvie/views/inventory_widget.h
+++ b/engines/ultima/nuvie/views/inventory_widget.h
@@ -62,7 +62,7 @@ protected:
 
 public:
 	InventoryWidget(Configuration *cfg, GUI_CallBack *callback = NULL);
-	~InventoryWidget();
+	~InventoryWidget() override;
 
 	bool init(Actor *a, uint16 x, uint16 y, TileManager *tm, ObjManager *om, Font *f);
 	void set_actor(Actor *a);
@@ -82,22 +82,22 @@ public:
 	bool is_showing_container() {
 		return (container_obj != NULL ? true : false);
 	}
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
-	virtual GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseMotion(int x, int y, uint8 state);
-	GUI_status MouseDouble(int x, int y, Shared::MouseButton button);
-	GUI_status MouseClick(int x, int y, Shared::MouseButton button);
-	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button);
-	GUI_status MouseWheel(sint32 x, sint32 y);
-	void drag_drop_success(int x, int y, int message, void *data);
-	void drag_drop_failed(int x, int y, int message, void *data);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override;
+	GUI_status MouseDouble(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseClick(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseWheel(sint32 x, sint32 y) override;
+	void drag_drop_success(int x, int y, int message, void *data) override;
+	void drag_drop_failed(int x, int y, int message, void *data) override;
 
-	bool drag_accept_drop(int x, int y, int message, void *data);
-	void drag_perform_drop(int x, int y, int message, void *data);
+	bool drag_accept_drop(int x, int y, int message, void *data) override;
+	void drag_perform_drop(int x, int y, int message, void *data) override;
 
-	void drag_draw(int x, int y, int message, void *data);
+	void drag_draw(int x, int y, int message, void *data) override;
 
 	uint8 get_num_rows() {
 		return game_type == NUVIE_GAME_U6 ? 3 : 4;
diff --git a/engines/ultima/nuvie/views/map_editor_view.h b/engines/ultima/nuvie/views/map_editor_view.h
index 6c796bdf700..59b35f95211 100644
--- a/engines/ultima/nuvie/views/map_editor_view.h
+++ b/engines/ultima/nuvie/views/map_editor_view.h
@@ -42,17 +42,17 @@ private:
 	GUI_Button *down_button;
 public:
 	MapEditorView(Configuration *config);
-	virtual ~MapEditorView();
+	~MapEditorView() override;
 
 	bool init(Screen *tmp_screen, void *view_manager, uint16 x, uint16 y, Font *f, Party *p, TileManager *tm, ObjManager *om);
-	void Display(bool full_redraw);
-	GUI_status KeyDown(const Common::KeyState &key);
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	GUI_status MouseMotion(int x, int y, uint8 state);
+	void Display(bool full_redraw) override;
+	GUI_status KeyDown(const Common::KeyState &key) override;
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override;
 
-	virtual void close_view();
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	void close_view() override;
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 protected:
 	void setTile(uint16 x, uint16 y, uint8 level);
 	void toggleGrid();
diff --git a/engines/ultima/nuvie/views/md_sky_strip_widget.h b/engines/ultima/nuvie/views/md_sky_strip_widget.h
index 05842058fdc..279c1ecb4c5 100644
--- a/engines/ultima/nuvie/views/md_sky_strip_widget.h
+++ b/engines/ultima/nuvie/views/md_sky_strip_widget.h
@@ -43,10 +43,10 @@ protected:
 
 public:
 	MDSkyStripWidget(Configuration *cfg, GameClock *c, Player *p);
-	~MDSkyStripWidget();
+	~MDSkyStripWidget() override;
 
 	void init(sint16 x, sint16 y);
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
 private:
 	void display_surface();
diff --git a/engines/ultima/nuvie/views/party_view.h b/engines/ultima/nuvie/views/party_view.h
index f03d15da057..0bdef1a7a4a 100644
--- a/engines/ultima/nuvie/views/party_view.h
+++ b/engines/ultima/nuvie/views/party_view.h
@@ -47,17 +47,17 @@ class PartyView : public View {
 
 public:
 	PartyView(Configuration *cfg);
-	~PartyView();
+	~PartyView() override;
 
 	bool init(void *vm, uint16 x, uint16 y, Font *f, Party *p, Player *pl, TileManager *tm, ObjManager *om);
-	GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override {
 		return (GUI_YUM);
 	}
-	GUI_status MouseWheel(sint32 x, sint32 y);
-	bool drag_accept_drop(int x, int y, int message, void *data);
-	void drag_perform_drop(int x, int y, int message, void *data);
-	void Display(bool full_redraw);
+	GUI_status MouseWheel(sint32 x, sint32 y) override;
+	bool drag_accept_drop(int x, int y, int message, void *data) override;
+	void drag_perform_drop(int x, int y, int message, void *data) override;
+	void Display(bool full_redraw) override;
 	void update() {
 		update_display = true;
 	}
diff --git a/engines/ultima/nuvie/views/portrait_view.h b/engines/ultima/nuvie/views/portrait_view.h
index 5f777d85ae4..476fcf8851d 100644
--- a/engines/ultima/nuvie/views/portrait_view.h
+++ b/engines/ultima/nuvie/views/portrait_view.h
@@ -62,11 +62,11 @@ class PortraitView : public View {
 
 public:
 	PortraitView(Configuration *cfg);
-	~PortraitView();
+	~PortraitView() override;
 
 	bool init(uint16 x, uint16 y, Font *f, Party *p, Player *player, TileManager *tm, ObjManager *om, Portrait *port);
-	void Display(bool full_redraw);
-	GUI_status HandleEvent(const Common::Event *event);
+	void Display(bool full_redraw) override;
+	GUI_status HandleEvent(const Common::Event *event) override;
 
 	bool set_portrait(Actor *actor, const char *name);
 	void set_show_cursor(bool state) {
diff --git a/engines/ultima/nuvie/views/portrait_view_gump.h b/engines/ultima/nuvie/views/portrait_view_gump.h
index 168b32c9919..940500b1d2c 100644
--- a/engines/ultima/nuvie/views/portrait_view_gump.h
+++ b/engines/ultima/nuvie/views/portrait_view_gump.h
@@ -53,23 +53,23 @@ class PortraitViewGump : public DraggableView {
 
 public:
 	PortraitViewGump(Configuration *cfg);
-	~PortraitViewGump();
+	~PortraitViewGump() override;
 
 	bool init(Screen *tmp_screen, void *view_manager, uint16 x, uint16 y, Font *f, Party *p, TileManager *tm, ObjManager *om, Portrait *por, Actor *a);
 
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	GUI_status MouseWheel(sint32 x, sint32 y);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseWheel(sint32 x, sint32 y) override;
 
 protected:
 
 	void set_actor(Actor *a);
 	void left_arrow();
 	void right_arrow();
-	GUI_status KeyDown(const Common::KeyState &key);
+	GUI_status KeyDown(const Common::KeyState &key) override;
 	GUI_status set_cursor_pos(gumpCursorPos pos);
 };
 
diff --git a/engines/ultima/nuvie/views/scroll_view_gump.h b/engines/ultima/nuvie/views/scroll_view_gump.h
index b142bc65ad1..25ea051f03d 100644
--- a/engines/ultima/nuvie/views/scroll_view_gump.h
+++ b/engines/ultima/nuvie/views/scroll_view_gump.h
@@ -40,19 +40,19 @@ class ScrollViewGump : public DraggableView {
 
 public:
 	ScrollViewGump(Configuration *cfg);
-	~ScrollViewGump();
+	~ScrollViewGump() override;
 
 	bool init(Screen *tmp_screen, void *view_manager, Font *f, Party *p, TileManager *tm, ObjManager *om, Std::string text_string);
 
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	GUI_status MouseUp(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status KeyDown(const Common::KeyState &key);
+	GUI_status KeyDown(const Common::KeyState &key) override;
 
 protected:
 
diff --git a/engines/ultima/nuvie/views/scroll_widget_gump.h b/engines/ultima/nuvie/views/scroll_widget_gump.h
index c010bbae54c..8de349a276a 100644
--- a/engines/ultima/nuvie/views/scroll_widget_gump.h
+++ b/engines/ultima/nuvie/views/scroll_widget_gump.h
@@ -70,7 +70,7 @@ class ScrollWidgetGump: public MsgScroll {
 public:
 
 	ScrollWidgetGump(Configuration *cfg, Screen *s);
-	~ScrollWidgetGump();
+	~ScrollWidgetGump() override;
 
 	bool parse_token(MsgText *token) override;
 
@@ -82,7 +82,7 @@ public:
 
 	void display_prompt() override {}
 	void display_string(Std::string s);
-	virtual void display_string(Std::string s, Font *f, bool include_on_map_window) override {
+	void display_string(Std::string s, Font *f, bool include_on_map_window) override {
 		return MsgScroll::display_string(s, f, include_on_map_window);
 	}
 
diff --git a/engines/ultima/nuvie/views/sign_view_gump.h b/engines/ultima/nuvie/views/sign_view_gump.h
index b4e0e1bbe5e..ac1adc8592a 100644
--- a/engines/ultima/nuvie/views/sign_view_gump.h
+++ b/engines/ultima/nuvie/views/sign_view_gump.h
@@ -42,16 +42,16 @@ class SignViewGump : public DraggableView {
 
 public:
 	SignViewGump(Configuration *cfg);
-	~SignViewGump();
+	~SignViewGump() override;
 
 	bool init(Screen *tmp_screen, void *view_manager, Font *f, Party *p, TileManager *tm, ObjManager *om, const char *text_string, uint16 length);
 
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	GUI_status KeyDown(const Common::KeyState &key);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status KeyDown(const Common::KeyState &key) override;
 
 protected:
 
diff --git a/engines/ultima/nuvie/views/spell_view.h b/engines/ultima/nuvie/views/spell_view.h
index e8312a28fec..510f84adcb5 100644
--- a/engines/ultima/nuvie/views/spell_view.h
+++ b/engines/ultima/nuvie/views/spell_view.h
@@ -59,7 +59,7 @@ protected:
 
 public:
 	SpellView(Configuration *cfg);
-	~SpellView();
+	~SpellView() override;
 
 	bool init(Screen *tmp_screen, void *view_manager, uint16 x, uint16 y, Font *f, Party *p, TileManager *tm, ObjManager *om);
 
@@ -69,37 +69,37 @@ public:
 			return spell_container->quality;
 		} else return -1;
 	}
-	void Display(bool full_redraw);
-	void PlaceOnScreen(Screen *s, GUI_DragManager *dm, int x, int y);
+	void Display(bool full_redraw) override;
+	void PlaceOnScreen(Screen *s, GUI_DragManager *dm, int x, int y) override;
 	void close_look();
-	GUI_status KeyDown(const Common::KeyState &key);
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button);
+	GUI_status KeyDown(const Common::KeyState &key) override;
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
 
-	GUI_status MouseUp(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseMotion(int x, int y, uint8 state) {
+	GUI_status MouseMotion(int x, int y, uint8 state) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseEnter(uint8 state) {
+	GUI_status MouseEnter(uint8 state) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseLeave(uint8 state) {
+	GUI_status MouseLeave(uint8 state) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseClick(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseClick(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseDouble(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseDouble(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseDelayed(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseHeld(int x, int y, Shared::MouseButton button) {
+	GUI_status MouseHeld(int x, int y, Shared::MouseButton button) override {
 		return GUI_YUM;
 	}
-	GUI_status MouseWheel(sint32 x, sint32 y);
+	GUI_status MouseWheel(sint32 x, sint32 y) override;
 
 protected:
 
@@ -128,7 +128,7 @@ protected:
 	GUI_status cancel_spell();
 	uint16 get_available_spell_count(Spell *s);
 
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 };
 
 } // End of namespace Nuvie
diff --git a/engines/ultima/nuvie/views/spell_view_gump.h b/engines/ultima/nuvie/views/spell_view_gump.h
index 29bd68767aa..e77fdb25411 100644
--- a/engines/ultima/nuvie/views/spell_view_gump.h
+++ b/engines/ultima/nuvie/views/spell_view_gump.h
@@ -48,29 +48,29 @@ class SpellViewGump : public SpellView {
 	NuvieBmpFile bmp;
 public:
 	SpellViewGump(Configuration *cfg);
-	~SpellViewGump();
+	~SpellViewGump() override;
 
 	bool init(Screen *tmp_screen, void *view_manager, uint16 x, uint16 y, Font *f, Party *p, TileManager *tm, ObjManager *om);
 
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
-	virtual GUI_status MouseDown(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseUp(int x, int y, Shared::MouseButton button);
-	virtual GUI_status MouseMotion(int x, int y, uint8 state) {
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseUp(int x, int y, Shared::MouseButton button) override;
+	GUI_status MouseMotion(int x, int y, uint8 state) override {
 		return DraggableView::MouseMotion(x, y, state);
 	}
-	virtual GUI_status MouseWheel(sint32 x, sint32 y);
-	virtual void MoveRelative(int dx, int dy) {
+	GUI_status MouseWheel(sint32 x, sint32 y) override;
+	void MoveRelative(int dx, int dy) override {
 		return DraggableView::MoveRelative(dx, dy);
 	}
 
 
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 protected:
 
 	sint16 getSpell(int x, int y);
 
-	virtual uint8 fill_cur_spell_list();
+	uint8 fill_cur_spell_list() override;
 	void loadCircleString(Std::string datadir);
 	void loadCircleSuffix(Std::string datadir, Std::string image);
 	void printSpellQty(uint8 spell_num, uint16 x, uint16 y);
diff --git a/engines/ultima/nuvie/views/sun_moon_ribbon.h b/engines/ultima/nuvie/views/sun_moon_ribbon.h
index ddce24e1bda..13c3c47df40 100644
--- a/engines/ultima/nuvie/views/sun_moon_ribbon.h
+++ b/engines/ultima/nuvie/views/sun_moon_ribbon.h
@@ -38,12 +38,12 @@ private:
 
 public:
 	SunMoonRibbon(Player *p, Weather *w, TileManager *tm);
-	~SunMoonRibbon();
+	~SunMoonRibbon() override;
 
 	void init(Screen *screen);
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
-	GUI_status MouseDown(int x, int y, Shared::MouseButton button);
+	GUI_status MouseDown(int x, int y, Shared::MouseButton button) override;
 
 
 	void extend() {
@@ -54,7 +54,7 @@ public:
 	}
 
 protected:
-	void display_sun_moon(Tile *tile, uint8 pos);
+	void display_sun_moon(Tile *tile, uint8 pos) override;
 
 private:
 	void loadBgImage(uint8 num);
diff --git a/engines/ultima/nuvie/views/sun_moon_strip_widget.h b/engines/ultima/nuvie/views/sun_moon_strip_widget.h
index 38f075c1ac0..1a00738acc8 100644
--- a/engines/ultima/nuvie/views/sun_moon_strip_widget.h
+++ b/engines/ultima/nuvie/views/sun_moon_strip_widget.h
@@ -39,10 +39,10 @@ protected:
 
 public:
 	SunMoonStripWidget(Player *p, TileManager *tm);
-	~SunMoonStripWidget();
+	~SunMoonStripWidget() override;
 
 	void init(sint16 x, sint16 y);
-	void Display(bool full_redraw);
+	void Display(bool full_redraw) override;
 
 protected:
 	virtual void display_sun_moon(Tile *tile, uint8 pos);
diff --git a/engines/ultima/nuvie/views/view.h b/engines/ultima/nuvie/views/view.h
index 0791436b1cf..68e8caa3341 100644
--- a/engines/ultima/nuvie/views/view.h
+++ b/engines/ultima/nuvie/views/view.h
@@ -58,7 +58,7 @@ protected:
 public:
 
 	View(Configuration *cfg);
-	virtual ~View();
+	~View() override;
 
 	bool init(uint16 x, uint16 y, Font *f, Party *p, TileManager *tm, ObjManager *om);
 
@@ -76,7 +76,7 @@ public:
 
 protected:
 
-	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data);
+	GUI_status callback(uint16 msg, GUI_CallBack *caller, void *data) override;
 	GUI_Button *loadButton(Std::string dir, Std::string name, uint16 x, uint16 y);
 };
 
diff --git a/engines/ultima/shared/actions/action.h b/engines/ultima/shared/actions/action.h
index 64317477ed9..d06f43fc991 100644
--- a/engines/ultima/shared/actions/action.h
+++ b/engines/ultima/shared/actions/action.h
@@ -54,7 +54,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Action() {}
+	~Action() override {}
 
 	/**
 	 * Jumps up through the parents to find the root game
diff --git a/engines/ultima/shared/actions/huh.h b/engines/ultima/shared/actions/huh.h
index 0ba7c939e02..65898b302fe 100644
--- a/engines/ultima/shared/actions/huh.h
+++ b/engines/ultima/shared/actions/huh.h
@@ -46,7 +46,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Huh() {}
+	~Huh() override {}
 };
 
 } // End of namespace Actions
diff --git a/engines/ultima/shared/actions/pass.h b/engines/ultima/shared/actions/pass.h
index dd908269455..6c8352e3e0a 100644
--- a/engines/ultima/shared/actions/pass.h
+++ b/engines/ultima/shared/actions/pass.h
@@ -46,7 +46,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Pass() {}
+	~Pass() override {}
 };
 
 } // End of namespace Actions
diff --git a/engines/ultima/shared/core/file.h b/engines/ultima/shared/core/file.h
index 0a99eb92bbf..6b6bfbbba78 100644
--- a/engines/ultima/shared/core/file.h
+++ b/engines/ultima/shared/core/file.h
@@ -42,27 +42,27 @@ public:
 	 * Open the file with the given filename, by searching SearchMan.
 	 * @param	name	the name of the file to open
 	 */
-	virtual bool open(const Common::String &name) override;
+	bool open(const Common::String &name) override;
 
 	/**
 	 * Open the file with the given filename from within the given archive.
 	 * @param	name	the name of the file to open
 	 * @param	archive		the archive in which to search for the file
 	 */
-	virtual bool open(const Common::String &name, Common::Archive &archive) override;
+	bool open(const Common::String &name, Common::Archive &archive) override;
 
 	/**
 	 * Open the file corresponding to the give node.
 	 * @param   node        the node to consider.
 	 */
-	virtual bool open(const Common::FSNode &node) override;
+	bool open(const Common::FSNode &node) override;
 
 	/**
 	 * 'Open' the given stream. That is, we just wrap around it
 	 * @param	stream		a pointer to a SeekableReadStream, or 0
 	 * @param	name		a string describing the 'file' corresponding to stream
 	 */
-	virtual bool open(SeekableReadStream *stream, const Common::String &name) override;
+	bool open(SeekableReadStream *stream, const Common::String &name) override;
 
 	/**
 	 * Reads in a null terminated string
diff --git a/engines/ultima/shared/core/named_item.h b/engines/ultima/shared/core/named_item.h
index d2715d10460..13ea030e51b 100644
--- a/engines/ultima/shared/core/named_item.h
+++ b/engines/ultima/shared/core/named_item.h
@@ -43,7 +43,7 @@ public:
 	/**
 	 * Gets the name of the item, if any
 	 */
-	virtual const Common::String getName() const override { return _name; }
+	const Common::String getName() const override { return _name; }
 };
 
 } // End of namespace Shared
diff --git a/engines/ultima/shared/core/widgets.h b/engines/ultima/shared/core/widgets.h
index 5e7dcd96ebf..0d9b607adc1 100644
--- a/engines/ultima/shared/core/widgets.h
+++ b/engines/ultima/shared/core/widgets.h
@@ -43,7 +43,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~StandardWidget() {}
+	~StandardWidget() override {}
 };
 
 class Creature : public StandardWidget {
@@ -79,19 +79,19 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Creature() {}
+	~Creature() override {}
 
 	/**
 	 * Handles loading and saving games
 	 */
-	virtual void synchronize(Common::Serializer &s) override;
+	void synchronize(Common::Serializer &s) override;
 
 	/**
 	 * Called to update the widget at the end of a turn
 	 * @param isPreUpdate		Update is called twice in succesion during the end of turn update.
 	 *		Once with true for all widgets, then with it false
 	 */
-	virtual void update(bool isPreUpdate) override;
+	void update(bool isPreUpdate) override;
 
 	/**
 	 * True true if the creature is dead
@@ -116,7 +116,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~DungeonWidget() {}
+	~DungeonWidget() override {}
 
 	/**
 	 * Draws an item
diff --git a/engines/ultima/shared/early/font_resources.h b/engines/ultima/shared/early/font_resources.h
index 5688d5a679c..3c9c8cff8b6 100644
--- a/engines/ultima/shared/early/font_resources.h
+++ b/engines/ultima/shared/early/font_resources.h
@@ -35,7 +35,7 @@ protected:
 	/**
 	 * Synchronize resource data
 	 */
-	virtual void synchronize() override;
+	void synchronize() override;
 public:
 	byte _font8x8[256][8];
 	byte _fontU6[256][8];
diff --git a/engines/ultima/shared/early/game.h b/engines/ultima/shared/early/game.h
index 6dbe9d85174..327502f1557 100644
--- a/engines/ultima/shared/early/game.h
+++ b/engines/ultima/shared/early/game.h
@@ -91,7 +91,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Game();
+	~Game() override;
 
 	/**
 	 * Play a sound effect
@@ -111,12 +111,12 @@ public:
 	/**
 	 * Returns the map
 	 */
-	virtual Maps::Map *getMap() const override { return _map; }
+	Maps::Map *getMap() const override { return _map; }
 
 	/**
 	 * Handles loading and saving games
 	 */
-	virtual void synchronize(Common::Serializer &s) override;
+	void synchronize(Common::Serializer &s) override;
 
 	/**
 	 * Signal an end of turn
diff --git a/engines/ultima/shared/early/game_base.h b/engines/ultima/shared/early/game_base.h
index aed282fcf23..91d563792b6 100644
--- a/engines/ultima/shared/early/game_base.h
+++ b/engines/ultima/shared/early/game_base.h
@@ -90,22 +90,22 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~GameBase();
+	~GameBase() override;
 
 	/**
 	 * Called to handle any regular updates the game requires
 	 */
-	virtual void onIdle() override;
+	void onIdle() override;
 
-	virtual void mouseMove(const Point &mousePos) override;
-	virtual void leftButtonDown(const Point &mousePos) override;
-	virtual void leftButtonUp(const Point &mousePos) override;
-	virtual void middleButtonDown(const Point &mousePos) override;
-	virtual void middleButtonUp(const Point &mousePos) override;
-	virtual void rightButtonDown(const Point &mousePos) override;
-	virtual void rightButtonUp(const Point &mousePos) override;
-	virtual void mouseWheel(const Point &mousePos, bool wheelUp) override;
-	virtual void keyDown(Common::KeyState keyState) override;
+	void mouseMove(const Point &mousePos) override;
+	void leftButtonDown(const Point &mousePos) override;
+	void leftButtonUp(const Point &mousePos) override;
+	void middleButtonDown(const Point &mousePos) override;
+	void middleButtonUp(const Point &mousePos) override;
+	void rightButtonDown(const Point &mousePos) override;
+	void rightButtonUp(const Point &mousePos) override;
+	void mouseWheel(const Point &mousePos, bool wheelUp) override;
+	void keyDown(Common::KeyState keyState) override;
 
 	/**
 	 * Called when the game starts
diff --git a/engines/ultima/shared/early/ultima_early.h b/engines/ultima/shared/early/ultima_early.h
index d37201e447c..211a87e00cd 100644
--- a/engines/ultima/shared/early/ultima_early.h
+++ b/engines/ultima/shared/early/ultima_early.h
@@ -71,30 +71,30 @@ private:
 	/**
 	 * Initialize the engine
 	 */
-	virtual bool initialize() override;
+	bool initialize() override;
 
 	/**
 	 * Deinitialize the engine
 	 */
 
-	virtual void deinitialize() override;
+	void deinitialize() override;
 
 	/**
 	 * Returns the data archive folder and version that's required
 	 */
-	virtual bool isDataRequired(Common::String &folder, int &majorVersion, int &minorVersion) override;
+	bool isDataRequired(Common::String &folder, int &majorVersion, int &minorVersion) override;
 public:
 	GameBase *_game;
 	MouseCursor *_mouseCursor;
 	Gfx::Screen *_screen;
 public:
 	UltimaEarlyEngine(OSystem *syst, const UltimaGameDescription *gameDesc);
-	virtual ~UltimaEarlyEngine();
+	~UltimaEarlyEngine() override;
 
 	/**
 	 * Main method for running the game
 	 */
-	virtual Common::Error run() override;
+	Common::Error run() override;
 
 	/**
 	 * Play the game
@@ -104,35 +104,35 @@ public:
 	/**
 	 * Get the screen
 	 */
-	virtual Graphics::Screen *getScreen() const override;
+	Graphics::Screen *getScreen() const override;
 	/**
 	 * Indicates whether a game state can be loaded.
 	 * @param isAutosave	Flags whether it's an autosave check
 	 */
-	virtual bool canLoadGameStateCurrently(bool isAutosave) override;
+	bool canLoadGameStateCurrently(bool isAutosave) override;
 
 	/**
 	 * Indicates whether a game state can be saved.
 	 * @param isAutosave	Flags whether it's an autosave check
 	 */
-	virtual bool canSaveGameStateCurrently(bool isAutosave) override;
+	bool canSaveGameStateCurrently(bool isAutosave) override;
 
 	/**
 	 * Load a savegame
 	 */
-	virtual Common::Error loadGameStream(Common::SeekableReadStream *stream) override;
+	Common::Error loadGameStream(Common::SeekableReadStream *stream) override;
 
 	/**
 	 * Save a game state.
 	 */
-	virtual Common::Error saveGameStream(Common::WriteStream *stream, bool isAutosave = false) override;
+	Common::Error saveGameStream(Common::WriteStream *stream, bool isAutosave = false) override;
 
 	/*
 	 * Creates a new hierarchy for the game, that contains all the logic for playing that particular game.
 	 */
 	Game *createGame() const;
 
-	virtual GUI::Debugger *getDebugger() override { return nullptr; }
+	GUI::Debugger *getDebugger() const override { return nullptr; }
 };
 
 } // End of namespace Shared
diff --git a/engines/ultima/shared/engine/data_archive.cpp b/engines/ultima/shared/engine/data_archive.cpp
index bf69edb61c5..78c1a7807d2 100644
--- a/engines/ultima/shared/engine/data_archive.cpp
+++ b/engines/ultima/shared/engine/data_archive.cpp
@@ -40,16 +40,16 @@ public:
 		const Common::String &subfolder) :
 		_member(member), _publicFolder("data/"), _innerfolder(subfolder) {
 	}
-	virtual ~UltimaDataArchiveMember() {}
-	virtual Common::SeekableReadStream *createReadStream() const {
+	~UltimaDataArchiveMember() override {}
+	Common::SeekableReadStream *createReadStream() const override {
 		return _member->createReadStream();
 	}
-	virtual Common::String getName() const {
+	Common::String getName() const override {
 		Common::String name = _member->getName();
 		assert(name.hasPrefixIgnoreCase(_innerfolder));
 		return _publicFolder + Common::String(name.c_str() + _innerfolder.size());
 	}
-	virtual Common::String getDisplayName() const {
+	Common::String getDisplayName() const override {
 		return _member->getDisplayName();
 	}
 };
diff --git a/engines/ultima/shared/engine/data_archive.h b/engines/ultima/shared/engine/data_archive.h
index 475554909f5..b6bfb2da0c7 100644
--- a/engines/ultima/shared/engine/data_archive.h
+++ b/engines/ultima/shared/engine/data_archive.h
@@ -58,7 +58,7 @@ public:
     static UltimaDataArchive *load(const Common::String &subfolder,
 		int reqMajorVersion, int reqMinorVersion, Common::String &errorMsg);
 public:
-	virtual ~UltimaDataArchive() {
+	~UltimaDataArchive() override {
 		delete _zip;
 	}
 
@@ -67,7 +67,7 @@ public:
 	 * Patterns are not allowed, as this is meant to be a quick File::exists()
 	 * replacement.
 	 */
-	virtual bool hasFile(const Common::String &name) const override;
+	bool hasFile(const Common::String &name) const override;
 
 	/**
 	 * Add all members of the Archive matching the specified pattern to list.
@@ -75,7 +75,7 @@ public:
 	 *
 	 * @return the number of members added to list
 	 */
-	virtual int listMatchingMembers(Common::ArchiveMemberList &list,
+	int listMatchingMembers(Common::ArchiveMemberList &list,
 		const Common::String &pattern) const override;
 
 	/**
@@ -84,12 +84,12 @@ public:
 	 *
 	 * @return the number of names added to list
 	 */
-	virtual int listMembers(Common::ArchiveMemberList &list) const override;
+	int listMembers(Common::ArchiveMemberList &list) const override;
 
 	/**
 	 * Returns a ArchiveMember representation of the given file.
 	 */
-	virtual const Common::ArchiveMemberPtr getMember(const Common::String &name)
+	const Common::ArchiveMemberPtr getMember(const Common::String &name)
 		const override;
 
 	/**
@@ -97,7 +97,7 @@ public:
 	 * archive. If no member with this name exists, 0 is returned.
 	 * @return the newly created input stream
 	 */
-	virtual Common::SeekableReadStream *createReadStreamForMember(
+	Common::SeekableReadStream *createReadStreamForMember(
 		const Common::String &name) const override;
 };
 
diff --git a/engines/ultima/shared/engine/debugger.h b/engines/ultima/shared/engine/debugger.h
index 49c16fd5c9d..b0addff055e 100644
--- a/engines/ultima/shared/engine/debugger.h
+++ b/engines/ultima/shared/engine/debugger.h
@@ -42,7 +42,7 @@ protected:
 	int strToInt(const char *s);
 public:
 	Debugger();
-    virtual ~Debugger() {}
+    ~Debugger() override {}
 };
 
 } // End of namespace Shared
diff --git a/engines/ultima/shared/engine/events.h b/engines/ultima/shared/engine/events.h
index 567c42438a6..590ab2ac51f 100644
--- a/engines/ultima/shared/engine/events.h
+++ b/engines/ultima/shared/engine/events.h
@@ -103,18 +103,18 @@ public:
 public:
 	CPressTarget() : _pressed(false) {
 	}
-	virtual ~CPressTarget() {
+	~CPressTarget() override {
 	}
-	virtual void leftButtonDown(const Common::Point &mousePos) {
+	void leftButtonDown(const Common::Point &mousePos) override {
 		_pressed = true;
 	}
-	virtual void middleButtonDown(const Common::Point &mousePos) {
+	void middleButtonDown(const Common::Point &mousePos) override {
 		_pressed = true;
 	}
-	virtual void rightButtonDown(const Common::Point &mousePos) {
+	void rightButtonDown(const Common::Point &mousePos) override {
 		_pressed = true;
 	}
-	virtual void keyDown(Common::KeyState keyState) {
+	void keyDown(Common::KeyState keyState) override {
 		_pressed = true;
 	}
 };
diff --git a/engines/ultima/shared/engine/resources.h b/engines/ultima/shared/engine/resources.h
index 8f503cc8d84..972d12f747e 100644
--- a/engines/ultima/shared/engine/resources.h
+++ b/engines/ultima/shared/engine/resources.h
@@ -107,15 +107,15 @@ protected:
 	 */
 	bool isSaving() const { return _owner != nullptr; }
 
-	virtual void syncString(const char *&str) override;
-	virtual void syncStrings(const char **str, size_t count) override;
-	virtual void syncStrings2D(const char **str, size_t count1, size_t count2) override;
-	virtual void syncNumber(int &val) override;
-	virtual void syncNumbers(int *vals, size_t count) override;
-	virtual void syncNumbers2D(int *vals, size_t count1, size_t count2) override;
-	virtual void syncNumbers3D(int *vals, size_t count1, size_t count2, size_t count3) override;
-	virtual void syncBytes(byte *vals, size_t count) override;
-	virtual void syncBytes2D(byte *vals, size_t count1, size_t count2) override;
+	void syncString(const char *&str) override;
+	void syncStrings(const char **str, size_t count) override;
+	void syncStrings2D(const char **str, size_t count1, size_t count2) override;
+	void syncNumber(int &val) override;
+	void syncNumbers(int *vals, size_t count) override;
+	void syncNumbers2D(int *vals, size_t count1, size_t count2) override;
+	void syncNumbers3D(int *vals, size_t count1, size_t count2, size_t count3) override;
+	void syncBytes(byte *vals, size_t count) override;
+	void syncBytes2D(byte *vals, size_t count1, size_t count2) override;
 public:
 	/**
 	 * Write out the resource to the in-memory resource store
@@ -168,7 +168,7 @@ public:
 	 * Patterns are not allowed, as this is meant to be a quick File::exists()
 	 * replacement.
 	 */
-	virtual bool hasFile(const Common::String &name) const  override;
+	bool hasFile(const Common::String &name) const  override;
 
 	/**
 	 * Add all members of the Archive to list.
@@ -176,19 +176,19 @@ public:
 	 *
 	 * @return the number of names added to list
 	 */
-	virtual int listMembers(Common::ArchiveMemberList &list) const  override;
+	int listMembers(Common::ArchiveMemberList &list) const  override;
 
 	/**
 	 * Returns a ArchiveMember representation of the given file.
 	 */
-	virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const  override;
+	const Common::ArchiveMemberPtr getMember(const Common::String &name) const  override;
 
 	/**
 	 * Create a stream bound to a member with the specified name in the
 	 * archive. If no member with this name exists, 0 is returned.
 	 * @return the newly created input stream
 	 */
-	virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const  override;
+	Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const  override;
 };
 
 } // End of namespace Shared
diff --git a/engines/ultima/shared/engine/ultima.h b/engines/ultima/shared/engine/ultima.h
index f0c71d7d939..72c574b2c9a 100644
--- a/engines/ultima/shared/engine/ultima.h
+++ b/engines/ultima/shared/engine/ultima.h
@@ -71,12 +71,12 @@ public:
 	EventsManager *_events;
 public:
 	UltimaEngine(OSystem *syst, const Ultima::UltimaGameDescription *gameDesc);
-	~UltimaEngine();
+	~UltimaEngine() override;
 
 	/**
 	 * Returns supported engine features
 	 */
-	virtual bool hasFeature(EngineFeature f) const override;
+	bool hasFeature(EngineFeature f) const override;
 
 	/**
 	 * Returns game features
@@ -135,12 +135,12 @@ public:
 	/**
 	 * Checks if an auto save should be done, and if so, takes care of it
 	 */
-	virtual bool autoSaveCheck(int lastSaveTime) override;
+	bool autoSaveCheck(int lastSaveTime) override;
 
 	/**
 	 * Return the debugger
 	 */
-	virtual GUI::Debugger *getDebugger() override {
+	GUI::Debugger *getDebugger() override {
 		return _debugger;
 	}
 
@@ -158,7 +158,7 @@ public:
 	/**
 	 * Indicates whether a game state can be loaded.
 	 */
-	virtual bool canLoadGameStateCurrently() override {
+	bool canLoadGameStateCurrently() override {
 		return canLoadGameStateCurrently(false);
 	}
 
@@ -171,7 +171,7 @@ public:
 	/**
 	 * Indicates whether a game state can be saved.
 	 */
-	virtual bool canSaveGameStateCurrently() override {
+	bool canSaveGameStateCurrently() override {
 		return canSaveGameStateCurrently(false);
 	}
 };
diff --git a/engines/ultima/shared/gfx/info.h b/engines/ultima/shared/gfx/info.h
index 7be27218127..6505ace74af 100644
--- a/engines/ultima/shared/gfx/info.h
+++ b/engines/ultima/shared/gfx/info.h
@@ -67,12 +67,12 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Info();
+	~Info() override;
 
 	/**
 	 * Draw the contents
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace Shared
diff --git a/engines/ultima/shared/gfx/popup.h b/engines/ultima/shared/gfx/popup.h
index bffd680b197..951defa4726 100644
--- a/engines/ultima/shared/gfx/popup.h
+++ b/engines/ultima/shared/gfx/popup.h
@@ -54,7 +54,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Popup();
+	~Popup() override;
 
 	/**
 	 * Show the popup
diff --git a/engines/ultima/shared/gfx/screen.h b/engines/ultima/shared/gfx/screen.h
index ed8d4779236..deecf8413c7 100644
--- a/engines/ultima/shared/gfx/screen.h
+++ b/engines/ultima/shared/gfx/screen.h
@@ -71,12 +71,12 @@ public:
 	/**
 	 * Updates the screen by copying any affected areas to the system
 	 */
-	virtual void update();
+	void update() override;
 
 	/**
 	 * Updates the screen at the end of an update call
 	 */
-	virtual void updateScreen();
+	void updateScreen() override;
 
 	/**
 	 * Sets the currently active cursor
diff --git a/engines/ultima/shared/gfx/text_cursor.h b/engines/ultima/shared/gfx/text_cursor.h
index 8ba28af5a31..fe45a89e1eb 100644
--- a/engines/ultima/shared/gfx/text_cursor.h
+++ b/engines/ultima/shared/gfx/text_cursor.h
@@ -45,7 +45,7 @@ protected:
 public:
 	TextCursor() : _visible(false) {
 	}
-	virtual ~TextCursor() {
+	~TextCursor() override {
 	}
 
 	/**
@@ -66,7 +66,7 @@ public:
 	/**
 	 * Get the bounds of the cursor
 	 */
-	virtual Common::Rect getBounds() const { return _bounds; }
+	Common::Rect getBounds() const override { return _bounds; }
 
 	/**
 	 * Returns the position of the cursor
diff --git a/engines/ultima/shared/gfx/text_input.h b/engines/ultima/shared/gfx/text_input.h
index 9222b3dee60..31632be2099 100644
--- a/engines/ultima/shared/gfx/text_input.h
+++ b/engines/ultima/shared/gfx/text_input.h
@@ -47,7 +47,7 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 
 	/**
 	 * Show the text input
diff --git a/engines/ultima/shared/gfx/viewport_dungeon.h b/engines/ultima/shared/gfx/viewport_dungeon.h
index a718dd6adb0..5de01a17093 100644
--- a/engines/ultima/shared/gfx/viewport_dungeon.h
+++ b/engines/ultima/shared/gfx/viewport_dungeon.h
@@ -70,12 +70,12 @@ protected:
 public:
 	CLASSDEF;
 	ViewportDungeon(TreeItem *parent) : Gfx::VisualItem("ViewportDungeon", Rect(8, 8, 312, 152), parent) {}
-	virtual ~ViewportDungeon() {}
+	~ViewportDungeon() override {}
 
 	/**
 	 * Draws the dungeon
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace Shared
diff --git a/engines/ultima/shared/gfx/viewport_map.h b/engines/ultima/shared/gfx/viewport_map.h
index 2613cd765d3..7b35a6d3eda 100644
--- a/engines/ultima/shared/gfx/viewport_map.h
+++ b/engines/ultima/shared/gfx/viewport_map.h
@@ -44,12 +44,12 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~ViewportMap() {}
+	~ViewportMap() override {}
 
 	/**
 	 * Draws the map
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace Shared
diff --git a/engines/ultima/shared/gfx/visual_container.h b/engines/ultima/shared/gfx/visual_container.h
index 7f6df94d6b3..c55ce2c0db3 100644
--- a/engines/ultima/shared/gfx/visual_container.h
+++ b/engines/ultima/shared/gfx/visual_container.h
@@ -54,22 +54,22 @@ public:
 		VisualItem(name, parent), _mouseFocusItem(nullptr) {}
 	VisualContainer(const Common::String &name, const Rect &r, TreeItem *parent = nullptr) :
 		VisualItem(name, r, parent), _mouseFocusItem(nullptr) {}
-	virtual ~VisualContainer() {}
+	~VisualContainer() override {}
 
 	/**
 	 * Draws the container by iterating through each child and letting it draw
 	 */
-	virtual void draw() override;
+	void draw() override;
 
 	/**
 	 * Flags the item as being changed, requiring a redraw
 	 */
-	virtual void setDirty(bool dirty = true) override;
+	void setDirty(bool dirty = true) override;
 
 	/**
 	 * Returns true if the item is dirty, requiring a redraw
 	 */
-	virtual bool isDirty() const override;
+	bool isDirty() const override;
 };
 
 } // End of namespace Gfx
diff --git a/engines/ultima/shared/gfx/visual_item.h b/engines/ultima/shared/gfx/visual_item.h
index 1d9e106f254..89606518810 100644
--- a/engines/ultima/shared/gfx/visual_item.h
+++ b/engines/ultima/shared/gfx/visual_item.h
@@ -58,7 +58,7 @@ public:
 	VisualItem(const Common::String &name, const Rect &r, TreeItem *parent = nullptr) : NamedItem(name),
 		_bounds(r) { init(parent); }
 
-	virtual ~VisualItem() {
+	~VisualItem() override {
 	}
 
 	/**
diff --git a/engines/ultima/shared/maps/dungeon_creature.h b/engines/ultima/shared/maps/dungeon_creature.h
index 0e77ba10b62..af1010fc819 100644
--- a/engines/ultima/shared/maps/dungeon_creature.h
+++ b/engines/ultima/shared/maps/dungeon_creature.h
@@ -47,7 +47,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~DungeonCreature() {}
+	~DungeonCreature() override {}
 
 	/**
 	 * Returns true if a monster blocks the background behind him
diff --git a/engines/ultima/shared/maps/dungeon_widget.h b/engines/ultima/shared/maps/dungeon_widget.h
index b76f198433c..76f74f9cc7b 100644
--- a/engines/ultima/shared/maps/dungeon_widget.h
+++ b/engines/ultima/shared/maps/dungeon_widget.h
@@ -53,7 +53,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~DungeonWidget() {}
+	~DungeonWidget() override {}
 
 	/**
 	 * Draws an item
diff --git a/engines/ultima/shared/maps/map_widget.h b/engines/ultima/shared/maps/map_widget.h
index cf469fdec48..354469d2ff6 100644
--- a/engines/ultima/shared/maps/map_widget.h
+++ b/engines/ultima/shared/maps/map_widget.h
@@ -76,7 +76,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~MapWidget() {}
+	~MapWidget() override {}
 
 	/**
 	 * Return a name for a widget class if it can be synchronized to savegames
diff --git a/engines/ultima/ultima0/game.h b/engines/ultima/ultima0/game.h
index 7c2b9449fe6..48db861d15c 100644
--- a/engines/ultima/ultima0/game.h
+++ b/engines/ultima/ultima0/game.h
@@ -33,7 +33,7 @@ class Ultima0Game : public Shared::Game {
 public:
 	CLASSDEF;
 	Ultima0Game();
-	virtual ~Ultima0Game() {}
+	~Ultima0Game() override {}
 
 };
 
diff --git a/engines/ultima/ultima1/actions/action.h b/engines/ultima/ultima1/actions/action.h
index 236556b9568..cefd36c1822 100644
--- a/engines/ultima/ultima1/actions/action.h
+++ b/engines/ultima/ultima1/actions/action.h
@@ -46,7 +46,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Action() {}
+	~Action() override {}
 
 	/**
 	 * Jumps up through the parents to find the root game
diff --git a/engines/ultima/ultima1/actions/attack.h b/engines/ultima/ultima1/actions/attack.h
index ffc54c56a2f..3ae7736d40e 100644
--- a/engines/ultima/ultima1/actions/attack.h
+++ b/engines/ultima/ultima1/actions/attack.h
@@ -66,7 +66,7 @@ protected:
 	/**
 	 * Do the attack in a given direction
 	 */
-	virtual void doAttack(Shared::Maps::Direction dir) override;
+	void doAttack(Shared::Maps::Direction dir) override;
 public:
 	CLASSDEF;
 
@@ -86,7 +86,7 @@ protected:
 	/**
 	 * Do the attack in a given direction
 	 */
-	virtual void doAttack(Shared::Maps::Direction dir) override;
+	void doAttack(Shared::Maps::Direction dir) override;
 public:
 	CLASSDEF;
 
diff --git a/engines/ultima/ultima1/actions/move.h b/engines/ultima/ultima1/actions/move.h
index 135de7a9122..1969e1dfb0a 100644
--- a/engines/ultima/ultima1/actions/move.h
+++ b/engines/ultima/ultima1/actions/move.h
@@ -66,7 +66,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Move() {}
+	~Move() override {}
 };
 
 } // End of namespace Actions
diff --git a/engines/ultima/ultima1/core/debugger.h b/engines/ultima/ultima1/core/debugger.h
index b55aa15e26a..257e1170453 100644
--- a/engines/ultima/ultima1/core/debugger.h
+++ b/engines/ultima/ultima1/core/debugger.h
@@ -36,7 +36,7 @@ private:
 	bool cmdSpell(int argc, const char **argv);
 public:
 	Debugger();
-    virtual ~Debugger() {}
+    ~Debugger() override {}
 };
 
 } // End of namespace Ultima1
diff --git a/engines/ultima/ultima1/core/party.h b/engines/ultima/ultima1/core/party.h
index dfbcaf40b2b..9f6c0352be4 100644
--- a/engines/ultima/ultima1/core/party.h
+++ b/engines/ultima/ultima1/core/party.h
@@ -69,7 +69,7 @@ public:
 	/**
 	 * Change the quantity by a given amount
 	 */
-	virtual void changeQuantity(int delta) override {
+	void changeQuantity(int delta) override {
 		if (_type != WEAPON_HANDS)
 			_quantity = (uint)CLIP((int)_quantity + delta, 0, 9999);
 	}
@@ -107,7 +107,7 @@ public:
 	/**
 	 * Change the quantity by a given amount
 	 */
-	virtual void changeQuantity(int delta) override {
+	void changeQuantity(int delta) override {
 		if (_type != ARMOR_SKIN)
 			_quantity = (uint)CLIP((int)_quantity + delta, 0, 9999);
 	}
diff --git a/engines/ultima/ultima1/core/resources.h b/engines/ultima/ultima1/core/resources.h
index 820aa5a5a3a..15176060c03 100644
--- a/engines/ultima/ultima1/core/resources.h
+++ b/engines/ultima/ultima1/core/resources.h
@@ -35,7 +35,7 @@ protected:
 	/**
 	 * Synchronize resource data
 	 */
-	virtual void synchronize() override;
+	void synchronize() override;
 public:
 	const char *TITLE_MESSAGES[13];
 	const char *MAIN_MENU_TEXT[7];
diff --git a/engines/ultima/ultima1/game.h b/engines/ultima/ultima1/game.h
index 1fb1b136c80..ff8316fcb3e 100644
--- a/engines/ultima/ultima1/game.h
+++ b/engines/ultima/ultima1/game.h
@@ -52,27 +52,27 @@ public:
 public:
 	CLASSDEF;
 	Ultima1Game();
-	virtual ~Ultima1Game();
+	~Ultima1Game() override;
 
 	/**
 	 * Handles loading and saving games
 	 */
-	virtual void synchronize(Common::Serializer &s) override;
+	void synchronize(Common::Serializer &s) override;
 
 	/**
 	 * Returns true if the current video mode is VGA
 	 */
-	virtual bool isVGA() const override { return _videoMode == VIDEOMODE_VGA; }
+	bool isVGA() const override { return _videoMode == VIDEOMODE_VGA; }
 
 	/**
 	 * Called when the game starts
 	 */
-	virtual void starting(bool isLoading) override;
+	void starting(bool isLoading) override;
 
 	/**
 	 * Returns true if the game can currently be saved
 	 */
-	virtual bool canSaveGameStateCurrently() override;
+	bool canSaveGameStateCurrently() override;
 
 	/**
 	 * Give some treasure
diff --git a/engines/ultima/ultima1/maps/map.h b/engines/ultima/ultima1/maps/map.h
index e384c2550c3..f8c09d5e0f5 100644
--- a/engines/ultima/ultima1/maps/map.h
+++ b/engines/ultima/ultima1/maps/map.h
@@ -90,22 +90,22 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Ultima1Map();
+	~Ultima1Map() override;
 
 	/**
 	 * Clears all map data
 	 */
-	virtual void clear() override;
+	void clear() override;
 
 	/**
 	 * Load a given map
 	 */
-	virtual void load(Shared::Maps::MapId mapId) override;
+	void load(Shared::Maps::MapId mapId) override;
 
 	/**
 	 * Handles loading and saving the map's data
 	 */
-	virtual void synchronize(Common::Serializer &s) override;
+	void synchronize(Common::Serializer &s) override;
 
 	/**
 	 * Action pass-throughs
diff --git a/engines/ultima/ultima1/maps/map_base.h b/engines/ultima/ultima1/maps/map_base.h
index 470b6bf51ca..5461e9b6093 100644
--- a/engines/ultima/ultima1/maps/map_base.h
+++ b/engines/ultima/ultima1/maps/map_base.h
@@ -54,17 +54,17 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~MapBase() {}
+	~MapBase() override {}
 
 	/**
 	 * Gets a tile at a given position
 	 */
-	virtual void getTileAt(const Point &pt, Shared::Maps::MapTile *tile, bool includePlayer = true) override;
+	void getTileAt(const Point &pt, Shared::Maps::MapTile *tile, bool includePlayer = true) override;
 
 	/**
 	 * Instantiates a widget type by name
 	 */
-	virtual Shared::Maps::MapWidget *createWidget(const Common::String &name) override;
+	Shared::Maps::MapWidget *createWidget(const Common::String &name) override;
 
 	/**
 	 * Default implementation for actions
@@ -112,7 +112,7 @@ public:
 	/**
 	 * Cast a specific spell
 	 */
-	virtual void castSpell(uint spell) override;
+	void castSpell(uint spell) override;
 
 	/**
 	 * Handles dropping an amount of coins
diff --git a/engines/ultima/ultima1/maps/map_city_castle.h b/engines/ultima/ultima1/maps/map_city_castle.h
index 2e0c6b263af..6c0cd19c6f3 100644
--- a/engines/ultima/ultima1/maps/map_city_castle.h
+++ b/engines/ultima/ultima1/maps/map_city_castle.h
@@ -76,42 +76,42 @@ public:
 	/**
 	 * Load the map
 	 */
-	virtual void load(Shared::Maps::MapId mapId) override;
+	void load(Shared::Maps::MapId mapId) override;
 
 	/**
 	 * Gets a tile at a given position
 	 */
-	virtual void getTileAt(const Point &pt, Shared::Maps::MapTile *tile, bool includePlayer = true) override;
+	void getTileAt(const Point &pt, Shared::Maps::MapTile *tile, bool includePlayer = true) override;
 
 	/**
 	 * Clears all map data
 	 */
-	virtual void clear() override;
+	void clear() override;
 
 	/**
 	 * Get the viewport position
 	 */
-	virtual Point getViewportPosition(const Point &viewportSize) override;
+	Point getViewportPosition(const Point &viewportSize) override;
 
 	/**
 	 * Cast a spell
 	 */
-	virtual void cast() override;
+	void cast() override;
 
 	/**
 	 * Do a drop action
 	 */
-	virtual void drop() override;
+	void drop() override;
 
 	/**
 	 * Do an inform action
 	 */
-	virtual void inform() override;
+	void inform() override;
 
 	/**
 	 * Do a steal action
 	 */
-	virtual void steal() override;
+	void steal() override;
 
 	/**
 	 * Perform an attack in a direction
@@ -122,7 +122,7 @@ public:
 	 * @param agility		Agility threshold
 	 * @param widgetNa
 	 */
-	virtual void attack(int direction, int effectId, uint maxDistance, uint amount, uint agility, const Common::String &hitWidget) override;
+	void attack(int direction, int effectId, uint maxDistance, uint amount, uint agility, const Common::String &hitWidget) override;
 
 	/**
 	 * Returns true if a wench is on an adjacent tile to the player
@@ -143,32 +143,32 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~MapCity() {}
+	~MapCity() override {}
 
 	/**
 	 * Load the map
 	 */
-	virtual void load(Shared::Maps::MapId mapId) override;
+	void load(Shared::Maps::MapId mapId) override;
 
 	/**
 	 * Handles dropping an amount of coins
 	 */
-	virtual void dropCoins(uint coins) override;
+	void dropCoins(uint coins) override;
 
 	/**
 	 * Do an get action
 	 */
-	virtual void get() override;
+	void get() override;
 
 	/**
 	 * Do a talk action
 	 */
-	virtual void talk() override;
+	void talk() override;
 
 	/**
 	 * Do an unlock action
 	 */
-	virtual void unlock() override;
+	void unlock() override;
 };
 
 /**
@@ -189,32 +189,32 @@ public:
 	/**
 	 * Load the map
 	 */
-	virtual void load(Shared::Maps::MapId mapId) override;
+	void load(Shared::Maps::MapId mapId) override;
 
 	/**
 	 * Handles loading and saving the map's data
 	 */
-	virtual void synchronize(Common::Serializer &s) override;
+	void synchronize(Common::Serializer &s) override;
 
 	/**
 	 * Handles dropping an amount of coins
 	 */
-	virtual void dropCoins(uint coins) override;
+	void dropCoins(uint coins) override;
 
 	/**
 	 * Do an get action
 	 */
-	virtual void get() override;
+	void get() override;
 
 	/**
 	 * Do a talk action
 	 */
-	virtual void talk() override;
+	void talk() override;
 
 	/**
 	 * Do an unlock action
 	 */
-	virtual void unlock() override;
+	void unlock() override;
 
 
 	/**
diff --git a/engines/ultima/ultima1/maps/map_dungeon.h b/engines/ultima/ultima1/maps/map_dungeon.h
index 31243f33ca8..aae3582fda1 100644
--- a/engines/ultima/ultima1/maps/map_dungeon.h
+++ b/engines/ultima/ultima1/maps/map_dungeon.h
@@ -71,7 +71,7 @@ public:
 public:
 	MapDungeon(Ultima1Game *game, Ultima1Map *map) : MapBase(game, map), _random("UltimaDungeons"),
 		_dungeonLevel(0), _dungeonExitHitPoints(0) {}
-	virtual ~MapDungeon() {}
+	~MapDungeon() override {}
 
 	/**
 	 * Handles loading and saving viewport
@@ -81,24 +81,24 @@ public:
 	/**
 	 * Load the map
 	 */
-	virtual void load(Shared::Maps::MapId mapId) override;
+	void load(Shared::Maps::MapId mapId) override;
 
 	/**
 	 * Gets a tile at a given position
 	 */
-	virtual void getTileAt(const Point &pt, Shared::Maps::MapTile *tile, bool includePlayer = true) override;
+	void getTileAt(const Point &pt, Shared::Maps::MapTile *tile, bool includePlayer = true) override;
 
 	/**
 	 * Changes the dungeon level by a given delta amount, and generates a new map
 	 * @param delta		Delta to change dungeon level by
 	 * @returns			False if dungeon left, true if still within dungeon
 	 */
-	virtual bool changeLevel(int delta) override;
+	bool changeLevel(int delta) override;
 
 	/**
 	 * Get the current map level
 	 */
-	virtual uint getLevel() const override { return _dungeonLevel; }
+	uint getLevel() const override { return _dungeonLevel; }
 
 	/**
 	 * Updates the map at the end of a turn
@@ -125,7 +125,7 @@ public:
 	 * @param direction		Direction
 	 * @param effectId		Sound effect to play
 	 */
-	virtual void attack(int direction, int effectId) override;
+	void attack(int direction, int effectId) override;
 
 	/**
 	 * Perform an attack in a direction
@@ -136,32 +136,32 @@ public:
 	 * @param agility		Agility threshold
 	 * @param widgetNa
 	 */
-	virtual void attack(int direction, int effectId, uint maxDistance, uint amount, uint agility, const Common::String &hitWidget) override;
+	void attack(int direction, int effectId, uint maxDistance, uint amount, uint agility, const Common::String &hitWidget) override;
 
 	/**
 	 * Do an inform action
 	 */
-	virtual void inform() override;
+	void inform() override;
 
 	/**
 	 * Do a climb action
 	 */
-	virtual void climb() override;
+	void climb() override;
 
 	/**
 	 * Do an open action
 	 */
-	virtual void open() override;
+	void open() override;
 
 	/**
 	 * Do an unlock action
 	 */
-	virtual void unlock() override { open(); }
+	void unlock() override { open(); }
 
 	/**
 	 * Cast a specific spell
 	 */
-	virtual void castSpell(uint spell) override;
+	void castSpell(uint spell) override;
 };
 
 } // End of namespace Maps
diff --git a/engines/ultima/ultima1/maps/map_overworld.h b/engines/ultima/ultima1/maps/map_overworld.h
index b7b3d21c5dd..cd5e40464d8 100644
--- a/engines/ultima/ultima1/maps/map_overworld.h
+++ b/engines/ultima/ultima1/maps/map_overworld.h
@@ -41,32 +41,32 @@ private:
 	void loadWidgets();
 public:
 	MapOverworld(Ultima1Game *game, Ultima1Map *map) : MapBase(game, map) {}
-	virtual ~MapOverworld() {}
+	~MapOverworld() override {}
 
 	/**
 	 * Load the map
 	 */
-	virtual void load(Shared::Maps::MapId mapId) override;
+	void load(Shared::Maps::MapId mapId) override;
 
 	/**
 	 * Returns whether the map wraps around to the other side at it's edges (i.e. the overworld)
 	 */
-	virtual bool isMapWrapped() const override { return true; }
+	bool isMapWrapped() const override { return true; }
 
 	/**
 	 * Shifts the viewport by a given delta
 	 */
-	virtual void shiftViewport(const Point &delta) override;
+	void shiftViewport(const Point &delta) override;
 
 	/**
 	 * Get the viewport position
 	 */
-	virtual Point getViewportPosition(const Point &viewportSize) override;
+	Point getViewportPosition(const Point &viewportSize) override;
 
 	/**
 	 * Gets a point relative to the current position
 	 */
-	virtual Point getDeltaPosition(const Point &delta) override;
+	Point getDeltaPosition(const Point &delta) override;
 
 	/**
 	 * Perform an attack in a direction
@@ -77,27 +77,27 @@ public:
 	 * @param agility		Agility threshold
 	 * @param widgetNa
 	 */
-	virtual void attack(int direction, int effectId, uint maxDistance, uint amount, uint agility, const Common::String &hitWidget) override;
+	void attack(int direction, int effectId, uint maxDistance, uint amount, uint agility, const Common::String &hitWidget) override;
 
 	/**
 	 * Board a transport
 	 */
-	virtual void board() override;
+	void board() override;
 
 	/**
 	 * Do an enter action
 	 */
-	virtual void enter() override;
+	void enter() override;
 
 	/**
 	 * Do an inform action
 	 */
-	virtual void inform() override;
+	void inform() override;
 
 	/**
 	 * Do an exit transport action
 	 */
-	virtual void disembark() override;
+	void disembark() override;
 
 	/**
 	 * Get the lands number the player is currently within
diff --git a/engines/ultima/ultima1/maps/map_tile.h b/engines/ultima/ultima1/maps/map_tile.h
index 96b5a7cab8c..2974f31767a 100644
--- a/engines/ultima/ultima1/maps/map_tile.h
+++ b/engines/ultima/ultima1/maps/map_tile.h
@@ -63,7 +63,7 @@ public:
 	/**
 	 * Clears tile data
 	 */
-	virtual void clear();
+	void clear() override;
 
 	/**
 	 * Return true if the tile base is water
diff --git a/engines/ultima/ultima1/spells/blink.h b/engines/ultima/ultima1/spells/blink.h
index 7ec18b9b9aa..633a7c01a65 100644
--- a/engines/ultima/ultima1/spells/blink.h
+++ b/engines/ultima/ultima1/spells/blink.h
@@ -42,7 +42,7 @@ public:
 	/**
 	 * Cast the spell within dungeons
 	 */
-	virtual void dungeonCast(Maps::MapDungeon *map) override;
+	void dungeonCast(Maps::MapDungeon *map) override;
 };
 
 } // End of  namespace U1Dialogs
diff --git a/engines/ultima/ultima1/spells/create.h b/engines/ultima/ultima1/spells/create.h
index 6bff0b9568a..5b022b7ecbe 100644
--- a/engines/ultima/ultima1/spells/create.h
+++ b/engines/ultima/ultima1/spells/create.h
@@ -42,7 +42,7 @@ public:
 	/**
 	 * Cast the spell within dungeons
 	 */
-	virtual void dungeonCast(Maps::MapDungeon *map) override;
+	void dungeonCast(Maps::MapDungeon *map) override;
 };
 
 } // End of  namespace U1Dialogs
diff --git a/engines/ultima/ultima1/spells/destroy.h b/engines/ultima/ultima1/spells/destroy.h
index 1f9901e04c3..cac5954908f 100644
--- a/engines/ultima/ultima1/spells/destroy.h
+++ b/engines/ultima/ultima1/spells/destroy.h
@@ -42,7 +42,7 @@ public:
 	/**
 	 * Cast the spell within dungeons
 	 */
-	virtual void dungeonCast(Maps::MapDungeon *map) override;
+	void dungeonCast(Maps::MapDungeon *map) override;
 };
 
 } // End of  namespace U1Dialogs
diff --git a/engines/ultima/ultima1/spells/kill_magic_missile.h b/engines/ultima/ultima1/spells/kill_magic_missile.h
index 847a41559f1..2a39225e9b7 100644
--- a/engines/ultima/ultima1/spells/kill_magic_missile.h
+++ b/engines/ultima/ultima1/spells/kill_magic_missile.h
@@ -49,7 +49,7 @@ public:
 	/**
 	 * Cast the spell outside a dungeon
 	 */
-	virtual void cast(Maps::MapBase *map) override;
+	void cast(Maps::MapBase *map) override;
 };
 
 /**
@@ -65,7 +65,7 @@ public:
 	/**
 	 * Cast the spell within dungeons
 	 */
-	virtual void dungeonCast(Maps::MapDungeon *map) override;
+	void dungeonCast(Maps::MapDungeon *map) override;
 };
 
 /**
@@ -81,7 +81,7 @@ public:
 	/**
 	 * Cast the spell within dungeons
 	 */
-	virtual void dungeonCast(Maps::MapDungeon *map) override;
+	void dungeonCast(Maps::MapDungeon *map) override;
 };
 
 } // End of  namespace U1Dialogs
diff --git a/engines/ultima/ultima1/spells/ladder_down.h b/engines/ultima/ultima1/spells/ladder_down.h
index f54bffa9b43..8afac08c883 100644
--- a/engines/ultima/ultima1/spells/ladder_down.h
+++ b/engines/ultima/ultima1/spells/ladder_down.h
@@ -42,7 +42,7 @@ public:
 	/**
 	 * Cast the spell within dungeons
 	 */
-	virtual void dungeonCast(Maps::MapDungeon *map) override;
+	void dungeonCast(Maps::MapDungeon *map) override;
 };
 
 } // End of  namespace U1Dialogs
diff --git a/engines/ultima/ultima1/spells/ladder_up.h b/engines/ultima/ultima1/spells/ladder_up.h
index 2a20764e778..78fdde66cda 100644
--- a/engines/ultima/ultima1/spells/ladder_up.h
+++ b/engines/ultima/ultima1/spells/ladder_up.h
@@ -42,7 +42,7 @@ public:
 	/**
 	 * Cast the spell within dungeons
 	 */
-	virtual void dungeonCast(Maps::MapDungeon *map) override;
+	void dungeonCast(Maps::MapDungeon *map) override;
 };
 
 } // End of  namespace U1Dialogs
diff --git a/engines/ultima/ultima1/spells/open_unlock.h b/engines/ultima/ultima1/spells/open_unlock.h
index 71147b141de..ce716d3aa59 100644
--- a/engines/ultima/ultima1/spells/open_unlock.h
+++ b/engines/ultima/ultima1/spells/open_unlock.h
@@ -48,7 +48,7 @@ public:
 	/**
 	 * Cast the spell within dungeons
 	 */
-	virtual void dungeonCast(Maps::MapDungeon *map) override;
+	void dungeonCast(Maps::MapDungeon *map) override;
 };
 
 /**
diff --git a/engines/ultima/ultima1/spells/prayer.h b/engines/ultima/ultima1/spells/prayer.h
index 00491942933..6bafbe99f60 100644
--- a/engines/ultima/ultima1/spells/prayer.h
+++ b/engines/ultima/ultima1/spells/prayer.h
@@ -42,12 +42,12 @@ public:
 	/**
 	 * Cast the spell outside a dungeon
 	 */
-	virtual void cast(Maps::MapBase *map) override;
+	void cast(Maps::MapBase *map) override;
 
 	/**
 	 * Cast the spell within dungeons
 	 */
-	virtual void dungeonCast(Maps::MapDungeon *map) override;
+	void dungeonCast(Maps::MapDungeon *map) override;
 };
 
 } // End of  namespace U1Dialogs
diff --git a/engines/ultima/ultima1/spells/spell.h b/engines/ultima/ultima1/spells/spell.h
index 7ff77bb3a3e..33e162b8e0d 100644
--- a/engines/ultima/ultima1/spells/spell.h
+++ b/engines/ultima/ultima1/spells/spell.h
@@ -65,7 +65,7 @@ public:
 	/**
 	 * Change the quantity by a given amount
 	 */
-	virtual void changeQuantity(int delta) override {
+	void changeQuantity(int delta) override {
 		_quantity = (uint)CLIP((int)_quantity + delta, 0, 255);
 	}
 
diff --git a/engines/ultima/ultima1/spells/steal.h b/engines/ultima/ultima1/spells/steal.h
index accd37cd445..fbefdee12bd 100644
--- a/engines/ultima/ultima1/spells/steal.h
+++ b/engines/ultima/ultima1/spells/steal.h
@@ -42,7 +42,7 @@ public:
 	/**
 	 * Cast the spell within dungeons
 	 */
-	virtual void dungeonCast(Maps::MapDungeon *map) override;
+	void dungeonCast(Maps::MapDungeon *map) override;
 };
 
 } // End of  namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/armoury.h b/engines/ultima/ultima1/u1dialogs/armoury.h
index 774f50cb212..deab893bc0c 100644
--- a/engines/ultima/ultima1/u1dialogs/armoury.h
+++ b/engines/ultima/ultima1/u1dialogs/armoury.h
@@ -34,7 +34,7 @@ namespace U1Dialogs {
  */
 class Armoury : public BuySellDialog {
 	DECLARE_MESSAGE_MAP;
-	virtual bool CharacterInputMsg(CCharacterInputMsg &msg) override;
+	bool CharacterInputMsg(CCharacterInputMsg &msg) override;
 private:
 //	uint _armouryNum;
 	uint _startIndex, _endIndex;
@@ -52,7 +52,7 @@ protected:
 	/**
 	 * Set the mode
 	 */
-	virtual void setMode(BuySell mode) override;
+	void setMode(BuySell mode) override;
 public:
 	CLASSDEF;
 
@@ -64,7 +64,7 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/buy_sell_dialog.h b/engines/ultima/ultima1/u1dialogs/buy_sell_dialog.h
index 7deb9b147a4..85a975046ae 100644
--- a/engines/ultima/ultima1/u1dialogs/buy_sell_dialog.h
+++ b/engines/ultima/ultima1/u1dialogs/buy_sell_dialog.h
@@ -88,7 +88,7 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/combat.h b/engines/ultima/ultima1/u1dialogs/combat.h
index 4369ea52853..2fa12d7d89f 100644
--- a/engines/ultima/ultima1/u1dialogs/combat.h
+++ b/engines/ultima/ultima1/u1dialogs/combat.h
@@ -62,7 +62,7 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/dialog.h b/engines/ultima/ultima1/u1dialogs/dialog.h
index f22998de93e..722362db806 100644
--- a/engines/ultima/ultima1/u1dialogs/dialog.h
+++ b/engines/ultima/ultima1/u1dialogs/dialog.h
@@ -91,12 +91,12 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 
 	/**
 	 * Hide the dialog
 	 */
-	virtual void hide() override;
+	void hide() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/drop.h b/engines/ultima/ultima1/u1dialogs/drop.h
index 07a561a6108..ebc9ce0970c 100644
--- a/engines/ultima/ultima1/u1dialogs/drop.h
+++ b/engines/ultima/ultima1/u1dialogs/drop.h
@@ -82,7 +82,7 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/full_screen_dialog.h b/engines/ultima/ultima1/u1dialogs/full_screen_dialog.h
index 2858c3de360..b705e4a3cfe 100644
--- a/engines/ultima/ultima1/u1dialogs/full_screen_dialog.h
+++ b/engines/ultima/ultima1/u1dialogs/full_screen_dialog.h
@@ -48,7 +48,7 @@ public:
 	/**
 	 * Hide the popup
 	 */
-	virtual void hide();
+	void hide() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/grocery.h b/engines/ultima/ultima1/u1dialogs/grocery.h
index 398f6512f98..60a99ae047f 100644
--- a/engines/ultima/ultima1/u1dialogs/grocery.h
+++ b/engines/ultima/ultima1/u1dialogs/grocery.h
@@ -44,7 +44,7 @@ protected:
 	/**
 	 * Set the mode
 	 */
-	virtual void setMode(BuySell mode) override;
+	void setMode(BuySell mode) override;
 public:
 	CLASSDEF;
 
@@ -56,7 +56,7 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/king.h b/engines/ultima/ultima1/u1dialogs/king.h
index cc8fc569c5e..5eb1f8620f7 100644
--- a/engines/ultima/ultima1/u1dialogs/king.h
+++ b/engines/ultima/ultima1/u1dialogs/king.h
@@ -87,7 +87,7 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/magic.h b/engines/ultima/ultima1/u1dialogs/magic.h
index 67f766fdf8f..714ffacb538 100644
--- a/engines/ultima/ultima1/u1dialogs/magic.h
+++ b/engines/ultima/ultima1/u1dialogs/magic.h
@@ -36,7 +36,7 @@ using Shared::CCharacterInputMsg;
  */
 class Magic : public BuySellDialog {
 	DECLARE_MESSAGE_MAP;
-	virtual bool CharacterInputMsg(CCharacterInputMsg &msg) override;
+	bool CharacterInputMsg(CCharacterInputMsg &msg) override;
 private:
 //	uint _magicNum;
 	uint _startIndex, _endIndex;
@@ -49,7 +49,7 @@ protected:
 	/**
 	 * Set the mode
 	 */
-	virtual void setMode(BuySell mode) override;
+	void setMode(BuySell mode) override;
 public:
 	CLASSDEF;
 
@@ -61,7 +61,7 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/ready.h b/engines/ultima/ultima1/u1dialogs/ready.h
index 85b879337e9..b34daf7d2bf 100644
--- a/engines/ultima/ultima1/u1dialogs/ready.h
+++ b/engines/ultima/ultima1/u1dialogs/ready.h
@@ -84,7 +84,7 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/stats.h b/engines/ultima/ultima1/u1dialogs/stats.h
index 5c0b6c8af68..496269d3cf6 100644
--- a/engines/ultima/ultima1/u1dialogs/stats.h
+++ b/engines/ultima/ultima1/u1dialogs/stats.h
@@ -92,7 +92,7 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/tavern.h b/engines/ultima/ultima1/u1dialogs/tavern.h
index 3da96dae035..0e6eea3fc77 100644
--- a/engines/ultima/ultima1/u1dialogs/tavern.h
+++ b/engines/ultima/ultima1/u1dialogs/tavern.h
@@ -72,7 +72,7 @@ protected:
 	/**
 	 * Set the mode
 	 */
-	virtual void setMode(BuySell mode) override;
+	void setMode(BuySell mode) override;
 public:
 	CLASSDEF;
 
@@ -84,7 +84,7 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/transports.h b/engines/ultima/ultima1/u1dialogs/transports.h
index 04872abe336..c529debff21 100644
--- a/engines/ultima/ultima1/u1dialogs/transports.h
+++ b/engines/ultima/ultima1/u1dialogs/transports.h
@@ -36,7 +36,7 @@ using Shared::CCharacterInputMsg;
  */
 class Transports : public BuySellDialog {
 	DECLARE_MESSAGE_MAP;
-	virtual bool CharacterInputMsg(CCharacterInputMsg &msg) override;
+	bool CharacterInputMsg(CCharacterInputMsg &msg) override;
 private:
 	uint _water, _woods, _grass;
 	bool _hasFreeTiles, _hasShuttle, _isClosed;
@@ -71,7 +71,7 @@ protected:
 	/**
 	 * Set the mode
 	 */
-	virtual void setMode(BuySell mode) override;
+	void setMode(BuySell mode) override;
 public:
 	CLASSDEF;
 
@@ -83,7 +83,7 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1dialogs/weaponry.h b/engines/ultima/ultima1/u1dialogs/weaponry.h
index d268fe514ad..fe036773b5a 100644
--- a/engines/ultima/ultima1/u1dialogs/weaponry.h
+++ b/engines/ultima/ultima1/u1dialogs/weaponry.h
@@ -34,7 +34,7 @@ namespace U1Dialogs {
  */
 class Weaponry : public BuySellDialog {
 	DECLARE_MESSAGE_MAP;
-	virtual bool CharacterInputMsg(CCharacterInputMsg &msg) override;
+	bool CharacterInputMsg(CCharacterInputMsg &msg) override;
 private:
 //	uint _weaponryNum;
 	uint _startIndex, _endIndex;
@@ -52,7 +52,7 @@ protected:
 	/**
 	 * Set the mode
 	 */
-	virtual void setMode(BuySell mode) override;
+	void setMode(BuySell mode) override;
 public:
 	CLASSDEF;
 
@@ -64,7 +64,7 @@ public:
 	/**
 	 * Draws the visual item on the screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Dialogs
diff --git a/engines/ultima/ultima1/u1gfx/info.h b/engines/ultima/ultima1/u1gfx/info.h
index c9c7d766510..e519083981e 100644
--- a/engines/ultima/ultima1/u1gfx/info.h
+++ b/engines/ultima/ultima1/u1gfx/info.h
@@ -37,7 +37,7 @@ protected:
 	/**
 	 * Draws a prompt character
 	 */
-	virtual void drawPrompt(Shared::Gfx::VisualSurface &surf, const Point &pt) override;
+	void drawPrompt(Shared::Gfx::VisualSurface &surf, const Point &pt) override;
 public:
 	/**
 	 * Constructor
@@ -47,7 +47,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Info() {}
+	~Info() override {}
 };
 
 } // End of namespace U1Gfx
diff --git a/engines/ultima/ultima1/u1gfx/sprites.h b/engines/ultima/ultima1/u1gfx/sprites.h
index 4e9ac25a359..fc01d2bbb7a 100644
--- a/engines/ultima/ultima1/u1gfx/sprites.h
+++ b/engines/ultima/ultima1/u1gfx/sprites.h
@@ -61,12 +61,12 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Sprites() {}
+	~Sprites() override {}
 
 	/**
 	 * Return a specific sprite
 	 */
-	virtual Shared::Gfx::Sprite &operator[](uint idx) override;
+	Shared::Gfx::Sprite &operator[](uint idx) override;
 
 	/**
 	 * Loads the Ultima 1 sprites
diff --git a/engines/ultima/ultima1/u1gfx/status.h b/engines/ultima/ultima1/u1gfx/status.h
index a4186e7333c..67fbe59c2b9 100644
--- a/engines/ultima/ultima1/u1gfx/status.h
+++ b/engines/ultima/ultima1/u1gfx/status.h
@@ -43,12 +43,12 @@ private:
 public:
 	CLASSDEF;
 	Status(TreeItem *parent);
-	virtual ~Status() {}
+	~Status() override {}
 
 	/**
 	 * Draw the contents
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Gfx
diff --git a/engines/ultima/ultima1/u1gfx/text_cursor.h b/engines/ultima/ultima1/u1gfx/text_cursor.h
index acbb75b5913..b916f6681a0 100644
--- a/engines/ultima/ultima1/u1gfx/text_cursor.h
+++ b/engines/ultima/ultima1/u1gfx/text_cursor.h
@@ -48,17 +48,17 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~U1TextCursor() {}
+	~U1TextCursor() override {}
 
 	/**
 	 * Update the cursor
 	 */
-	virtual void update() override;
+	void update() override;
 
 	/**
 	 * Draw the cursor
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Gfx
diff --git a/engines/ultima/ultima1/u1gfx/view_char_gen.h b/engines/ultima/ultima1/u1gfx/view_char_gen.h
index 926f23df1c4..3a469f43899 100644
--- a/engines/ultima/ultima1/u1gfx/view_char_gen.h
+++ b/engines/ultima/ultima1/u1gfx/view_char_gen.h
@@ -146,12 +146,12 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~ViewCharacterGeneration();
+	~ViewCharacterGeneration() override;
 
 	/**
 	 * Draw the game screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Gfx
diff --git a/engines/ultima/ultima1/u1gfx/view_game.h b/engines/ultima/ultima1/u1gfx/view_game.h
index 88c971c9655..043e0183f86 100644
--- a/engines/ultima/ultima1/u1gfx/view_game.h
+++ b/engines/ultima/ultima1/u1gfx/view_game.h
@@ -77,12 +77,12 @@ private:
 public:
 	CLASSDEF;
 	ViewGame(TreeItem *parent = nullptr);
-	virtual ~ViewGame();
+	~ViewGame() override;
 
 	/**
 	 * Draw the game screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Gfx
diff --git a/engines/ultima/ultima1/u1gfx/view_title.h b/engines/ultima/ultima1/u1gfx/view_title.h
index c9f69324351..1b640f93b4b 100644
--- a/engines/ultima/ultima1/u1gfx/view_title.h
+++ b/engines/ultima/ultima1/u1gfx/view_title.h
@@ -107,7 +107,7 @@ public:
 	/**
 	 * Draw the game screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Gfx
diff --git a/engines/ultima/ultima1/u1gfx/viewport_dungeon.h b/engines/ultima/ultima1/u1gfx/viewport_dungeon.h
index 87a52056b6d..0595d8a27bd 100644
--- a/engines/ultima/ultima1/u1gfx/viewport_dungeon.h
+++ b/engines/ultima/ultima1/u1gfx/viewport_dungeon.h
@@ -39,10 +39,10 @@ protected:
 	/**
 	 * Returns the surface for rendering the dungeon
 	 */
-	virtual Shared::DungeonSurface getSurface() override;
+	Shared::DungeonSurface getSurface() override;
 public:
 	ViewportDungeon(TreeItem *parent) : Shared::ViewportDungeon(parent) {}
-	virtual ~ViewportDungeon() {}
+	~ViewportDungeon() override {}
 };
 
 } // End of namespace U1Gfx
diff --git a/engines/ultima/ultima1/u1gfx/viewport_map.h b/engines/ultima/ultima1/u1gfx/viewport_map.h
index f6fea318322..af336ad3461 100644
--- a/engines/ultima/ultima1/u1gfx/viewport_map.h
+++ b/engines/ultima/ultima1/u1gfx/viewport_map.h
@@ -48,12 +48,12 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~ViewportMap();
+	~ViewportMap() override;
 
 	/**
 	 * Draws the map
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U1Gfx
diff --git a/engines/ultima/ultima1/u6gfx/game_view.h b/engines/ultima/ultima1/u6gfx/game_view.h
index a91d73a7d0f..007649690f2 100644
--- a/engines/ultima/ultima1/u6gfx/game_view.h
+++ b/engines/ultima/ultima1/u6gfx/game_view.h
@@ -92,12 +92,12 @@ private:
 public:
 	CLASSDEF;
 	GameView(Shared::TreeItem *parent = nullptr);
-	virtual ~GameView();
+	~GameView() override;
 
 	/**
 	 * Draw the game screen
 	 */
-	virtual void draw() override;
+	void draw() override;
 };
 
 } // End of namespace U6Gfx
diff --git a/engines/ultima/ultima1/widgets/attack_effect.h b/engines/ultima/ultima1/widgets/attack_effect.h
index e911167aa9c..467762e464d 100644
--- a/engines/ultima/ultima1/widgets/attack_effect.h
+++ b/engines/ultima/ultima1/widgets/attack_effect.h
@@ -55,12 +55,12 @@ public:
 	/**
 	 * Handles loading and saving the widget's data
 	 */
-	virtual void synchronize(Common::Serializer &s) override;
+	void synchronize(Common::Serializer &s) override;
 
 	/**
 	 * Get the tile for the transport method
 	 */
-	virtual uint getTileNum() const override { return _tileId; }
+	uint getTileNum() const override { return _tileId; }
 
 	/**
 	 * Set the details for t
diff --git a/engines/ultima/ultima1/widgets/bard.h b/engines/ultima/ultima1/widgets/bard.h
index 3b4417c602e..cf7a511fedf 100644
--- a/engines/ultima/ultima1/widgets/bard.h
+++ b/engines/ultima/ultima1/widgets/bard.h
@@ -43,7 +43,7 @@ protected:
 	/**
 	 * Handles moving creatures
 	 */
-	virtual void movement() override;
+	void movement() override;
 public:
 	DECLARE_WIDGET(Bard)
 
@@ -61,14 +61,14 @@ public:
 	/**
 	 * Talk to an NPC
 	 */
-	virtual void talk() override;
+	void talk() override;
 
 	/**
 	 * Removes hit points from a creature
 	 * @param amount		Amount to remove
 	 * @returns				Returns true if kills the creature
 	 */
-	virtual bool subtractHitPoints(uint amount) override;
+	bool subtractHitPoints(uint amount) override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/dungeon_chest.h b/engines/ultima/ultima1/widgets/dungeon_chest.h
index 71d0daa87cd..c743b472ef2 100644
--- a/engines/ultima/ultima1/widgets/dungeon_chest.h
+++ b/engines/ultima/ultima1/widgets/dungeon_chest.h
@@ -50,7 +50,7 @@ public:
 	 * Try to open/unlock the item
 	 * @returns		True if item was capable of being opened or unlocked
 	 */
-	virtual bool open() override;
+	bool open() override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/dungeon_coffin.h b/engines/ultima/ultima1/widgets/dungeon_coffin.h
index 0c6bef6444b..0b9f33f0bf7 100644
--- a/engines/ultima/ultima1/widgets/dungeon_coffin.h
+++ b/engines/ultima/ultima1/widgets/dungeon_coffin.h
@@ -55,7 +55,7 @@ public:
 	 * Try to open/unlock the item
 	 * @returns		True if item was capable of being opened or unlocked
 	 */
-	virtual bool open() override;
+	bool open() override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/dungeon_monster.h b/engines/ultima/ultima1/widgets/dungeon_monster.h
index 17baf014dfb..a18312cb3d9 100644
--- a/engines/ultima/ultima1/widgets/dungeon_monster.h
+++ b/engines/ultima/ultima1/widgets/dungeon_monster.h
@@ -49,7 +49,7 @@ protected:
 	/**
 	 * Handles moving creatures
 	 */
-	virtual void movement() override;
+	void movement() override;
 public:
 	/**
 	 * Returns true if the given widget can move to a given position on the map
@@ -72,7 +72,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~DungeonMonster() {}
+	~DungeonMonster() override {}
 
 	/**
 	 * Returns the monster's type
@@ -82,34 +82,34 @@ public:
 	/**
 	 * Returns true if a monster blocks the background behind him
 	 */
-	virtual bool isBlockingView() const override;
+	bool isBlockingView() const override;
 
 	/**
 	 * Handles loading and saving games
 	 */
-	virtual void synchronize(Common::Serializer &s) override;
+	void synchronize(Common::Serializer &s) override;
 
 	/**
 	 * Draw a monster
 	 */
-	virtual void draw(Shared::DungeonSurface &s, uint distance) override;
+	void draw(Shared::DungeonSurface &s, uint distance) override;
 
 	/**
 	 * Called to update the widget at the end of a turn
 	 * @param isPreUpdate		Update is called twice in succesion during the end of turn update.
 	 *		Once with true for all widgets, then with it false
 	 */
-	virtual void update(bool isPreUpdate) override;
+	void update(bool isPreUpdate) override;
 
 	/**
 	 * Returns true if the given widget can move to a given position on the map
 	 */
-	virtual CanMove canMoveTo(const Point &destPos) override;
+	CanMove canMoveTo(const Point &destPos) override;
 
 	/**
 	 * Handles attacking the player
 	 */
-	virtual void attackParty() override;
+	void attackParty() override;
 
 	/**
 	 * Handles the player attacking the monster
diff --git a/engines/ultima/ultima1/widgets/dungeon_player.h b/engines/ultima/ultima1/widgets/dungeon_player.h
index b865c2a23b5..9af2311e49d 100644
--- a/engines/ultima/ultima1/widgets/dungeon_player.h
+++ b/engines/ultima/ultima1/widgets/dungeon_player.h
@@ -46,17 +46,17 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~DungeonPlayer() {}
+	~DungeonPlayer() override {}
 
 	/**
 	 * The player's viewpoint has no intrinsic drawing
 	 */
-	virtual void draw(Shared::DungeonSurface &s, uint distance) override {}
+	void draw(Shared::DungeonSurface &s, uint distance) override {}
 
 	/**
 	 * Returns true if the given widget can move to a given position on the map
 	 */
-	virtual CanMove canMoveTo(const Point &destPos) override;
+	CanMove canMoveTo(const Point &destPos) override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/dungeon_widget.h b/engines/ultima/ultima1/widgets/dungeon_widget.h
index 6f57c199dfd..1898c783a35 100644
--- a/engines/ultima/ultima1/widgets/dungeon_widget.h
+++ b/engines/ultima/ultima1/widgets/dungeon_widget.h
@@ -94,7 +94,7 @@ public:
 	/**
 	 * Handles drawing the item
 	 */
-	virtual void draw(Shared::DungeonSurface &s, uint distance);
+	void draw(Shared::DungeonSurface &s, uint distance) override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/guard.h b/engines/ultima/ultima1/widgets/guard.h
index ae083be5607..85051cda532 100644
--- a/engines/ultima/ultima1/widgets/guard.h
+++ b/engines/ultima/ultima1/widgets/guard.h
@@ -36,17 +36,17 @@ protected:
 	/**
 	 * Returns the attack distance for the guard
 	 */
-	virtual uint attackDistance() const override;
+	uint attackDistance() const override;
 
 	/**
 	 * Handles moving creatures
 	 */
-	virtual void movement() override;
+	void movement() override;
 
 	/**
 	 * Handles attacking the party
 	 */
-	virtual void attackParty() override;
+	void attackParty() override;
 public:
 	DECLARE_WIDGET(Guard)
 
@@ -65,7 +65,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Guard() {}
+	~Guard() override {}
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/king.h b/engines/ultima/ultima1/widgets/king.h
index b3ff8ac3d1e..3ec348a0eac 100644
--- a/engines/ultima/ultima1/widgets/king.h
+++ b/engines/ultima/ultima1/widgets/king.h
@@ -38,7 +38,7 @@ protected:
 	/**
 	 * Handles moving creatures
 	 */
-	virtual void movement() override;
+	void movement() override;
 public:
 	DECLARE_WIDGET(King)
 	CLASSDEF;
@@ -59,12 +59,12 @@ public:
 	 * @param amount		Amount to remove
 	 * @returns				Returns true if kills the creature
 	 */
-	virtual bool subtractHitPoints(uint amount) override;
+	bool subtractHitPoints(uint amount) override;
 
 	/**
 	 * Do a talk action
 	 */
-	virtual void talk() override;
+	void talk() override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/merchant_armour.h b/engines/ultima/ultima1/widgets/merchant_armour.h
index 6802682389e..a1fd3532a7e 100644
--- a/engines/ultima/ultima1/widgets/merchant_armour.h
+++ b/engines/ultima/ultima1/widgets/merchant_armour.h
@@ -64,17 +64,17 @@ public:
 	/**
 	 * Does the get action
 	 */
-	virtual void get() override;
+	void get() override;
 
 	/**
 	 * Does the steal action
 	 */
-	virtual void steal() override;
+	void steal() override;
 
 	/**
 	 * Does the talk action
 	 */
-	virtual void talk() override;
+	void talk() override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/merchant_grocer.h b/engines/ultima/ultima1/widgets/merchant_grocer.h
index 68a9b8df58f..074aaba7ae1 100644
--- a/engines/ultima/ultima1/widgets/merchant_grocer.h
+++ b/engines/ultima/ultima1/widgets/merchant_grocer.h
@@ -64,17 +64,17 @@ public:
 	/**
 	 * Does the get action
 	 */
-	virtual void get() override;
+	void get() override;
 
 	/**
 	 * Does the steal action
 	 */
-	virtual void steal() override;
+	void steal() override;
 
 	/**
 	 * Talk to an NPC
 	 */
-	virtual void talk() override;
+	void talk() override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/merchant_magic.h b/engines/ultima/ultima1/widgets/merchant_magic.h
index 903c5c87fdd..00260047717 100644
--- a/engines/ultima/ultima1/widgets/merchant_magic.h
+++ b/engines/ultima/ultima1/widgets/merchant_magic.h
@@ -58,7 +58,7 @@ public:
 	/**
 	 * Do a talk action
 	 */
-	virtual void talk() override;
+	void talk() override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/merchant_tavern.h b/engines/ultima/ultima1/widgets/merchant_tavern.h
index 7d239ee39f5..ff3909d26ea 100644
--- a/engines/ultima/ultima1/widgets/merchant_tavern.h
+++ b/engines/ultima/ultima1/widgets/merchant_tavern.h
@@ -58,7 +58,7 @@ public:
 	/**
 	 * Do the talk action
 	 */
-	virtual void talk() override;
+	void talk() override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/merchant_transport.h b/engines/ultima/ultima1/widgets/merchant_transport.h
index 887773c161c..0b6cbca882e 100644
--- a/engines/ultima/ultima1/widgets/merchant_transport.h
+++ b/engines/ultima/ultima1/widgets/merchant_transport.h
@@ -58,7 +58,7 @@ public:
 	/**
 	 * Do the talk action
 	 */
-	virtual void talk() override;
+	void talk() override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/merchant_weapons.h b/engines/ultima/ultima1/widgets/merchant_weapons.h
index a677d824ef3..e53cc442d48 100644
--- a/engines/ultima/ultima1/widgets/merchant_weapons.h
+++ b/engines/ultima/ultima1/widgets/merchant_weapons.h
@@ -64,17 +64,17 @@ public:
 	/**
 	 * Does the get action
 	 */
-	virtual void get() override;
+	void get() override;
 
 	/**
 	 * Does the steal action
 	 */
-	virtual void steal() override;
+	void steal() override;
 
 	/**
 	 * Talk to an NPC
 	 */
-	virtual void talk() override;
+	void talk() override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/overworld_monster.h b/engines/ultima/ultima1/widgets/overworld_monster.h
index 74e300c4fab..3d3a5bf1a64 100644
--- a/engines/ultima/ultima1/widgets/overworld_monster.h
+++ b/engines/ultima/ultima1/widgets/overworld_monster.h
@@ -46,12 +46,12 @@ protected:
 	/**
 	 * Handles attacking the party
 	 */
-	virtual void attackParty() override;
+	void attackParty() override;
 
 	/**
 	 * Handles moving creatures
 	 */
-	virtual void movement() override;
+	void movement() override;
 public:
 	DECLARE_WIDGET(OverworldMonster)
 
@@ -70,7 +70,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~OverworldMonster() {}
+	~OverworldMonster() override {}
 
 	/**
 	 * Returns the monster's type
@@ -80,13 +80,13 @@ public:
 	/**
 	 * Handles loading and saving games
 	 */
-	virtual void synchronize(Common::Serializer &s) override;
+	void synchronize(Common::Serializer &s) override;
 
 	/**
 	 * Returns either the maximum attack distance for a monster, or 0 if the monster is beyond
 	 * that distance from the player
 	 */
-	virtual uint attackDistance() const override;
+	uint attackDistance() const override;
 };
 
 /**
diff --git a/engines/ultima/ultima1/widgets/overworld_widget.h b/engines/ultima/ultima1/widgets/overworld_widget.h
index 815cf490d1a..eb3200dca60 100644
--- a/engines/ultima/ultima1/widgets/overworld_widget.h
+++ b/engines/ultima/ultima1/widgets/overworld_widget.h
@@ -72,17 +72,17 @@ public:
 	/**
 	 * Get the tile number for the person
 	 */
-	virtual uint getTileNum() const override { return _tileNum; }
+	uint getTileNum() const override { return _tileNum; }
 
 	/**
 	 * Handles loading and saving games
 	 */
-	virtual void synchronize(Common::Serializer &s) override;
+	void synchronize(Common::Serializer &s) override;
 
 	/**
 	 * Returns true if the given widget can move to a given position on the map
 	 */
-	virtual CanMove canMoveTo(const Point &destPos) override;
+	CanMove canMoveTo(const Point &destPos) override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/person.h b/engines/ultima/ultima1/widgets/person.h
index 20473709bbb..4b666ac8580 100644
--- a/engines/ultima/ultima1/widgets/person.h
+++ b/engines/ultima/ultima1/widgets/person.h
@@ -76,7 +76,7 @@ public:
 	/**
 	 * Handles loading and saving data
 	 */
-	virtual void synchronize(Common::Serializer &s) override;
+	void synchronize(Common::Serializer &s) override;
 
 	/**
 	 * Talk to an NPC
@@ -88,7 +88,7 @@ public:
 	 * @param amount		Amount to remove
 	 * @returns				Returns true if kills the creature
 	 */
-	virtual bool subtractHitPoints(uint amount) override;
+	bool subtractHitPoints(uint amount) override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/princess.h b/engines/ultima/ultima1/widgets/princess.h
index 06c80b71a80..aa53cf0a6ba 100644
--- a/engines/ultima/ultima1/widgets/princess.h
+++ b/engines/ultima/ultima1/widgets/princess.h
@@ -37,7 +37,7 @@ protected:
 	/**
 	 * Handles moving creatures
 	 */
-	virtual void movement() override;
+	void movement() override;
 public:
 	DECLARE_WIDGET(Princess)
 
@@ -57,7 +57,7 @@ public:
 	 * @param amount		Amount to remove
 	 * @returns				Returns true if kills the creature
 	 */
-	virtual bool subtractHitPoints(uint amount) override;
+	bool subtractHitPoints(uint amount) override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/transport.h b/engines/ultima/ultima1/widgets/transport.h
index 6a99432c2be..27f0d81e8f8 100644
--- a/engines/ultima/ultima1/widgets/transport.h
+++ b/engines/ultima/ultima1/widgets/transport.h
@@ -45,7 +45,7 @@ public:
 	/**
 	 * Get the tile for the transport method
 	 */
-	virtual uint getTileNum() const override;
+	uint getTileNum() const override;
 };
 
 /**
@@ -63,7 +63,7 @@ public:
 	/**
 	 * Returns true if the player can move onto a tile the widget occupies
 	 */
-	virtual bool isBlocking() const { return false; }
+	bool isBlocking() const override { return false; }
 
 	/**
 	 * Board a transport
@@ -103,7 +103,7 @@ public:
 	/**
 	 * Get the tile for the transport method
 	 */
-	virtual uint getTileNum() const override { return 9; }
+	uint getTileNum() const override { return 9; }
 };
 
 /**
@@ -123,7 +123,7 @@ public:
 	/**
 	 * Get the tile for the transport method
 	 */
-	virtual uint getTileNum() const override { return 10; }
+	uint getTileNum() const override { return 10; }
 };
 
 /**
@@ -143,7 +143,7 @@ public:
 	/**
 	 * Get the tile for the transport method
 	 */
-	virtual uint getTileNum() const override { return 11; }
+	uint getTileNum() const override { return 11; }
 };
 
 /**
@@ -163,12 +163,12 @@ public:
 	/**
 	 * Get the name of a transport's weapons
 	 */
-	virtual Common::String getWeaponsName() override;
+	Common::String getWeaponsName() override;
 
 	/**
 	 * Get the tile for the transport method
 	 */
-	virtual uint getTileNum() const override { return 12; }
+	uint getTileNum() const override { return 12; }
 };
 
 /**
@@ -188,12 +188,12 @@ public:
 	/**
 	 * Get the name of a transport's weapons
 	 */
-	virtual Common::String getWeaponsName() override;
+	Common::String getWeaponsName() override;
 
 	/**
 	 * Get the tile for the transport method
 	 */
-	virtual uint getTileNum() const override { return 14; }
+	uint getTileNum() const override { return 14; }
 };
 
 /**
@@ -215,12 +215,12 @@ public:
 	/**
 	 * Handles loading and saving data
 	 */
-	virtual void synchronize(Common::Serializer &s) override;
+	void synchronize(Common::Serializer &s) override;
 
 	/**
 	 * Get the tile for the transport method
 	 */
-	virtual uint getTileNum() const override { return 15; }
+	uint getTileNum() const override { return 15; }
 };
 
 /**
@@ -240,12 +240,12 @@ public:
 	/**
 	 * Get the tile for the transport method
 	 */
-	virtual uint getTileNum() const override { return 16; }
+	uint getTileNum() const override { return 16; }
 
 	/**
 	 * Board a transport
 	 */
-	virtual void board() override;
+	void board() override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/urban_player.h b/engines/ultima/ultima1/widgets/urban_player.h
index 846df9a6d73..4a3ed398a92 100644
--- a/engines/ultima/ultima1/widgets/urban_player.h
+++ b/engines/ultima/ultima1/widgets/urban_player.h
@@ -57,7 +57,7 @@ public:
 	 * @param dir			Optional explicit direction to set. If not specified,
 	 *		the direction will be set relative to the position moved from
 	 */
-	virtual void moveTo(const Point &destPos, Shared::Maps::Direction dir = Shared::Maps::DIR_NONE) override;
+	void moveTo(const Point &destPos, Shared::Maps::Direction dir = Shared::Maps::DIR_NONE) override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/urban_widget.h b/engines/ultima/ultima1/widgets/urban_widget.h
index a25c09c8ac7..a3402a4b073 100644
--- a/engines/ultima/ultima1/widgets/urban_widget.h
+++ b/engines/ultima/ultima1/widgets/urban_widget.h
@@ -56,22 +56,22 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~UrbanWidget() {}
+	~UrbanWidget() override {}
 
 	/**
 	 * Get the tile number for the person
 	 */
-	virtual uint getTileNum() const override { return _tileNum; }
+	uint getTileNum() const override { return _tileNum; }
 
 	/**
 	 * Returns true if the given widget can move to a given position on the map
 	 */
-	virtual CanMove canMoveTo(const Point &destPos) override;
+	CanMove canMoveTo(const Point &destPos) override;
 
 	/**
 	 * Handles loading and saving games
 	 */
-	virtual void synchronize(Common::Serializer &s) override;
+	void synchronize(Common::Serializer &s) override;
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima1/widgets/wench.h b/engines/ultima/ultima1/widgets/wench.h
index 825b5d9a98e..c663a73ea97 100644
--- a/engines/ultima/ultima1/widgets/wench.h
+++ b/engines/ultima/ultima1/widgets/wench.h
@@ -35,7 +35,7 @@ protected:
 	/**
 	 * Handles moving creatures
 	 */
-	virtual void movement() override;
+	void movement() override;
 public:
 	DECLARE_WIDGET(Wench)
 	CLASSDEF;
@@ -60,7 +60,7 @@ public:
 	/**
 	 * Destructor
 	 */
-	virtual ~Wench() {}
+	~Wench() override {}
 };
 
 } // End of namespace Widgets
diff --git a/engines/ultima/ultima8/audio/audio_process.h b/engines/ultima/ultima8/audio/audio_process.h
index 8784d58b4fe..b0d512dcbfa 100644
--- a/engines/ultima/ultima8/audio/audio_process.h
+++ b/engines/ultima/ultima8/audio/audio_process.h
@@ -67,7 +67,7 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	AudioProcess(void);
-	virtual ~AudioProcess(void);
+	~AudioProcess(void) override;
 
 	//! Get the current instance of the Audio Processes
 	static AudioProcess *get_instance() {
@@ -85,7 +85,7 @@ public:
 	static void ConCmd_playSFX(const Console::ArgvType &argv);
 
 
-	virtual void run() override;
+	void run() override;
 
 	void playSFX(int sfxnum, int priority, ObjId objid, int loops,
 	             bool no_duplicates, uint32 pitch_shift,
@@ -128,7 +128,7 @@ public:
 	bool loadData(IDataSource *ids, uint32 version);
 
 private:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 	uint32 paused;
 
 	//! play the next speech sample for the text in this SampleInfo
diff --git a/engines/ultima/ultima8/audio/midi_player.h b/engines/ultima/ultima8/audio/midi_player.h
index f5aef5981f4..67fd4afe134 100644
--- a/engines/ultima/ultima8/audio/midi_player.h
+++ b/engines/ultima/ultima8/audio/midi_player.h
@@ -36,7 +36,7 @@ namespace Ultima8 {
 class MidiPlayer : public Audio::MidiPlayer {
 public:
 	MidiPlayer();
-	~MidiPlayer();
+	~MidiPlayer() override;
 
 	/**
 	 * Play the specified music
diff --git a/engines/ultima/ultima8/audio/music_flex.h b/engines/ultima/ultima8/audio/music_flex.h
index 2f7fcab9ffc..6b9ec5889b9 100644
--- a/engines/ultima/ultima8/audio/music_flex.h
+++ b/engines/ultima/ultima8/audio/music_flex.h
@@ -46,7 +46,7 @@ public:
 	};
 
 	MusicFlex(IDataSource *ds);
-	~MusicFlex();
+	~MusicFlex() override;
 
 	//! Get an xmidi
 	XMidiFile *getXMidi(uint32 index) {
@@ -64,9 +64,9 @@ public:
 	//! Get the Adlib Timbres (index 259)
 	IDataSource *getAdlibTimbres();
 
-	virtual void cache(uint32 index) override;
-	virtual void uncache(uint32 index) override;
-	virtual bool isCached(uint32 index) override;
+	void cache(uint32 index) override;
+	void uncache(uint32 index) override;
+	bool isCached(uint32 index) override;
 
 	uint8 *getRawObject(uint32 index, uint32 *sizep = 0) {
 		return Archive::getRawObject(index, sizep);
diff --git a/engines/ultima/ultima8/audio/music_process.h b/engines/ultima/ultima8/audio/music_process.h
index b8660edd369..b64552c49b7 100644
--- a/engines/ultima/ultima8/audio/music_process.h
+++ b/engines/ultima/ultima8/audio/music_process.h
@@ -40,7 +40,7 @@ class MusicProcess : public Process {
 		MUSIC_PLAY_WANTED = 3
 	};
 private:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	//! Play a music track
 	//! \param track The track number to play. Pass 0 to stop music
@@ -59,7 +59,7 @@ private:
 public:
 	MusicProcess();
 	MusicProcess(MidiPlayer *player); // Note that this does NOT delete the driver
-	virtual ~MusicProcess();
+	~MusicProcess() override;
 
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
@@ -84,7 +84,7 @@ public:
 		return _wantedTrack;
 	}
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 
diff --git a/engines/ultima/ultima8/audio/raw_audio_sample.h b/engines/ultima/ultima8/audio/raw_audio_sample.h
index 24b52c47d37..5d8c8a9badd 100644
--- a/engines/ultima/ultima8/audio/raw_audio_sample.h
+++ b/engines/ultima/ultima8/audio/raw_audio_sample.h
@@ -32,11 +32,11 @@ class RawAudioSample : public AudioSample {
 public:
 	RawAudioSample(uint8 *buffer, uint32 size,
 	               uint32 rate, bool signeddata, bool stereo);
-	virtual ~RawAudioSample();
+	~RawAudioSample() override;
 
-	virtual void initDecompressor(void *DecompData) const;
-	virtual uint32 decompressFrame(void *DecompData, void *samples) const;
-	virtual void rewind(void *DecompData) const;
+	void initDecompressor(void *DecompData) const override;
+	uint32 decompressFrame(void *DecompData, void *samples) const override;
+	void rewind(void *DecompData) const override;
 
 protected:
 
diff --git a/engines/ultima/ultima8/audio/sonarc_audio_sample.h b/engines/ultima/ultima8/audio/sonarc_audio_sample.h
index f454736f259..fba50edf703 100644
--- a/engines/ultima/ultima8/audio/sonarc_audio_sample.h
+++ b/engines/ultima/ultima8/audio/sonarc_audio_sample.h
@@ -50,11 +50,11 @@ class SonarcAudioSample : public AudioSample {
 
 public:
 	SonarcAudioSample(uint8 *buffer_, uint32 size_);
-	virtual ~SonarcAudioSample(void);
+	~SonarcAudioSample(void) override;
 
-	virtual void initDecompressor(void *DecompData) const;
-	virtual uint32 decompressFrame(void *DecompData, void *samples) const;
-	virtual void rewind(void *DecompData) const;
+	void initDecompressor(void *DecompData) const override;
+	uint32 decompressFrame(void *DecompData, void *samples) const override;
+	void rewind(void *DecompData) const override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/audio/sound_flex.h b/engines/ultima/ultima8/audio/sound_flex.h
index 1d6a5cb0f29..64761777f0c 100644
--- a/engines/ultima/ultima8/audio/sound_flex.h
+++ b/engines/ultima/ultima8/audio/sound_flex.h
@@ -36,7 +36,7 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	SoundFlex(IDataSource *ds);
-	~SoundFlex();
+	~SoundFlex() override;
 
 	//! Get an audiosample
 	AudioSample *getSample(uint32 index) {
@@ -45,9 +45,9 @@ public:
 		return samples[index];
 	}
 
-	virtual void cache(uint32 index) override;
-	virtual void uncache(uint32 index) override;
-	virtual bool isCached(uint32 index) override;
+	void cache(uint32 index) override;
+	void uncache(uint32 index) override;
+	bool isCached(uint32 index) override;
 
 private:
 	AudioSample      **samples;
diff --git a/engines/ultima/ultima8/audio/speech_flex.h b/engines/ultima/ultima8/audio/speech_flex.h
index bd964d4e992..e96ec225b88 100644
--- a/engines/ultima/ultima8/audio/speech_flex.h
+++ b/engines/ultima/ultima8/audio/speech_flex.h
@@ -38,7 +38,7 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	SpeechFlex(IDataSource *ds);
-	virtual ~SpeechFlex(void);
+	~SpeechFlex(void) override;
 
 	int getIndexForPhrase(const Std::string &phrase,
 	                      uint32 start, uint32 &end) const;
diff --git a/engines/ultima/ultima8/convert/u8/convert_usecode_u8.h b/engines/ultima/ultima8/convert/u8/convert_usecode_u8.h
index 7dded1e35b9..136f047e585 100644
--- a/engines/ultima/ultima8/convert/u8/convert_usecode_u8.h
+++ b/engines/ultima/ultima8/convert/u8/convert_usecode_u8.h
@@ -65,10 +65,10 @@ namespace Ultima8 {
 
 class ConvertUsecodeU8 : public ConvertUsecode {
 public:
-	const char* const *intrinsics()  { return _intrinsics;  };
-	const char* const *event_names() { return _event_names; };
-	void readheader(IDataSource *ucfile, UsecodeHeader &uch, uint32 &curOffset_);
-	void readevents(IDataSource *ucfile, const UsecodeHeader &/*uch*/)
+	const char* const *intrinsics() override  { return _intrinsics;  };
+	const char* const *event_names() override { return _event_names; };
+	void readheader(IDataSource *ucfile, UsecodeHeader &uch, uint32 &curOffset_) override;
+	void readevents(IDataSource *ucfile, const UsecodeHeader &/*uch*/) override
 	{
 #ifndef INCLUDE_CONVERTUSECODEU8_WITHOUT_BRINGING_IN_FOLD
 		EventMap.clear();
@@ -83,9 +83,9 @@ public:
 #endif
 	}
 
-	void readOp(TempOp &op, IDataSource *ucfile, uint32 &dbg_symbol_offset, Std::vector<DebugSymbol> &debugSymbols, bool &done)
+	void readOp(TempOp &op, IDataSource *ucfile, uint32 &dbg_symbol_offset, Std::vector<DebugSymbol> &debugSymbols, bool &done) override
 	{ readOpGeneric(op, ucfile, dbg_symbol_offset, debugSymbols, done, false); };
-	Node *readOp(IDataSource *ucfile, uint32 &dbg_symbol_offset, Std::vector<DebugSymbol> &debugSymbols, bool &done)
+	Node *readOp(IDataSource *ucfile, uint32 &dbg_symbol_offset, Std::vector<DebugSymbol> &debugSymbols, bool &done) override
 	{ return readOpGeneric(ucfile, dbg_symbol_offset, debugSymbols, done, false); };
 
 	
diff --git a/engines/ultima/ultima8/filesys/dir_file.h b/engines/ultima/ultima8/filesys/dir_file.h
index bfb6e722c7c..c309b8387ec 100644
--- a/engines/ultima/ultima8/filesys/dir_file.h
+++ b/engines/ultima/ultima8/filesys/dir_file.h
@@ -36,15 +36,15 @@ public:
 
 	//! create DirFile from path
 	explicit DirFile(const Std::string &path);
-	virtual ~DirFile();
+	~DirFile() override;
 
-	virtual bool exists(const Std::string &name) override;
+	bool exists(const Std::string &name) override;
 
-	virtual uint8 *getObject(const Std::string &name, uint32 *size = 0) override;
+	uint8 *getObject(const Std::string &name, uint32 *size = 0) override;
 
-	virtual uint32 getSize(const Std::string &name) override;
+	uint32 getSize(const Std::string &name) override;
 
-	virtual uint32 getCount() override {
+	uint32 getCount() override {
 		return count;
 	}
 
diff --git a/engines/ultima/ultima8/filesys/flex_file.h b/engines/ultima/ultima8/filesys/flex_file.h
index c0558a025f3..f1e291d5675 100644
--- a/engines/ultima/ultima8/filesys/flex_file.h
+++ b/engines/ultima/ultima8/filesys/flex_file.h
@@ -38,12 +38,12 @@ public:
 	//! create FlexFile from datasource; FlexFile takes ownership of ds
 	//! and deletes it when destructed
 	explicit FlexFile(IDataSource *ds);
-	virtual ~FlexFile();
+	~FlexFile() override;
 
-	virtual bool exists(uint32 index) override {
+	bool exists(uint32 index) override {
 		return getSize(index) > 0;
 	}
-	virtual bool exists(const Std::string &name) override {
+	bool exists(const Std::string &name) override {
 		uint32 index;
 		if (nameToIndex(name, index))
 			return exists(index);
@@ -51,8 +51,8 @@ public:
 			return false;
 	}
 
-	virtual uint8 *getObject(uint32 index, uint32 *size = 0) override;
-	virtual uint8 *getObject(const Std::string &name, uint32 *size = 0) override {
+	uint8 *getObject(uint32 index, uint32 *size = 0) override;
+	uint8 *getObject(const Std::string &name, uint32 *size = 0) override {
 		uint32 index;
 		if (nameToIndex(name, index))
 			return getObject(index, size);
@@ -61,8 +61,8 @@ public:
 	}
 
 
-	virtual uint32 getSize(uint32 index) override;
-	virtual uint32 getSize(const Std::string &name) override {
+	uint32 getSize(uint32 index) override;
+	uint32 getSize(const Std::string &name) override {
 		uint32 index;
 		if (nameToIndex(name, index))
 			return getSize(index);
@@ -70,18 +70,18 @@ public:
 			return 0;
 	}
 
-	virtual uint32 getCount() override {
+	uint32 getCount() override {
 		return count;
 	}
 
-	virtual uint32 getIndexCount() override {
+	uint32 getIndexCount() override {
 		return count;
 	}
 
-	virtual bool isIndexed() const override {
+	bool isIndexed() const override {
 		return true;
 	}
-	virtual bool isNamed() const override {
+	bool isNamed() const override {
 		return false;
 	}
 
diff --git a/engines/ultima/ultima8/filesys/idata_source.h b/engines/ultima/ultima8/filesys/idata_source.h
index fe15d96b663..9a4e192901b 100644
--- a/engines/ultima/ultima8/filesys/idata_source.h
+++ b/engines/ultima/ultima8/filesys/idata_source.h
@@ -177,7 +177,7 @@ public:
 		_in = data_stream;
 	}
 
-	virtual ~IFileDataSource() {
+	~IFileDataSource() override {
 		delete _in;
 	}
 
@@ -186,22 +186,22 @@ public:
 	}
 
 	//  Read a byte value
-	virtual uint8 read1() override {
+	uint8 read1() override {
 		return static_cast<uint8>(_in->readByte());
 	}
 
 	//  Read a 2-byte value, lsb first.
-	virtual uint16 read2() override {
+	uint16 read2() override {
 		return _in->readUint16LE();
 	}
 
 	//  Read a 2-byte value, hsb first.
-	virtual uint16 read2high() override {
+	uint16 read2high() override {
 		return _in->readUint16BE();
 	}
 
 	//  Read a 3-byte value, lsb first.
-	virtual uint32 read3() override {
+	uint32 read3() override {
 		uint32 val = 0;
 		val |= static_cast<uint32>(_in->readByte());
 		val |= static_cast<uint32>(_in->readByte() << 8);
@@ -210,40 +210,40 @@ public:
 	}
 
 	//  Read a 4-byte long value, lsb first.
-	virtual uint32 read4() override {
+	uint32 read4() override {
 		return _in->readUint32LE();
 	}
 
 	//  Read a 4-byte long value, hsb first.
-	virtual uint32 read4high() override {
+	uint32 read4high() override {
 		return _in->readUint32BE();
 	}
 
-	virtual int32 read(void *b, int32 len) override {
+	int32 read(void *b, int32 len) override {
 		return _in->read(b, len);
 	}
 
-	virtual void seek(uint32 pos) override {
+	void seek(uint32 pos) override {
 		_in->seek(pos);
 	}
 
-	virtual void skip(int32 pos) override {
+	void skip(int32 pos) override {
 		_in->seek(pos, SEEK_CUR);
 	}
 
-	virtual uint32 getSize() const override {
+	uint32 getSize() const override {
 		return _in->size();
 	}
 
-	virtual uint32 getPos() const override {
+	uint32 getPos() const override {
 		return _in->pos();
 	}
 
-	virtual bool eof() const override {
+	bool eof() const override {
 		return _in->eos();
 	}
 
-	virtual Common::SeekableReadStream *GetRawStream() override {
+	Common::SeekableReadStream *GetRawStream() override {
 		return _in;
 	}
 };
@@ -315,33 +315,33 @@ public:
 		if (is_text) ConvertTextBuffer();
 	}
 
-	virtual ~IBufferDataSource() override {
+	~IBufferDataSource() override {
 		if (free_buffer && buf) delete [] const_cast<uint8 *>(buf);
 		free_buffer = false;
 		buf = buf_ptr = 0;
 	}
 
-	virtual uint8 read1() override {
+	uint8 read1() override {
 		uint8 b0;
 		b0 = *buf_ptr++;
 		return (b0);
 	}
 
-	virtual uint16 read2() override {
+	uint16 read2() override {
 		uint8 b0, b1;
 		b0 = *buf_ptr++;
 		b1 = *buf_ptr++;
 		return (b0 | (b1 << 8));
 	}
 
-	virtual uint16 read2high() override {
+	uint16 read2high() override {
 		uint8 b0, b1;
 		b1 = *buf_ptr++;
 		b0 = *buf_ptr++;
 		return (b0 | (b1 << 8));
 	}
 
-	virtual uint32 read3() override {
+	uint32 read3() override {
 		uint8 b0, b1, b2;
 		b0 = *buf_ptr++;
 		b1 = *buf_ptr++;
@@ -349,7 +349,7 @@ public:
 		return (b0 | (b1 << 8) | (b2 << 16));
 	}
 
-	virtual uint32 read4() override {
+	uint32 read4() override {
 		uint8 b0, b1, b2, b3;
 		b0 = *buf_ptr++;
 		b1 = *buf_ptr++;
@@ -358,7 +358,7 @@ public:
 		return (b0 | (b1 << 8) | (b2 << 16) | (b3 << 24));
 	}
 
-	virtual uint32 read4high() override {
+	uint32 read4high() override {
 		uint8 b0, b1, b2, b3;
 		b3 = *buf_ptr++;
 		b2 = *buf_ptr++;
@@ -367,7 +367,7 @@ public:
 		return (b0 | (b1 << 8) | (b2 << 16) | (b3 << 24));
 	}
 
-	virtual int32 read(void *str, int32 num_bytes) override {
+	int32 read(void *str, int32 num_bytes) override {
 		if (buf_ptr >= buf + size) return 0;
 		int32 count = num_bytes;
 		if (buf_ptr + num_bytes > buf + size)
@@ -377,23 +377,23 @@ public:
 		return count;
 	}
 
-	virtual void seek(uint32 pos) override {
+	void seek(uint32 pos) override {
 		buf_ptr = buf + pos;
 	}
 
-	virtual void skip(int32 delta) override {
+	void skip(int32 delta) override {
 		buf_ptr += delta;
 	}
 
-	virtual uint32 getSize() const override {
+	uint32 getSize() const override {
 		return size;
 	}
 
-	virtual uint32 getPos() const override {
+	uint32 getPos() const override {
 		return static_cast<uint32>(buf_ptr - buf);
 	}
 
-	virtual bool eof() const override {
+	bool eof() const override {
 		return (static_cast<uint32>(buf_ptr - buf)) >= size;
 	}
 };
diff --git a/engines/ultima/ultima8/filesys/named_archive_file.h b/engines/ultima/ultima8/filesys/named_archive_file.h
index 1fcfda7f408..49605832a8c 100644
--- a/engines/ultima/ultima8/filesys/named_archive_file.h
+++ b/engines/ultima/ultima8/filesys/named_archive_file.h
@@ -34,38 +34,38 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	NamedArchiveFile() : indexCount(0) { }
-	virtual ~NamedArchiveFile() { }
+	~NamedArchiveFile() override { }
 
-	virtual bool exists(uint32 index) override {
+	bool exists(uint32 index) override {
 		Std::string name;
 		return (indexToName(index, name));
 	}
-	virtual bool exists(const Std::string &name) override = 0;
+	bool exists(const Std::string &name) override = 0;
 
-	virtual uint8 *getObject(uint32 index, uint32 *size = 0) override {
+	uint8 *getObject(uint32 index, uint32 *size = 0) override {
 		Std::string name;
 		if (!indexToName(index, name)) return 0;
 		return getObject(name, size);
 	}
-	virtual uint8 *getObject(const Std::string &name, uint32 *size = 0) override = 0;
+	uint8 *getObject(const Std::string &name, uint32 *size = 0) override = 0;
 
-	virtual uint32 getSize(uint32 index) override {
+	uint32 getSize(uint32 index) override {
 		Std::string name;
 		if (!indexToName(index, name)) return 0;
 		return getSize(name);
 	}
-	virtual uint32 getSize(const Std::string &name) override = 0;
+	uint32 getSize(const Std::string &name) override = 0;
 
-	virtual uint32 getCount() override = 0;
+	uint32 getCount() override = 0;
 
-	virtual uint32 getIndexCount() override {
+	uint32 getIndexCount() override {
 		return indexCount;
 	}
 
-	virtual bool isIndexed() const override {
+	bool isIndexed() const override {
 		return false;
 	}
-	virtual bool isNamed() const override {
+	bool isNamed() const override {
 		return true;
 	}
 
diff --git a/engines/ultima/ultima8/filesys/odata_source.h b/engines/ultima/ultima8/filesys/odata_source.h
index ff1c86b57a8..542520fc840 100644
--- a/engines/ultima/ultima8/filesys/odata_source.h
+++ b/engines/ultima/ultima8/filesys/odata_source.h
@@ -84,7 +84,7 @@ public:
 		_out = data_stream;
 	}
 
-	virtual ~OFileDataSource() {
+	~OFileDataSource() override {
 		FORGET_OBJECT(_out);
 	}
 
@@ -92,61 +92,61 @@ public:
 		return !_out->err();
 	}
 
-	virtual void write1(uint32 val) override {
+	void write1(uint32 val) override {
 		_out->writeByte(val & 0xff);
 	}
 
-	virtual void write2(uint16 val) override {
+	void write2(uint16 val) override {
 		_out->writeUint16LE(val);
 	}
 
-	virtual void write2high(uint16 val) override {
+	void write2high(uint16 val) override {
 		_out->writeUint16BE(val);
 	}
 
-	virtual void write3(uint32 val) override {
+	void write3(uint32 val) override {
 		_out->writeByte(static_cast<byte>(val & 0xff));
 		_out->writeByte(static_cast<byte>((val >> 8) & 0xff));
 		_out->writeByte(static_cast<byte>((val >> 16) & 0xff));
 	}
 
-	virtual void write4(uint32 val) override {
+	void write4(uint32 val) override {
 		_out->writeUint32LE(val);
 	}
 
-	virtual void write4high(uint32 val) override {
+	void write4high(uint32 val) override {
 		_out->writeUint32BE(val);
 	}
 
-	virtual void write(const void *b, uint32 len) override {
+	void write(const void *b, uint32 len) override {
 		_out->write(static_cast<const char *>(b), len);
 	}
 
-	virtual void seek(uint32 pos) override {
+	void seek(uint32 pos) override {
 		Common::SeekableWriteStream *ws = dynamic_cast<Common::SeekableWriteStream *>(_out);
 		assert(ws);
 		ws->seek(pos);
 	}
 
-	virtual void skip(int32 amount) override {
+	void skip(int32 amount) override {
 		Common::SeekableWriteStream *ws = dynamic_cast<Common::SeekableWriteStream *>(_out);
 		assert(ws);
 		ws->seek(amount, SEEK_CUR);
 	}
 
-	virtual uint32 getSize() const override {
+	uint32 getSize() const override {
 		Common::SeekableWriteStream *ws = dynamic_cast<Common::SeekableWriteStream *>(_out);
 		assert(ws);
 		return ws->size();
 	}
 
-	virtual uint32 getPos() const override {
+	uint32 getPos() const override {
 		Common::SeekableWriteStream *ws = dynamic_cast<Common::SeekableWriteStream *>(_out);
 		assert(ws);
 		return _out->pos();
 	}
 
-	virtual Common::WriteStream *GetRawStream() override {
+	Common::WriteStream *GetRawStream() override {
 		return _out;
 	}
 };
@@ -169,60 +169,60 @@ public:
 		size = len;
 	};
 
-	virtual ~OBufferDataSource() {};
+	~OBufferDataSource() override {};
 
-	virtual void write1(uint32 val) override {
+	void write1(uint32 val) override {
 		*buf_ptr++ = val & 0xff;
 	};
 
-	virtual void write2(uint16 val) override {
+	void write2(uint16 val) override {
 		*buf_ptr++ = val & 0xff;
 		*buf_ptr++ = (val >> 8) & 0xff;
 	};
 
-	virtual void write2high(uint16 val) override {
+	void write2high(uint16 val) override {
 		*buf_ptr++ = (val >> 8) & 0xff;
 		*buf_ptr++ = val & 0xff;
 	};
 
-	virtual void write3(uint32 val) override {
+	void write3(uint32 val) override {
 		*buf_ptr++ = val & 0xff;
 		*buf_ptr++ = (val >> 8) & 0xff;
 		*buf_ptr++ = (val >> 16) & 0xff;
 	};
 
-	virtual void write4(uint32 val) override {
+	void write4(uint32 val) override {
 		*buf_ptr++ = val & 0xff;
 		*buf_ptr++ = (val >> 8) & 0xff;
 		*buf_ptr++ = (val >> 16) & 0xff;
 		*buf_ptr++ = (val >> 24) & 0xff;
 	};
 
-	virtual void write4high(uint32 val) override {
+	void write4high(uint32 val) override {
 		*buf_ptr++ = (val >> 24) & 0xff;
 		*buf_ptr++ = (val >> 16) & 0xff;
 		*buf_ptr++ = (val >> 8) & 0xff;
 		*buf_ptr++ = val & 0xff;
 	};
 
-	virtual void write(const void *b, uint32 len) override {
+	void write(const void *b, uint32 len) override {
 		Common::copy((const byte *)b, (const byte *)b + len, buf_ptr);
 		buf_ptr += len;
 	};
 
-	virtual void seek(uint32 pos) override {
+	void seek(uint32 pos) override {
 		buf_ptr = const_cast<unsigned char *>(buf) + pos;
 	};
 
-	virtual void skip(int32 pos) override {
+	void skip(int32 pos) override {
 		buf_ptr += pos;
 	};
 
-	virtual uint32 getSize() const override {
+	uint32 getSize() const override {
 		return size;
 	};
 
-	virtual uint32 getPos() const override {
+	uint32 getPos() const override {
 		return static_cast<uint32>(buf_ptr - buf);
 	};
 };
@@ -234,47 +234,47 @@ private:
 public:
 	ODequeDataSource() {}
 
-	virtual ~ODequeDataSource() {}
+	~ODequeDataSource() override {}
 
 	const Std::deque<byte> &buf() const {
 		return _out;
 	}
 
-	virtual void write1(uint32 val) override {
+	void write1(uint32 val) override {
 		_out.push_back(static_cast<byte>(val & 0xff));
 	}
 
-	virtual void write2(uint16 val) override {
+	void write2(uint16 val) override {
 		_out.push_back(static_cast<byte>(val & 0xff));
 		_out.push_back(static_cast<byte>((val >> 8) & 0xff));
 	}
 
-	virtual void write2high(uint16 val) override {
+	void write2high(uint16 val) override {
 		_out.push_back(static_cast<byte>((val >> 8) & 0xff));
 		_out.push_back(static_cast<byte>(val & 0xff));
 	}
 
-	virtual void write3(uint32 val) override {
+	void write3(uint32 val) override {
 		_out.push_back(static_cast<byte>(val & 0xff));
 		_out.push_back(static_cast<byte>((val >> 8) & 0xff));
 		_out.push_back(static_cast<byte>((val >> 16) & 0xff));
 	}
 
-	virtual void write4(uint32 val) override {
+	void write4(uint32 val) override {
 		_out.push_back(static_cast<byte>(val & 0xff));
 		_out.push_back(static_cast<byte>((val >> 8) & 0xff));
 		_out.push_back(static_cast<byte>((val >> 16) & 0xff));
 		_out.push_back(static_cast<byte>((val >> 24) & 0xff));
 	}
 
-	virtual void write4high(uint32 val) override {
+	void write4high(uint32 val) override {
 		_out.push_back(static_cast<byte>((val >> 24) & 0xff));
 		_out.push_back(static_cast<byte>((val >> 16) & 0xff));
 		_out.push_back(static_cast<byte>((val >> 8) & 0xff));
 		_out.push_back(static_cast<byte>(val & 0xff));
 	}
 
-	virtual void write(const void *b, uint32 length) override {
+	void write(const void *b, uint32 length) override {
 		write(b, length, length);
 	}
 
@@ -290,18 +290,18 @@ public:
 		_out.clear();
 	}
 
-	virtual void seek(uint32 /*pos*/) override {
+	void seek(uint32 /*pos*/) override {
 		/*_out->seekp(pos); FIXME: Do something here. */
 	}
-	virtual void skip(int32 /*pos*/) override {
+	void skip(int32 /*pos*/) override {
 		/*_out->seekp(pos, Std::ios::cur); FIXME: Do something here. */
 	}
 
-	virtual uint32 getSize() const override {
+	uint32 getSize() const override {
 		return static_cast<uint32>(_out.size());
 	}
 
-	virtual uint32 getPos() const override {
+	uint32 getPos() const override {
 		return static_cast<uint32>(_out.size()); /*return _out->tellp(); FIXME: Do something here. */
 	}
 };
@@ -357,35 +357,35 @@ public:
 		return buf;
 	}
 
-	virtual ~OAutoBufferDataSource() override {
+	~OAutoBufferDataSource() override {
 		delete [] buf_ptr;
 	}
 
-	virtual void write1(uint32 val) override {
+	void write1(uint32 val) override {
 		checkResize(1);
 		*buf_ptr++ = val & 0xff;
 	};
 
-	virtual void write2(uint16 val) override {
+	void write2(uint16 val) override {
 		checkResize(2);
 		*buf_ptr++ = val & 0xff;
 		*buf_ptr++ = (val >> 8) & 0xff;
 	};
 
-	virtual void write2high(uint16 val) override {
+	void write2high(uint16 val) override {
 		checkResize(2);
 		*buf_ptr++ = (val >> 8) & 0xff;
 		*buf_ptr++ = val & 0xff;
 	};
 
-	virtual void write3(uint32 val) override {
+	void write3(uint32 val) override {
 		checkResize(3);
 		*buf_ptr++ = val & 0xff;
 		*buf_ptr++ = (val >> 8) & 0xff;
 		*buf_ptr++ = (val >> 16) & 0xff;
 	};
 
-	virtual void write4(uint32 val) override {
+	void write4(uint32 val) override {
 		checkResize(4);
 		*buf_ptr++ = val & 0xff;
 		*buf_ptr++ = (val >> 8) & 0xff;
@@ -393,7 +393,7 @@ public:
 		*buf_ptr++ = (val >> 24) & 0xff;
 	};
 
-	virtual void write4high(uint32 val) override {
+	void write4high(uint32 val) override {
 		checkResize(4);
 		*buf_ptr++ = (val >> 24) & 0xff;
 		*buf_ptr++ = (val >> 16) & 0xff;
@@ -401,13 +401,13 @@ public:
 		*buf_ptr++ = val & 0xff;
 	};
 
-	virtual void write(const void *b, uint32 len) override {
+	void write(const void *b, uint32 len) override {
 		checkResize(len);
 		Common::copy((const byte *)b, (const byte *)b + len, buf_ptr);
 		buf_ptr += len;
 	};
 
-	virtual void seek(uint32 pos) override {
+	void seek(uint32 pos) override {
 		// No seeking past the end of the buffer
 		if (pos <= size) loc = pos;
 		else loc = size;
@@ -415,7 +415,7 @@ public:
 		buf_ptr = const_cast<unsigned char *>(buf) + loc;
 	};
 
-	virtual void skip(int32 pos) override {
+	void skip(int32 pos) override {
 		// No seeking past the end
 		if (pos >= 0) {
 			loc += pos;
@@ -430,11 +430,11 @@ public:
 		buf_ptr = const_cast<unsigned char *>(buf) + loc;
 	};
 
-	virtual uint32 getSize() const override {
+	uint32 getSize() const override {
 		return size;
 	};
 
-	virtual uint32 getPos() const override {
+	uint32 getPos() const override {
 		return static_cast<uint32>(buf_ptr - buf);
 	};
 
diff --git a/engines/ultima/ultima8/filesys/raw_archive.h b/engines/ultima/ultima8/filesys/raw_archive.h
index e63f2d4c355..6b60193d4f8 100644
--- a/engines/ultima/ultima8/filesys/raw_archive.h
+++ b/engines/ultima/ultima8/filesys/raw_archive.h
@@ -41,11 +41,11 @@ public:
 	explicit RawArchive(IDataSource *ids) : Archive(ids) { }
 	explicit RawArchive(const Std::string &path) : Archive(path) { }
 
-	virtual ~RawArchive();
+	~RawArchive() override;
 
-	virtual void cache(uint32 index) override;
-	virtual void uncache(uint32 index) override;
-	virtual bool isCached(uint32 index) override;
+	void cache(uint32 index) override;
+	void uncache(uint32 index) override;
+	bool isCached(uint32 index) override;
 
 	//! return object. DON'T delete or modify!
 	virtual const uint8 *get_object_nodel(uint32 index);
diff --git a/engines/ultima/ultima8/filesys/u8_save_file.h b/engines/ultima/ultima8/filesys/u8_save_file.h
index 217a532ee5b..37e931f0e10 100644
--- a/engines/ultima/ultima8/filesys/u8_save_file.h
+++ b/engines/ultima/ultima8/filesys/u8_save_file.h
@@ -39,15 +39,15 @@ public:
 	//! create U8SaveFile from datasource; U8SaveFile takes ownership of ds
 	//! and deletes it when destructed
 	explicit U8SaveFile(IDataSource *ds);
-	virtual ~U8SaveFile();
+	~U8SaveFile() override;
 
-	virtual bool exists(const Std::string &name) override;
+	bool exists(const Std::string &name) override;
 
-	virtual uint8 *getObject(const Std::string &name, uint32 *size = 0) override;
+	uint8 *getObject(const Std::string &name, uint32 *size = 0) override;
 
-	virtual uint32 getSize(const Std::string &name) override;
+	uint32 getSize(const Std::string &name) override;
 
-	virtual uint32 getCount() override {
+	uint32 getCount() override {
 		return count;
 	}
 
diff --git a/engines/ultima/ultima8/games/remorse_game.h b/engines/ultima/ultima8/games/remorse_game.h
index 5009903e306..2d491b66d7e 100644
--- a/engines/ultima/ultima8/games/remorse_game.h
+++ b/engines/ultima/ultima8/games/remorse_game.h
@@ -27,24 +27,24 @@ namespace Ultima8 {
 class RemorseGame : public Game {
 public:
 	RemorseGame();
-	virtual ~RemorseGame();
+	~RemorseGame() override;
 
 	//! load/init game's data files
-	virtual bool loadFiles();
+	bool loadFiles() override;
 
 	//! initialize new game
-	virtual bool startGame();
+	bool startGame() override;
 
 	//! start initial usecode
-	virtual bool startInitialUsecode(const Std::string &savegame);
+	bool startInitialUsecode(const Std::string &savegame) override;
 
 	//! write game-specific savegame info (avatar stats, equipment, ...)
-	virtual void writeSaveInfo(ODataSource *ods);
+	void writeSaveInfo(ODataSource *ods) override;
 
-	virtual ProcId playIntroMovie();
-	virtual ProcId playEndgameMovie();
-	virtual void playCredits();
-	virtual void playQuotes() { };
+	ProcId playIntroMovie() override;
+	ProcId playEndgameMovie() override;
+	void playCredits() override;
+	void playQuotes() override { };
 
 	static Game *createGame(GameInfo *info);
 
diff --git a/engines/ultima/ultima8/games/start_u8_process.h b/engines/ultima/ultima8/games/start_u8_process.h
index 3ed628f3f17..335a7b636d4 100644
--- a/engines/ultima/ultima8/games/start_u8_process.h
+++ b/engines/ultima/ultima8/games/start_u8_process.h
@@ -33,14 +33,14 @@ protected:
 	bool _skipStart;
 	Std::string _saveName;
 
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 public:
 	StartU8Process(const Std::string &saveName);
 
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 };
diff --git a/engines/ultima/ultima8/games/u8_game.h b/engines/ultima/ultima8/games/u8_game.h
index 7eddbe6af86..d8886e79d56 100644
--- a/engines/ultima/ultima8/games/u8_game.h
+++ b/engines/ultima/ultima8/games/u8_game.h
@@ -29,24 +29,24 @@ class IDataSource;
 class U8Game: public Game {
 public:
 	U8Game();
-	virtual ~U8Game();
+	~U8Game() override;
 
 	//! load/init game's data files
-	virtual bool loadFiles();
+	bool loadFiles() override;
 
 	//! initialize new game
-	virtual bool startGame();
+	bool startGame() override;
 
 	//! start initial usecode
-	virtual bool startInitialUsecode(const Std::string &savegame);
+	bool startInitialUsecode(const Std::string &savegame) override;
 
 	//! write game-specific savegame info (avatar stats, equipment, ...)
-	virtual void writeSaveInfo(ODataSource *ods);
+	void writeSaveInfo(ODataSource *ods) override;
 
-	virtual ProcId playIntroMovie();
-	virtual ProcId playEndgameMovie();
-	virtual void playCredits();
-	virtual void playQuotes();
+	ProcId playIntroMovie() override;
+	ProcId playEndgameMovie() override;
+	void playCredits() override;
+	void playQuotes() override;
 
 	static void ConCmd_cheatItems(const Console::ArgvType &argv);
 	static void ConCmd_cheatEquip(const Console::ArgvType &argv);
diff --git a/engines/ultima/ultima8/graphics/base_soft_render_surface.h b/engines/ultima/ultima8/graphics/base_soft_render_surface.h
index 402978fd578..2070449f11c 100644
--- a/engines/ultima/ultima8/graphics/base_soft_render_surface.h
+++ b/engines/ultima/ultima8/graphics/base_soft_render_surface.h
@@ -101,7 +101,7 @@ protected:
 public:
 
 	// Virtual Destructor
-	virtual ~BaseSoftRenderSurface();
+	~BaseSoftRenderSurface() override;
 
 	//
 	// Being/End Painting
@@ -110,14 +110,14 @@ public:
 	// Begin painting to the buffer. MUST BE CALLED BEFORE DOING ANYTHING TO THE SURFACE!
 	// Can be called multiple times
 	// Returns Error Code on error. Check return code.....
-	virtual ECode BeginPainting() override;
+	ECode BeginPainting() override;
 
 	// Finish paining to the buffer. MUST BE CALLED FOR EACH CALL TO BeginPainting()
 	// Returns Error Code on error. Check return code.....
-	virtual ECode EndPainting() override;
+	ECode EndPainting() override;
 
 	// Get the surface as a Texture. Only valid for SecondaryRenderSurfaces
-	virtual Texture *GetSurfaceAsTexture() override;
+	Texture *GetSurfaceAsTexture() override;
 
 
 	//
@@ -125,28 +125,28 @@ public:
 	//
 
 	// Set the Origin of the Surface
-	virtual void SetOrigin(int32 x, int32 y) override;
+	void SetOrigin(int32 x, int32 y) override;
 
 	// Set the Origin of the Surface
-	virtual void GetOrigin(int32 &x, int32 &y) const override;
+	void GetOrigin(int32 &x, int32 &y) const override;
 
 	// Get the Surface Dimensions
-	virtual void GetSurfaceDims(Rect &) const override;
+	void GetSurfaceDims(Rect &) const override;
 
 	// Get Clipping Rectangle
-	virtual void GetClippingRect(Rect &) const override;
+	void GetClippingRect(Rect &) const override;
 
 	// Set Clipping Rectangle
-	virtual void SetClippingRect(const Rect &) override;
+	void SetClippingRect(const Rect &) override;
 
 	// Check Clipped. -1 if off screen, 0 if not clipped, 1 if clipped
-	virtual int16 CheckClipped(const Rect &) const override;
+	int16 CheckClipped(const Rect &) const override;
 
 	// Flip the surface
-	virtual void SetFlipped(bool flipped) override;
+	void SetFlipped(bool flipped) override;
 
 	// Has the render surface been flipped?
-	virtual bool IsFlipped() const override;
+	bool IsFlipped() const override;
 
 	//
 	// Surface Palettes
@@ -164,7 +164,7 @@ public:
 	// Get The Surface Palette
 	// TODO: virtual void GetPalette(uint8 palette[768]);
 
-	virtual void CreateNativePalette(Palette *palette) override;
+	void CreateNativePalette(Palette *palette) override;
 
 	Graphics::ManagedSurface *getRawSurface() const override {
 		return sdl_surf;
diff --git a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h b/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
index 328a10c0a0a..e5ebf17caad 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
+++ b/engines/ultima/ultima8/graphics/fonts/font_shape_archive.h
@@ -49,14 +49,14 @@ public:
 	                 const ConvertShapeFormat *format_ = 0)
 		: ShapeArchive(path, id_, pal_, format_) { }
 
-	virtual ~FontShapeArchive() { }
+	~FontShapeArchive() override { }
 
 	//! load HVLeads from u8.ini
 	void setHVLeads();
 
 	ShapeFont *getFont(uint32 fontnum);
 
-	virtual void cache(uint32 fontnum) override;
+	void cache(uint32 fontnum) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_font.h b/engines/ultima/ultima8/graphics/fonts/jp_font.h
index 47095ce0373..88eab41a8e9 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_font.h
+++ b/engines/ultima/ultima8/graphics/fonts/jp_font.h
@@ -34,21 +34,21 @@ class ShapeFont;
 class JPFont : public Font {
 public:
 	JPFont(ShapeFont *jpfont, unsigned int fontnum);
-	virtual ~JPFont();
+	~JPFont() override;
 
 	int getWidth(int c);
 
-	virtual int getHeight() override;
-	virtual int getBaseline() override;
-	virtual int getBaselineSkip() override;
+	int getHeight() override;
+	int getBaseline() override;
+	int getBaselineSkip() override;
 
-	virtual void getStringSize(const Std::string &text,
+	void getStringSize(const Std::string &text,
 		int32 &width, int32 &height) override;
-	virtual void getTextSize(const Std::string &text, int32 &resultwidth,
+	void getTextSize(const Std::string &text, int32 &resultwidth,
 		int32 &resultheight, unsigned int &remaining, int32 width = 0,
 		int32 height = 0, TextAlign align = TEXT_LEFT, bool u8specials = false) override;
 
-	virtual RenderedText *renderText(const Std::string &text,
+	RenderedText *renderText(const Std::string &text,
 		unsigned int &remaining, int32 width = 0, int32 height = 0,
 		TextAlign align = TEXT_LEFT, bool u8specials = false,
 		Std::string::size_type cursor = Std::string::npos) override;
diff --git a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h b/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
index 718d8eb51c8..bc156be9887 100644
--- a/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
+++ b/engines/ultima/ultima8/graphics/fonts/jp_rendered_text.h
@@ -37,10 +37,10 @@ public:
 	JPRenderedText(Std::list<PositionedText> &lines,
 	               int width, int height, int vlead, ShapeFont *font,
 	               unsigned int fontnum);
-	virtual ~JPRenderedText();
+	~JPRenderedText() override;
 
-	virtual void draw(RenderSurface *surface, int x, int y, bool destmasked = false) override;
-	virtual void drawBlended(RenderSurface *surface, int x, int y, uint32 col, bool destmasked = false) override;
+	void draw(RenderSurface *surface, int x, int y, bool destmasked = false) override;
+	void drawBlended(RenderSurface *surface, int x, int y, uint32 col, bool destmasked = false) override;
 
 	ENABLE_RUNTIME_CLASSTYPE()
 
diff --git a/engines/ultima/ultima8/graphics/fonts/shape_font.h b/engines/ultima/ultima8/graphics/fonts/shape_font.h
index f0449ff2198..dc7d7249fd9 100644
--- a/engines/ultima/ultima8/graphics/fonts/shape_font.h
+++ b/engines/ultima/ultima8/graphics/fonts/shape_font.h
@@ -39,11 +39,11 @@ class ShapeFont : public Font, public Shape {
 public:
 	ShapeFont(const uint8 *data, uint32 size, const ConvertShapeFormat *format,
 	          const uint16 flexId, const uint32 shapenum);
-	virtual ~ShapeFont();
+	~ShapeFont() override;
 
-	virtual int getHeight() override;
-	virtual int getBaseline() override;
-	virtual int getBaselineSkip() override;
+	int getHeight() override;
+	int getBaseline() override;
+	int getBaselineSkip() override;
 
 	int getWidth(char c);
 	int getVlead() const {
@@ -60,10 +60,10 @@ public:
 		hlead = hl;
 	}
 
-	virtual void getStringSize(const Std::string &text,
+	void getStringSize(const Std::string &text,
 		int32 &width, int32 &height) override;
 
-	virtual RenderedText *renderText(const Std::string &text,
+	RenderedText *renderText(const Std::string &text,
 		unsigned int &remaining, int32 width = 0, int32 height = 0,
 		TextAlign align = TEXT_LEFT, bool u8specials = false,
 		Std::string::size_type cursor = Std::string::npos) override;
diff --git a/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h b/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
index 3a76a85efc0..cbaea2ae430 100644
--- a/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
+++ b/engines/ultima/ultima8/graphics/fonts/shape_rendered_text.h
@@ -36,10 +36,10 @@ class ShapeRenderedText : public RenderedText {
 public:
 	ShapeRenderedText(Std::list<PositionedText> &lines,
 	                  int width, int height, int vlead, ShapeFont *font);
-	virtual ~ShapeRenderedText();
+	~ShapeRenderedText() override;
 
-	virtual void draw(RenderSurface *surface, int x, int y, bool destmasked = false) override;
-	virtual void drawBlended(RenderSurface *surface, int x, int y, uint32 col, bool destmasked = false) override;
+	void draw(RenderSurface *surface, int x, int y, bool destmasked = false) override;
+	void drawBlended(RenderSurface *surface, int x, int y, uint32 col, bool destmasked = false) override;
 
 	ENABLE_RUNTIME_CLASSTYPE()
 
diff --git a/engines/ultima/ultima8/graphics/fonts/tt_font.h b/engines/ultima/ultima8/graphics/fonts/tt_font.h
index e2af335be45..bcbe01da173 100644
--- a/engines/ultima/ultima8/graphics/fonts/tt_font.h
+++ b/engines/ultima/ultima8/graphics/fonts/tt_font.h
@@ -34,25 +34,25 @@ class TTFont : public Font {
 public:
 	TTFont(Graphics::Font *font, uint32 rgb, int bordersize,
 	       bool antiAliased, bool SJIS);
-	virtual ~TTFont();
+	~TTFont() override;
 
-	virtual int getHeight() override;
-	virtual int getBaseline() override;
-	virtual int getBaselineSkip() override;
+	int getHeight() override;
+	int getBaseline() override;
+	int getBaselineSkip() override;
 
 	bool isAntialiased() {
 		return antiAliased;
 	}
 
-	virtual void getStringSize(const Std::string &text,
+	void getStringSize(const Std::string &text,
 		int32 &width, int32 &height) override;
 
-	virtual void getTextSize(const Std::string &text,
+	void getTextSize(const Std::string &text,
 		int32 &resultwidth, int32 &resultheight, unsigned int &remaining,
 		int32 width = 0, int32 height = 0, TextAlign align = TEXT_LEFT,
 		bool u8specials = false) override;
 
-	virtual RenderedText *renderText(const Std::string &text,
+	RenderedText *renderText(const Std::string &text,
 		unsigned int &remaining, int32 width = 0, int32 height = 0,
 		TextAlign align = TEXT_LEFT, bool u8specials = false,
 		Std::string::size_type cursor = Std::string::npos) override;
diff --git a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h b/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
index e94330cca36..3609c8e6448 100644
--- a/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
+++ b/engines/ultima/ultima8/graphics/fonts/ttf_rendered_text.h
@@ -37,11 +37,11 @@ class TTFRenderedText : public RenderedText {
 public:
 	TTFRenderedText(Texture *texture, int width, int height, int vlead,
 	                TTFont *font);
-	virtual ~TTFRenderedText();
+	~TTFRenderedText() override;
 
-	virtual void draw(RenderSurface *surface, int x, int y,
+	void draw(RenderSurface *surface, int x, int y,
 	                  bool destmasked = false) override;
-	virtual void drawBlended(RenderSurface *surface, int x, int y, uint32 col,
+	void drawBlended(RenderSurface *surface, int x, int y, uint32 col,
 	                         bool destmasked = false) override;
 
 	ENABLE_RUNTIME_CLASSTYPE()
diff --git a/engines/ultima/ultima8/graphics/gump_shape_archive.h b/engines/ultima/ultima8/graphics/gump_shape_archive.h
index 5e91beca9d2..a8daff6a230 100644
--- a/engines/ultima/ultima8/graphics/gump_shape_archive.h
+++ b/engines/ultima/ultima8/graphics/gump_shape_archive.h
@@ -49,7 +49,7 @@ public:
 	                 const ConvertShapeFormat *format_ = 0)
 		: ShapeArchive(path, id_, pal_, format_) { }
 
-	virtual ~GumpShapeArchive();
+	~GumpShapeArchive() override;
 
 	void loadGumpage(IDataSource *ds);
 	Rect *getGumpItemArea(uint32 shapenum);
diff --git a/engines/ultima/ultima8/graphics/inverter_process.h b/engines/ultima/ultima8/graphics/inverter_process.h
index ede83e824e4..31c8a8b49df 100644
--- a/engines/ultima/ultima8/graphics/inverter_process.h
+++ b/engines/ultima/ultima8/graphics/inverter_process.h
@@ -34,7 +34,7 @@ class InverterProcess : public Process {
 public:
 	InverterProcess();
 	InverterProcess(unsigned int targetstate);
-	virtual ~InverterProcess();
+	~InverterProcess() override;
 
 	// p_dynamic_class stuff
 	ENABLE_RUNTIME_CLASSTYPE()
@@ -43,7 +43,7 @@ public:
 		targetstate = target;
 	}
 
-	virtual void run() override;
+	void run() override;
 
 	static ProcId invertScreen();
 	static void ConCmd_invertScreen(const Console::ArgvType &argv);
@@ -52,7 +52,7 @@ public:
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	static InverterProcess *inverter;
 	unsigned int targetstate;
diff --git a/engines/ultima/ultima8/graphics/main_shape_archive.h b/engines/ultima/ultima8/graphics/main_shape_archive.h
index cee9355b41e..59770c24bea 100644
--- a/engines/ultima/ultima8/graphics/main_shape_archive.h
+++ b/engines/ultima/ultima8/graphics/main_shape_archive.h
@@ -53,7 +53,7 @@ public:
 	                 const ConvertShapeFormat *format_ = 0)
 		: ShapeArchive(path, id_, pal_, format_), typeFlags(0), animdat(0) { }
 
-	virtual ~MainShapeArchive();
+	~MainShapeArchive() override;
 
 	void loadTypeFlags(IDataSource *ds);
 	ShapeInfo *getShapeInfo(uint32 shapenum);
diff --git a/engines/ultima/ultima8/graphics/palette_fader_process.h b/engines/ultima/ultima8/graphics/palette_fader_process.h
index afab67c5f98..61987dfde94 100644
--- a/engines/ultima/ultima8/graphics/palette_fader_process.h
+++ b/engines/ultima/ultima8/graphics/palette_fader_process.h
@@ -46,9 +46,9 @@ public:
 	PaletteFaderProcess(PalTransforms trans, int priority, int frames);
 	PaletteFaderProcess(uint32 rgba, bool from, int priority, int frames, bool current);
 	PaletteFaderProcess(int16 from[12], int16 to[12], int priority, int frames);
-	virtual ~PaletteFaderProcess(void);
+	~PaletteFaderProcess(void) override;
 
-	virtual void run() override;
+	void run() override;
 
 	INTRINSIC(I_fadeToPaletteTransform);
 	INTRINSIC(I_fadeToBlack);
@@ -59,7 +59,7 @@ public:
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/point_scaler.h b/engines/ultima/ultima8/graphics/point_scaler.h
index e338ca67564..0e935ced6fc 100644
--- a/engines/ultima/ultima8/graphics/point_scaler.h
+++ b/engines/ultima/ultima8/graphics/point_scaler.h
@@ -32,8 +32,8 @@ class PointScaler : public Scaler {
 public:
 	PointScaler();
 
-	virtual uint32    ScaleBits() const;          //< bits for supported integer scaling
-	virtual bool      ScaleArbitrary() const;     //< supports arbitrary scaling of any degree
+	uint32    ScaleBits() const override;          //< bits for supported integer scaling
+	bool      ScaleArbitrary() const override;     //< supports arbitrary scaling of any degree
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/shape_archive.h b/engines/ultima/ultima8/graphics/shape_archive.h
index 47a1bc8905a..324a9d581b2 100644
--- a/engines/ultima/ultima8/graphics/shape_archive.h
+++ b/engines/ultima/ultima8/graphics/shape_archive.h
@@ -51,13 +51,13 @@ public:
 	             const ConvertShapeFormat *format_ = 0)
 		: Archive(path), id(id_), format(format_), palette(pal_) { }
 
-	virtual ~ShapeArchive();
+	~ShapeArchive() override;
 
 	Shape *getShape(uint32 shapenum);
 
-	virtual void cache(uint32 shapenum) override;
-	virtual void uncache(uint32 shapenum) override;
-	virtual bool isCached(uint32 shapenum) override;
+	void cache(uint32 shapenum) override;
+	void uncache(uint32 shapenum) override;
+	bool isCached(uint32 shapenum) override;
 
 protected:
 	uint16 id;
diff --git a/engines/ultima/ultima8/graphics/soft_render_surface.h b/engines/ultima/ultima8/graphics/soft_render_surface.h
index 977c0be0076..e2adb915d41 100644
--- a/engines/ultima/ultima8/graphics/soft_render_surface.h
+++ b/engines/ultima/ultima8/graphics/soft_render_surface.h
@@ -55,16 +55,16 @@ public:
 	//
 
 	// Fill buffer (using a palette index)
-	virtual void Fill8(uint8 index, int32 sx, int32 sy, int32 w, int32 h);
+	void Fill8(uint8 index, int32 sx, int32 sy, int32 w, int32 h) override;
 
 	// Fill buffer (using a RGB colour)
-	virtual void Fill32(uint32 rgb, int32 sx, int32 sy, int32 w, int32 h);
+	void Fill32(uint32 rgb, int32 sx, int32 sy, int32 w, int32 h) override;
 
 	//! Fill alpha channel
-	virtual void FillAlpha(uint8 alpha, int32 sx, int32 sy, int32 w, int32 h);
+	void FillAlpha(uint8 alpha, int32 sx, int32 sy, int32 w, int32 h) override;
 
 	// Fill the region doing alpha blending
-	virtual void FillBlended(uint32 rgba, int32 sx, int32 sy, int32 w, int32 h);
+	void FillBlended(uint32 rgba, int32 sx, int32 sy, int32 w, int32 h) override;
 
 	//
 	// The rule for painting methods:
@@ -80,34 +80,34 @@ public:
 
 	// Paint a Shape
 	// TODO: virtual void Paint(CachedShape* s, uint32 frame, int32 x, int32 y);
-	virtual void Paint(Shape *s, uint32 frame, int32 x, int32 y, bool untformed_pal = false);
+	void Paint(Shape *s, uint32 frame, int32 x, int32 y, bool untformed_pal = false) override;
 
 	// Paint an Shape without clipping
 	// TODO: virtual void PaintNoClip(CachedShape*s, uint32 frame, int32 x, int32 y);
-	virtual void PaintNoClip(Shape *s, uint32 frame, int32 x, int32 y, bool untformed_pal = false);
+	void PaintNoClip(Shape *s, uint32 frame, int32 x, int32 y, bool untformed_pal = false) override;
 
 	// Paint a Translucent Shape.
 	// TODO: virtual void PaintTranslucent(CachedShape* s, uint32 frame, int32 x, int32 y);
-	virtual void PaintTranslucent(Shape *s, uint32 frame, int32 x, int32 y, bool untformed_pal = false);
+	void PaintTranslucent(Shape *s, uint32 frame, int32 x, int32 y, bool untformed_pal = false) override;
 
 	// Paint a Mirrored Shape
 	// TODO: virtual void PaintMirrored(CachedShape* s, uint32 frame, int32 x, int32 y, bool trans = false);
-	virtual void PaintMirrored(Shape *s, uint32 frame, int32 x, int32 y, bool trans = false, bool untformed_pal = false);
+	void PaintMirrored(Shape *s, uint32 frame, int32 x, int32 y, bool trans = false, bool untformed_pal = false) override;
 
 	// Paint a Invisible Shape
 	// TODO: virtual void PaintInvisible(CachedShape* s, uint32 frame, int32 x, int32 y, bool trans, bool mirrored);
-	virtual void PaintInvisible(Shape *s, uint32 frame, int32 x, int32 y, bool trans, bool mirrored, bool untformed_pal = false);
+	void PaintInvisible(Shape *s, uint32 frame, int32 x, int32 y, bool trans, bool mirrored, bool untformed_pal = false) override;
 
 	// Paint a Highlighted Shape of using the 32 Bit Colour col32 (0xAARRGGBB Alpha is blend level)
 	// TODO: virtual void PaintHighlight(CachedShape* s, uint32 frame, int32 x, int32 y, bool trans, bool mirrored, uint32 col32);
-	virtual void PaintHighlight(Shape *s, uint32 frame, int32 x, int32 y, bool trans, bool mirrored, uint32 col32, bool untformed_pal = false);
+	void PaintHighlight(Shape *s, uint32 frame, int32 x, int32 y, bool trans, bool mirrored, uint32 col32, bool untformed_pal = false) override;
 
 	// Paint a Invisible Highlighted Shape of using the 32 Bit Colour col32 (0xAARRGGBB Alpha is blend level)
 	// TODO: virtual void PaintHighlightInvis(CachedShape* s, uint32 frame, int32 x, int32 y, bool trans, bool mirrored, uint32 col32);
-	virtual void PaintHighlightInvis(Shape *s, uint32 frame, int32 x, int32 y, bool trans, bool mirrored, uint32 col32, bool untformed_pal = false);
+	void PaintHighlightInvis(Shape *s, uint32 frame, int32 x, int32 y, bool trans, bool mirrored, uint32 col32, bool untformed_pal = false) override;
 
 	// Paint a shape masked against destination alpha
-	virtual void PaintMasked(Shape *s, uint32 framenum, int32 x, int32 y, bool trans, bool mirrored, uint32 col32 = 0, bool untformed_pal = false);
+	void PaintMasked(Shape *s, uint32 framenum, int32 x, int32 y, bool trans, bool mirrored, uint32 col32 = 0, bool untformed_pal = false) override;
 
 
 	//
@@ -118,17 +118,17 @@ public:
 	// TODO: virtual void DrawLine8(uint8 index, int32 sx, int32 sy, int32 ex, int32 ey);
 
 	// Draw a RGB Line
-	virtual void DrawLine32(uint32 rgb, int32 sx, int32 sy, int32 ex, int32 ey);
+	void DrawLine32(uint32 rgb, int32 sx, int32 sy, int32 ex, int32 ey) override;
 
 
 	//
 	// Basic Font Drawing
 	//
 	// Draw FixedWidthFont
-	virtual void PrintTextFixed(FixedWidthFont *, const char *text, int x, int y);
+	void PrintTextFixed(FixedWidthFont *, const char *text, int x, int y) override;
 
 	// Draw a fixed width character from a FixedWidthFont
-	virtual void PrintCharFixed(FixedWidthFont *, int character, int x, int y);
+	void PrintCharFixed(FixedWidthFont *, int character, int x, int y) override;
 
 
 	//
@@ -136,19 +136,19 @@ public:
 	//
 
 	// Blit a region from a Texture (Alpha == 0 -> skipped)
-	virtual void Blit(Texture *, int32 sx, int32 sy, int32 w, int32 h, int32 dx, int32 dy, bool alpha_blend = false);
+	void Blit(Texture *, int32 sx, int32 sy, int32 w, int32 h, int32 dx, int32 dy, bool alpha_blend = false) override;
 
 	// Blit a region from a Texture with a Colour blend (AlphaTex == 0 -> skipped. AlphaCol32 -> Blend Factors)
-	virtual void FadedBlit(Texture *, int32 sx, int32 sy, int32 w, int32 h, int32 dx, int32 dy, uint32 col32, bool alpha_blend = false);
+	void FadedBlit(Texture *, int32 sx, int32 sy, int32 w, int32 h, int32 dx, int32 dy, uint32 col32, bool alpha_blend = false) override;
 
 	// Blit a region from a Texture with a Colour blend masked based on DestAlpha (AlphaTex == 0 || AlphaDest == 0 -> skipped. AlphaCol32 -> Blend Factors)
-	virtual void MaskedBlit(Texture *, int32 sx, int32 sy, int32 w, int32 h, int32 dx, int32 dy, uint32 col32, bool alpha_blend = false);
+	void MaskedBlit(Texture *, int32 sx, int32 sy, int32 w, int32 h, int32 dx, int32 dy, uint32 col32, bool alpha_blend = false) override;
 
 	// Blit a stretched region from a Texture (Alpha == 0 -> skipped)
-	virtual void StretchBlit(Texture *, int32 sx, int32 sy, int32 sw, int32 sh, int32 dx, int32 dy, int32 dw, int32 dh, bool clampedges = false);
+	void StretchBlit(Texture *, int32 sx, int32 sy, int32 sw, int32 sh, int32 dx, int32 dy, int32 dw, int32 dh, bool clampedges = false) override;
 
 	// Blit a region from a Texture using a scaler
-	virtual bool ScalerBlit(Texture *, int32 sx, int32 sy, int32 sw, int32 sh, int32 dx, int32 dy, int32 dw, int32 dh, const Scaler *, bool clampedges = false);
+	bool ScalerBlit(Texture *, int32 sx, int32 sy, int32 sw, int32 sh, int32 dx, int32 dy, int32 dw, int32 dh, const Scaler *, bool clampedges = false) override;
 
 	////////////////////////////////////////
 	// TODO: Add in Abstract 3d code Here //
diff --git a/engines/ultima/ultima8/graphics/texture_bitmap.h b/engines/ultima/ultima8/graphics/texture_bitmap.h
index 1665d569b6f..522b147f155 100644
--- a/engines/ultima/ultima8/graphics/texture_bitmap.h
+++ b/engines/ultima/ultima8/graphics/texture_bitmap.h
@@ -33,7 +33,7 @@ struct TextureBitmap : public Texture {
 	TextureBitmap() : Texture() {}
 
 	// False on Error
-	virtual bool Read(IDataSource *ds);
+	bool Read(IDataSource *ds) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/texture_png.h b/engines/ultima/ultima8/graphics/texture_png.h
index 327e62bfd0e..354abbb9e87 100644
--- a/engines/ultima/ultima8/graphics/texture_png.h
+++ b/engines/ultima/ultima8/graphics/texture_png.h
@@ -32,7 +32,7 @@ struct TexturePNG : public Texture {
 	TexturePNG() : Texture() {}
 
 	// False on Error
-	virtual bool Read(IDataSource *ds);
+	bool Read(IDataSource *ds) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/graphics/texture_targa.h b/engines/ultima/ultima8/graphics/texture_targa.h
index 0e066056775..79f5d16e026 100644
--- a/engines/ultima/ultima8/graphics/texture_targa.h
+++ b/engines/ultima/ultima8/graphics/texture_targa.h
@@ -35,7 +35,7 @@ struct TextureTarga : public Texture {
 	TextureTarga() : Texture() {}
 
 	// False on Error
-	virtual bool Read(IDataSource *ds);
+	bool Read(IDataSource *ds) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/ask_gump.h b/engines/ultima/ultima8/gumps/ask_gump.h
index 753c543f504..d1f95b043da 100644
--- a/engines/ultima/ultima8/gumps/ask_gump.h
+++ b/engines/ultima/ultima8/gumps/ask_gump.h
@@ -39,16 +39,16 @@ public:
 
 	AskGump();
 	AskGump(uint16 owner_, UCList *answers_);
-	virtual ~AskGump();
+	~AskGump() override;
 
 	// Init the gump, call after construction
-	virtual void        InitGump(Gump *newparent, bool take_focus = true) override;
+	void        InitGump(Gump *newparent, bool take_focus = true) override;
 
-	virtual void        ChildNotify(Gump *child, uint32 message) override;
+	void        ChildNotify(Gump *child, uint32 message) override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/bark_gump.h b/engines/ultima/ultima8/gumps/bark_gump.h
index bce2602b452..57cb81b6cb0 100644
--- a/engines/ultima/ultima8/gumps/bark_gump.h
+++ b/engines/ultima/ultima8/gumps/bark_gump.h
@@ -43,16 +43,16 @@ public:
 
 	BarkGump();
 	BarkGump(uint16 owner_, Std::string msg, uint32 speechshapenum = 0);
-	virtual ~BarkGump(void);
+	~BarkGump(void) override;
 
 	// Run the gump (decrement the counter)
-	virtual void        run() override;
+	void        run() override;
 
 	// Got to the next page on mouse click
-	virtual Gump       *OnMouseDown(int button, int32 mx, int32 my) override;
+	Gump       *OnMouseDown(int button, int32 mx, int32 my) override;
 
 	// Init the gump, call after construction
-	virtual void        InitGump(Gump *newparent, bool take_focus = true) override;
+	void        InitGump(Gump *newparent, bool take_focus = true) override;
 
 protected:
 	//! show next text.
@@ -64,7 +64,7 @@ protected:
 public:
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/bind_gump.h b/engines/ultima/ultima8/gumps/bind_gump.h
index 32ba5686abe..cd515049e37 100644
--- a/engines/ultima/ultima8/gumps/bind_gump.h
+++ b/engines/ultima/ultima8/gumps/bind_gump.h
@@ -36,16 +36,16 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	BindGump(istring *b, Gump *g);
-	virtual ~BindGump(void);
+	~BindGump(void) override;
 
 	// Init the gump, call after construction
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
 	// Paint the Gump
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
-	virtual bool OnKeyDown(int key, int mod) override;
-	virtual Gump   *OnMouseDown(int button, int32 mx, int32 my) override;
+	bool OnKeyDown(int key, int mod) override;
+	Gump   *OnMouseDown(int button, int32 mx, int32 my) override;
 
 	bool loadData(IDataSource *ids);
 
@@ -54,7 +54,7 @@ public:
 		UPDATE = 10
 	};
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 	istring *binding;
 	Gump *invoker;
 };
diff --git a/engines/ultima/ultima8/gumps/book_gump.h b/engines/ultima/ultima8/gumps/book_gump.h
index dc8975df229..35cc384ff7e 100644
--- a/engines/ultima/ultima8/gumps/book_gump.h
+++ b/engines/ultima/ultima8/gumps/book_gump.h
@@ -39,16 +39,16 @@ public:
 
 	BookGump();
 	BookGump(ObjId owner_, Std::string msg);
-	virtual ~BookGump();
+	~BookGump() override;
 
 	// Go to the next page on mouse click
-	virtual void OnMouseClick(int button, int32 mx, int32 my) override;
+	void OnMouseClick(int button, int32 mx, int32 my) override;
 
 	// Close on double click
-	virtual void OnMouseDouble(int button, int32 mx, int32 my) override;
+	void OnMouseDouble(int button, int32 mx, int32 my) override;
 
 	// Init the gump, call after construction
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
 	INTRINSIC(I_readBook);
 
@@ -58,7 +58,7 @@ protected:
 public:
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/console_gump.h b/engines/ultima/ultima8/gumps/console_gump.h
index df4c4978ae2..d994b4ebb96 100644
--- a/engines/ultima/ultima8/gumps/console_gump.h
+++ b/engines/ultima/ultima8/gumps/console_gump.h
@@ -47,7 +47,7 @@ public:
 
 	ConsoleGump();
 	ConsoleGump(int x, int y, int w, int h);
-	virtual ~ConsoleGump();
+	~ConsoleGump() override;
 
 	void ToggleConsole();
 	void ShowConsole();
@@ -55,26 +55,26 @@ public:
 	bool ConsoleIsVisible();
 
 	// ConsoleGump doesn't have any 'effective' area
-	virtual bool PointOnGump(int mx, int my) override {
+	bool PointOnGump(int mx, int my) override {
 		return false;
 	}
 
-	virtual void run() override;
+	void run() override;
 
-	virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
 
-	virtual void RenderSurfaceChanged() override;
+	void RenderSurfaceChanged() override;
 
-	virtual bool        OnTextInput(int unicode) override;
-	virtual void        OnFocus(bool /*gain*/) override;
-	virtual bool        OnKeyDown(int key, int mod) override;
+	bool        OnTextInput(int unicode) override;
+	void        OnFocus(bool /*gain*/) override;
+	bool        OnKeyDown(int key, int mod) override;
 
 	static void         ConCmd_toggle(const Console::ArgvType &argv);   //!< "ConsoleGump::toggle" console command
 
 	bool    loadData(IDataSource *ids, uint32 version);
 
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 private:
 };
diff --git a/engines/ultima/ultima8/gumps/container_gump.h b/engines/ultima/ultima8/gumps/container_gump.h
index f1c755a9ccd..34c15483e43 100644
--- a/engines/ultima/ultima8/gumps/container_gump.h
+++ b/engines/ultima/ultima8/gumps/container_gump.h
@@ -39,45 +39,45 @@ public:
 	ContainerGump();
 	ContainerGump(Shape *shape, uint32 framenum, uint16 owner,
 	              uint32 _Flags = FLAG_DRAGGABLE, int32 layer = LAYER_NORMAL);
-	virtual ~ContainerGump(void);
+	~ContainerGump(void) override;
 
 	void setItemArea(Rect *itemarea_) {
 		itemarea = *itemarea_;
 	}
 
 	// Close the gump
-	virtual void Close(bool no_del = false) override;
+	void Close(bool no_del = false) override;
 
 	// Init the gump, call after construction
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
 	// Paint the Gump
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
 	// Trace a click, and return ObjId
-	virtual uint16 TraceObjId(int32 mx, int32 my) override;
+	uint16 TraceObjId(int32 mx, int32 my) override;
 
 	// Get the location of an item in the gump (coords relative to this).
 	// Returns false on failure.
-	virtual bool GetLocationOfItem(uint16 itemid, int32 &gx, int32 &gy,
+	bool GetLocationOfItem(uint16 itemid, int32 &gx, int32 &gy,
 	                               int32 lerp_factor = 256) override;
 
 
-	virtual bool StartDraggingItem(Item *item, int mx, int my) override;
-	virtual bool DraggingItem(Item *item, int mx, int my) override;
-	virtual void DraggingItemLeftGump(Item *item) override;
-	virtual void StopDraggingItem(Item *item, bool moved) override;
-	virtual void DropItem(Item *item, int mx, int my) override;
+	bool StartDraggingItem(Item *item, int mx, int my) override;
+	bool DraggingItem(Item *item, int mx, int my) override;
+	void DraggingItemLeftGump(Item *item) override;
+	void StopDraggingItem(Item *item, bool moved) override;
+	void DropItem(Item *item, int mx, int my) override;
 
-	virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
-	virtual void OnMouseClick(int button, int32 mx, int32 my) override;
-	virtual void OnMouseDouble(int button, int32 mx, int32 my) override;
+	Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+	void OnMouseClick(int button, int32 mx, int32 my) override;
+	void OnMouseDouble(int button, int32 mx, int32 my) override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
-	virtual void GetItemLocation(int32 lerp_factor) override;
+	void GetItemLocation(int32 lerp_factor) override;
 
 	virtual Container *getTargetContainer(Item *item, int mx, int my);
 
diff --git a/engines/ultima/ultima8/gumps/controls_gump.cpp b/engines/ultima/ultima8/gumps/controls_gump.cpp
index 45fca3020f6..0aab53703a2 100644
--- a/engines/ultima/ultima8/gumps/controls_gump.cpp
+++ b/engines/ultima/ultima8/gumps/controls_gump.cpp
@@ -44,9 +44,9 @@ class ControlEntryGump : public Gump {
 public:
 	ENABLE_RUNTIME_CLASSTYPE()
 	ControlEntryGump(int x_, int y_, int width, const char *binding, const char *name);
-	virtual ~ControlEntryGump(void);
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
-	virtual void ChildNotify(Gump *child, uint32 message) override;
+	~ControlEntryGump(void) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
+	void ChildNotify(Gump *child, uint32 message) override;
 	void init();
 protected:
 	istring bindingName;
diff --git a/engines/ultima/ultima8/gumps/controls_gump.h b/engines/ultima/ultima8/gumps/controls_gump.h
index 3862ef8fa68..78a1940986c 100644
--- a/engines/ultima/ultima8/gumps/controls_gump.h
+++ b/engines/ultima/ultima8/gumps/controls_gump.h
@@ -36,16 +36,16 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	ControlsGump();
-	virtual ~ControlsGump(void);
+	~ControlsGump(void) override;
 
 	// Init the gump, call after construction
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
 	// Paint the Gump
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
-	virtual bool OnKeyDown(int key, int mod) override;
-	virtual void ChildNotify(Gump *child, uint32 message) override;
+	bool OnKeyDown(int key, int mod) override;
+	void ChildNotify(Gump *child, uint32 message) override;
 
 	static void showEngineMenu(PagedGump *pagedgump);
 	static void showU8Menu(PagedGump *pagedgump);
@@ -53,7 +53,7 @@ public:
 
 	bool loadData(IDataSource *ids);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/credits_gump.h b/engines/ultima/ultima8/gumps/credits_gump.h
index ac894cac94e..b702836d19e 100644
--- a/engines/ultima/ultima8/gumps/credits_gump.h
+++ b/engines/ultima/ultima8/gumps/credits_gump.h
@@ -38,24 +38,24 @@ public:
 	CreditsGump();
 	CreditsGump(const Std::string &text, int parskip = 24,
 	            uint32 _Flags = 0, int32 layer_ = LAYER_MODAL);
-	virtual ~CreditsGump(void);
+	~CreditsGump(void) override;
 
 	// Init the gump, call after construction
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
 	// Set a configuration option to true when user watches entire sequence
 	void SetFlagWhenFinished(Std::string configkey_) {
 		configkey = configkey_;
 	}
 
-	virtual void Close(bool no_del = false) override;
+	void Close(bool no_del = false) override;
 
-	virtual void run() override;
+	void run() override;
 
 	// Paint the Gump
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
-	virtual bool OnKeyDown(int key, int mod) override;
+	bool OnKeyDown(int key, int mod) override;
 
 protected:
 
diff --git a/engines/ultima/ultima8/gumps/desktop_gump.h b/engines/ultima/ultima8/gumps/desktop_gump.h
index dbf805e6048..e20bcc184ec 100644
--- a/engines/ultima/ultima8/gumps/desktop_gump.h
+++ b/engines/ultima/ultima8/gumps/desktop_gump.h
@@ -36,14 +36,14 @@ public:
 
 	DesktopGump();
 	DesktopGump(int32 x, int32 y, int32 width, int32 height);
-	virtual ~DesktopGump(void);
+	~DesktopGump(void) override;
 
-	virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
-	virtual void PaintChildren(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+	void PaintChildren(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
 
-	virtual bool StartDraggingChild(Gump *gump, int32 mx, int32 my) override;
-	virtual void DraggingChild(Gump *gump, int mx, int my) override;
-	virtual void StopDraggingChild(Gump *gump) override;
+	bool StartDraggingChild(Gump *gump, int32 mx, int32 my) override;
+	void DraggingChild(Gump *gump, int mx, int my) override;
+	void StopDraggingChild(Gump *gump) override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 
@@ -54,8 +54,8 @@ public:
 	}
 
 protected:
-	virtual void saveData(ODataSource *ods) override;
-	virtual void RenderSurfaceChanged() override;
+	void saveData(ODataSource *ods) override;
+	void RenderSurfaceChanged() override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/fast_area_vis_gump.h b/engines/ultima/ultima8/gumps/fast_area_vis_gump.h
index e7e4eb5c2b4..73bcbb9cf4c 100644
--- a/engines/ultima/ultima8/gumps/fast_area_vis_gump.h
+++ b/engines/ultima/ultima8/gumps/fast_area_vis_gump.h
@@ -34,10 +34,10 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	FastAreaVisGump(void);
-	virtual ~FastAreaVisGump(void);
+	~FastAreaVisGump(void) override;
 
-	virtual void        PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
-	virtual uint16      TraceObjId(int32 mx, int32 my) override;
+	void        PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+	uint16      TraceObjId(int32 mx, int32 my) override;
 
 	static void         ConCmd_toggle(const Console::ArgvType &argv);   //!< "FastAreaVisGump::toggle" console command
 
diff --git a/engines/ultima/ultima8/gumps/game_map_gump.h b/engines/ultima/ultima8/gumps/game_map_gump.h
index 27f22dee9a0..11f05f3ff5b 100644
--- a/engines/ultima/ultima8/gumps/game_map_gump.h
+++ b/engines/ultima/ultima8/gumps/game_map_gump.h
@@ -42,15 +42,15 @@ public:
 
 	GameMapGump();
 	GameMapGump(int x, int y, int w, int h);
-	virtual ~GameMapGump();
+	~GameMapGump() override;
 
-	virtual void        PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+	void        PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
 
 	void                GetCameraLocation(int32 &x, int32 &y, int32 &z,
 	                                      int lerp_factor = 256);
 
 	// Trace a click, and return ObjId (parent coord space)
-	virtual uint16      TraceObjId(int32 mx, int32 my) override;
+	uint16      TraceObjId(int32 mx, int32 my) override;
 
 	// Trace a click, return ObjId, and the coordinates of the mouse click (gump coord space)
 	virtual uint16      TraceCoordinates(int mx, int my, int32 coords[3],
@@ -59,19 +59,19 @@ public:
 
 	// Get the location of an item in the gump (coords relative to this).
 	// Returns false on failure
-	virtual bool        GetLocationOfItem(uint16 itemid, int32 &gx, int32 &gy,
+	bool        GetLocationOfItem(uint16 itemid, int32 &gx, int32 &gy,
 	                                      int32 lerp_factor = 256) override;
 
-	virtual bool        StartDraggingItem(Item *item, int mx, int my) override;
-	virtual bool        DraggingItem(Item *item, int mx, int my) override;
-	virtual void        DraggingItemLeftGump(Item *item) override;
-	virtual void        StopDraggingItem(Item *item, bool moved) override;
-	virtual void        DropItem(Item *item, int mx, int my) override;
+	bool        StartDraggingItem(Item *item, int mx, int my) override;
+	bool        DraggingItem(Item *item, int mx, int my) override;
+	void        DraggingItemLeftGump(Item *item) override;
+	void        StopDraggingItem(Item *item, bool moved) override;
+	void        DropItem(Item *item, int mx, int my) override;
 
-	virtual Gump       *OnMouseDown(int button, int32 mx, int32 my) override;
-	virtual void        OnMouseUp(int button, int32 mx, int32 my) override;
-	virtual void        OnMouseClick(int button, int32 mx, int32 my) override;
-	virtual void        OnMouseDouble(int button, int32 mx, int32 my) override;
+	Gump       *OnMouseDown(int button, int32 mx, int32 my) override;
+	void        OnMouseUp(int button, int32 mx, int32 my) override;
+	void        OnMouseClick(int button, int32 mx, int32 my) override;
+	void        OnMouseDouble(int button, int32 mx, int32 my) override;
 
 	void IncSortOrder(int count);
 
@@ -90,10 +90,10 @@ public:
 	static void ConCmd_incrementSortOrder(const Console::ArgvType &argv);
 	static void ConCmd_decrementSortOrder(const Console::ArgvType &argv);
 
-	virtual void        RenderSurfaceChanged() override;
+	void        RenderSurfaceChanged() override;
 
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	bool display_dragging;
 	uint32 dragging_shape;
diff --git a/engines/ultima/ultima8/gumps/gump.h b/engines/ultima/ultima8/gumps/gump.h
index 12fcdfb12e1..bd7888fb43a 100644
--- a/engines/ultima/ultima8/gumps/gump.h
+++ b/engines/ultima/ultima8/gumps/gump.h
@@ -75,7 +75,7 @@ public:
 	Gump();
 	Gump(int x, int y, int width, int height, uint16 owner = 0,
 	     uint32 _Flags = 0, int32 layer = LAYER_NORMAL);
-	virtual ~Gump();
+	~Gump() override;
 
 public:
 
@@ -462,7 +462,7 @@ public:
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/gump_notify_process.h b/engines/ultima/ultima8/gumps/gump_notify_process.h
index ddd0119ebb5..533f81ed10c 100644
--- a/engines/ultima/ultima8/gumps/gump_notify_process.h
+++ b/engines/ultima/ultima8/gumps/gump_notify_process.h
@@ -39,7 +39,7 @@ public:
 
 	GumpNotifyProcess();
 	GumpNotifyProcess(uint16 it);
-	virtual ~GumpNotifyProcess(void);
+	~GumpNotifyProcess(void) override;
 
 	void setGump(Gump *g);
 	uint16 getGump() const {
@@ -48,15 +48,15 @@ public:
 
 	virtual void notifyClosing(int res);
 
-	virtual void terminate() override;
+	void terminate() override;
 
-	virtual void run() override;
+	void run() override;
 
-	virtual void dumpInfo() override;
+	void dumpInfo() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/inverter_gump.h b/engines/ultima/ultima8/gumps/inverter_gump.h
index 8ee8c332e5e..67f47afe196 100644
--- a/engines/ultima/ultima8/gumps/inverter_gump.h
+++ b/engines/ultima/ultima8/gumps/inverter_gump.h
@@ -37,17 +37,17 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	InverterGump(int32 x, int32 y, int32 width, int32 height);
-	virtual ~InverterGump(void);
+	~InverterGump(void) override;
 
-	virtual void Paint(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
-	virtual void PaintChildren(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+	void Paint(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+	void PaintChildren(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
 
-	virtual void ParentToGump(int32 &px, int32 &py,
+	void ParentToGump(int32 &px, int32 &py,
 	                          PointRoundDir r = ROUND_TOPLEFT) override;
-	virtual void GumpToParent(int32 &gx, int32 &gy,
+	void GumpToParent(int32 &gx, int32 &gy,
 	                          PointRoundDir r = ROUND_TOPLEFT) override;
 
-	virtual void RenderSurfaceChanged() override;
+	void RenderSurfaceChanged() override;
 
 protected:
 	RenderSurface *buffer;
diff --git a/engines/ultima/ultima8/gumps/item_relative_gump.h b/engines/ultima/ultima8/gumps/item_relative_gump.h
index 3d28ce9d4d0..cf4e677194a 100644
--- a/engines/ultima/ultima8/gumps/item_relative_gump.h
+++ b/engines/ultima/ultima8/gumps/item_relative_gump.h
@@ -38,24 +38,24 @@ public:
 
 	ItemRelativeGump();
 	ItemRelativeGump(int32 x, int32 y, int32 width, int32 height, uint16 owner, uint32 _Flags = 0, int32 layer = LAYER_NORMAL);
-	virtual ~ItemRelativeGump(void);
+	~ItemRelativeGump(void) override;
 
-	virtual void        InitGump(Gump *newparent, bool take_focus = true) override;
+	void        InitGump(Gump *newparent, bool take_focus = true) override;
 
 	// Paint the Gump (RenderSurface is relative to parent).
 	// Calls PaintThis and PaintChildren.
-	virtual void        Paint(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void        Paint(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
-	virtual void        ParentToGump(int32 &px, int32 &py,
+	void        ParentToGump(int32 &px, int32 &py,
 	                                 PointRoundDir r = ROUND_TOPLEFT) override;
-	virtual void        GumpToParent(int32 &gx, int32 &gy,
+	void        GumpToParent(int32 &gx, int32 &gy,
 	                                 PointRoundDir r = ROUND_TOPLEFT) override;
 
-	virtual void        Move(int32 x, int32 y) override;
+	void        Move(int32 x, int32 y) override;
 
 	bool                loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void        saveData(ODataSource *ods) override;
+	void        saveData(ODataSource *ods) override;
 
 	virtual void        GetItemLocation(int32 lerp_factor);
 
diff --git a/engines/ultima/ultima8/gumps/main_menu_process.h b/engines/ultima/ultima8/gumps/main_menu_process.h
index 6441d69bd7e..d7e89570db8 100644
--- a/engines/ultima/ultima8/gumps/main_menu_process.h
+++ b/engines/ultima/ultima8/gumps/main_menu_process.h
@@ -38,11 +38,11 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	bool init;
 };
diff --git a/engines/ultima/ultima8/gumps/menu_gump.h b/engines/ultima/ultima8/gumps/menu_gump.h
index 42fee99bfa3..092d965d835 100644
--- a/engines/ultima/ultima8/gumps/menu_gump.h
+++ b/engines/ultima/ultima8/gumps/menu_gump.h
@@ -36,18 +36,18 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	MenuGump(bool nameEntryMode = false);
-	virtual ~MenuGump(void);
+	~MenuGump(void) override;
 
 	// Init the gump, call after construction
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
-	virtual void Close(bool no_del = false) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
+	void Close(bool no_del = false) override;
 
 	// Paint the Gump
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
-	virtual bool OnKeyDown(int key, int mod) override;
-	virtual bool OnTextInput(int unicode) override;
-	virtual void ChildNotify(Gump *child, uint32 message) override;
+	bool OnKeyDown(int key, int mod) override;
+	bool OnTextInput(int unicode) override;
+	void ChildNotify(Gump *child, uint32 message) override;
 
 	static void showMenu();
 	static void ConCmd_showMenu(const Console::ArgvType &argv);
diff --git a/engines/ultima/ultima8/gumps/message_box_gump.h b/engines/ultima/ultima8/gumps/message_box_gump.h
index 0264e03d002..017709a60ef 100644
--- a/engines/ultima/ultima8/gumps/message_box_gump.h
+++ b/engines/ultima/ultima8/gumps/message_box_gump.h
@@ -42,15 +42,15 @@ public:
 
 	MessageBoxGump();
 	MessageBoxGump(const Std::string &title, const Std::string &message, uint32 title_colour, Std::vector<Std::string> *buttons);
-	virtual ~MessageBoxGump();
+	~MessageBoxGump() override;
 
 	// Init the gump, call after construction
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
-	virtual void Close(bool no_del = false) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
+	void Close(bool no_del = false) override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
 	//! Create a Message Box
 	//! \param title Title of the message box
@@ -63,10 +63,10 @@ public:
 		return Show(title, message, 0xFF30308F, buttons);
 	}
 
-	virtual void ChildNotify(Gump *child, uint32 msg) override;
+	void ChildNotify(Gump *child, uint32 msg) override;
 
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/mini_stats_gump.h b/engines/ultima/ultima8/gumps/mini_stats_gump.h
index f7b34002424..53a3f874e65 100644
--- a/engines/ultima/ultima8/gumps/mini_stats_gump.h
+++ b/engines/ultima/ultima8/gumps/mini_stats_gump.h
@@ -36,23 +36,23 @@ public:
 	MiniStatsGump();
 	MiniStatsGump(int x, int y, uint32 _Flags = FLAG_DRAGGABLE,
 	              int32 layer = LAYER_NORMAL);
-	virtual ~MiniStatsGump(void);
+	~MiniStatsGump(void) override;
 
 	// Init the gump, call after construction
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
 	// Paint this Gump
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
 	// Trace a click, and return ObjId
-	virtual uint16 TraceObjId(int32 mx, int32 my) override;
+	uint16 TraceObjId(int32 mx, int32 my) override;
 
-	virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
-	virtual void OnMouseDouble(int button, int32 mx, int32 my) override;
+	Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+	void OnMouseDouble(int button, int32 mx, int32 my) override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/minimap_gump.h b/engines/ultima/ultima8/gumps/minimap_gump.h
index 5edb32fdb27..32611bc3650 100644
--- a/engines/ultima/ultima8/gumps/minimap_gump.h
+++ b/engines/ultima/ultima8/gumps/minimap_gump.h
@@ -45,17 +45,17 @@ public:
 
 	MiniMapGump(void);
 	MiniMapGump(int x, int y);
-	virtual ~MiniMapGump(void);
+	~MiniMapGump(void) override;
 
-	virtual void        PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
-	virtual uint16      TraceObjId(int32 mx, int32 my) override;
+	void        PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+	uint16      TraceObjId(int32 mx, int32 my) override;
 
 	static void         ConCmd_toggle(const Console::ArgvType &argv);   //!< "MiniMapGump::toggle" console command
 	static void         ConCmd_generateWholeMap(const Console::ArgvType &argv); //!< "MiniMapGump::generateWholeMap" console command
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/modal_gump.h b/engines/ultima/ultima8/gumps/modal_gump.h
index 1c5b998237b..e15dba6ddf7 100644
--- a/engines/ultima/ultima8/gumps/modal_gump.h
+++ b/engines/ultima/ultima8/gumps/modal_gump.h
@@ -37,21 +37,21 @@ public:
 	ModalGump(int x, int y, int width, int height, uint16 owner = 0,
 	          uint32 _Flags = 0, int32 layer = LAYER_MODAL);
 
-	~ModalGump();
+	~ModalGump() override;
 
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
-	virtual void Close(bool no_del = false) override;
+	void Close(bool no_del = false) override;
 
-	virtual bool PointOnGump(int mx, int my) override;
-	virtual Gump *FindGump(int mx, int my) override;
-	virtual uint16 TraceObjId(int32 mx, int32 my) override;
+	bool PointOnGump(int mx, int my) override;
+	Gump *FindGump(int mx, int my) override;
+	uint16 TraceObjId(int32 mx, int32 my) override;
 
-	virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+	Gump *OnMouseDown(int button, int32 mx, int32 my) override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/movie_gump.h b/engines/ultima/ultima8/gumps/movie_gump.h
index 6eca1b3ac34..8c161356808 100644
--- a/engines/ultima/ultima8/gumps/movie_gump.h
+++ b/engines/ultima/ultima8/gumps/movie_gump.h
@@ -39,18 +39,18 @@ public:
 	MovieGump();
 	MovieGump(int width, int height, RawArchive *skf, bool introMusicHack = false,
 	          uint32 _Flags = 0, int32 layer = LAYER_MODAL);
-	virtual ~MovieGump(void);
+	~MovieGump(void) override;
 
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
-	virtual void Close(bool no_del = false) override;
+	void Close(bool no_del = false) override;
 
-	virtual void run() override;
+	void run() override;
 
 	// Paint the Gump
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
-	virtual bool OnKeyDown(int key, int mod) override;
+	bool OnKeyDown(int key, int mod) override;
 
 	static ProcId U8MovieViewer(RawArchive *skf, bool introMusicHack = false);
 
@@ -59,7 +59,7 @@ public:
 
 	bool loadData(IDataSource *ids);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	SKFPlayer *player;
 };
diff --git a/engines/ultima/ultima8/gumps/options_gump.h b/engines/ultima/ultima8/gumps/options_gump.h
index e20e0d4fb7f..87df34fb830 100644
--- a/engines/ultima/ultima8/gumps/options_gump.h
+++ b/engines/ultima/ultima8/gumps/options_gump.h
@@ -34,20 +34,20 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	OptionsGump();
-	virtual ~OptionsGump(void);
+	~OptionsGump(void) override;
 
 	// Init the gump, call after construction
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
 	// Paint the Gump
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
-	virtual bool OnKeyDown(int key, int mod) override;
-	virtual void ChildNotify(Gump *child, uint32 message) override;
+	bool OnKeyDown(int key, int mod) override;
+	void ChildNotify(Gump *child, uint32 message) override;
 
 	bool loadData(IDataSource *ids);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	virtual void selectEntry(int entry);
 };
diff --git a/engines/ultima/ultima8/gumps/paged_gump.h b/engines/ultima/ultima8/gumps/paged_gump.h
index d75318c9f67..e82512a51fe 100644
--- a/engines/ultima/ultima8/gumps/paged_gump.h
+++ b/engines/ultima/ultima8/gumps/paged_gump.h
@@ -34,17 +34,17 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	PagedGump(int left, int right, int top, int shape);
-	virtual ~PagedGump(void);
+	~PagedGump(void) override;
 
 	// Init the gump, call after construction
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
-	virtual void Close(bool no_del = false) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
+	void Close(bool no_del = false) override;
 
 	// Paint the Gump
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
-	virtual bool OnKeyDown(int key, int mod) override;
-	virtual void ChildNotify(Gump *child, uint32 message) override;
+	bool OnKeyDown(int key, int mod) override;
+	void ChildNotify(Gump *child, uint32 message) override;
 
 	//! add a page. Note: g already has to be a child gump.
 	void addPage(Gump *g);
@@ -55,7 +55,7 @@ public:
 
 	bool loadData(IDataSource *ids);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 	int leftOff, rightOff, topOff, gumpShape;
 	Std::vector<Gump *> gumps;
 	Gump *nextButton;
diff --git a/engines/ultima/ultima8/gumps/paperdoll_gump.h b/engines/ultima/ultima8/gumps/paperdoll_gump.h
index 468f81e6d98..8ae7877d553 100644
--- a/engines/ultima/ultima8/gumps/paperdoll_gump.h
+++ b/engines/ultima/ultima8/gumps/paperdoll_gump.h
@@ -38,34 +38,34 @@ public:
 	PaperdollGump();
 	PaperdollGump(Shape *shape, uint32 framenum, uint16 owner,
 	              uint32 _Flags = FLAG_DRAGGABLE, int32 layer = LAYER_NORMAL);
-	virtual ~PaperdollGump(void);
+	~PaperdollGump(void) override;
 
 	// Init the gump, call after construction
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
 	// Close the gump
-	virtual void Close(bool no_del = false) override;
+	void Close(bool no_del = false) override;
 
 	// Paint this Gump
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
-	virtual void ChildNotify(Gump *child, uint32 message) override;
+	void ChildNotify(Gump *child, uint32 message) override;
 
 	// Trace a click, and return ObjId
-	virtual uint16 TraceObjId(int32 mx, int32 my) override;
+	uint16 TraceObjId(int32 mx, int32 my) override;
 
 	// Get the location of an item in the gump (coords relative to this).
 	// Returns false on failure.
-	virtual bool GetLocationOfItem(uint16 itemid, int32 &gx, int32 &gy,
+	bool GetLocationOfItem(uint16 itemid, int32 &gx, int32 &gy,
 	                               int32 lerp_factor = 256) override;
 
-	virtual bool StartDraggingItem(Item *item, int mx, int my) override;
-	virtual bool DraggingItem(Item *item, int mx, int my) override;
-	virtual void DropItem(Item *item, int mx, int my) override;
+	bool StartDraggingItem(Item *item, int mx, int my) override;
+	bool DraggingItem(Item *item, int mx, int my) override;
+	void DropItem(Item *item, int mx, int my) override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	//! Paint the stats
 	void PaintStats(RenderSurface *, int32 lerp_factor);
diff --git a/engines/ultima/ultima8/gumps/pentagram_menu_gump.h b/engines/ultima/ultima8/gumps/pentagram_menu_gump.h
index 97f4707caaf..733205d5c8f 100644
--- a/engines/ultima/ultima8/gumps/pentagram_menu_gump.h
+++ b/engines/ultima/ultima8/gumps/pentagram_menu_gump.h
@@ -41,7 +41,7 @@ class PentagramMenuGump : public ModalGump {
 			flags |= PROC_RUNPAUSED;
 		}
 
-		virtual void run() {
+		void run() override {
 			pout << "Gump returned: " << result << Std::endl;
 			PentagramMenuGump *menu = p_dynamic_cast<PentagramMenuGump *>(ObjectManager::get_instance()->getObject(getItemNum()));
 			if (menu) menu->ProcessCallback(game, result);
@@ -53,18 +53,18 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	PentagramMenuGump(int x, int y, int w, int h);
-	virtual ~PentagramMenuGump();
+	~PentagramMenuGump() override;
 
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
-	virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
-	virtual void PaintChildren(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+	void PaintChildren(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
 
-	virtual void ChildNotify(Gump *child, uint32 message) override;
+	void ChildNotify(Gump *child, uint32 message) override;
 
-	virtual bool OnKeyDown(int key, int mod) override;
+	bool OnKeyDown(int key, int mod) override;
 
-	virtual void run() override;
+	void run() override;
 
 #if 0
 	virtual uint16 TraceObjId(int32 mx, int32 my);
diff --git a/engines/ultima/ultima8/gumps/quit_gump.h b/engines/ultima/ultima8/gumps/quit_gump.h
index 32e976da81d..850be4b8045 100644
--- a/engines/ultima/ultima8/gumps/quit_gump.h
+++ b/engines/ultima/ultima8/gumps/quit_gump.h
@@ -34,15 +34,15 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	QuitGump();
-	virtual ~QuitGump(void);
+	~QuitGump(void) override;
 
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
-	virtual bool OnKeyDown(int key, int mod) override;
-	virtual bool OnTextInput(int unicode) override;
-	virtual void ChildNotify(Gump *child, uint32 message) override;
+	bool OnKeyDown(int key, int mod) override;
+	bool OnTextInput(int unicode) override;
+	void ChildNotify(Gump *child, uint32 message) override;
 
 	static void verifyQuit();
 	//! "QuitGump::verifyQuit" console command
@@ -50,7 +50,7 @@ public:
 
 	bool loadData(IDataSource *ids);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 	ObjId yesWidget, noWidget;
 };
 
diff --git a/engines/ultima/ultima8/gumps/readable_gump.h b/engines/ultima/ultima8/gumps/readable_gump.h
index fde6cff0cac..459a1a3b4ee 100644
--- a/engines/ultima/ultima8/gumps/readable_gump.h
+++ b/engines/ultima/ultima8/gumps/readable_gump.h
@@ -39,21 +39,21 @@ public:
 
 	ReadableGump();
 	ReadableGump(ObjId owner, uint16 shape, int font, Std::string msg);
-	virtual ~ReadableGump();
+	~ReadableGump() override;
 
 	// Close on mouse click on key press
-	virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
-	virtual bool OnKeyDown(int key, int mod) override;
+	Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+	bool OnKeyDown(int key, int mod) override;
 
 	// Init the gump, call after construction
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
 	INTRINSIC(I_readGrave);
 	INTRINSIC(I_readPlaque);
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/resizable_gump.h b/engines/ultima/ultima8/gumps/resizable_gump.h
index eac04640669..2a7753c29cb 100644
--- a/engines/ultima/ultima8/gumps/resizable_gump.h
+++ b/engines/ultima/ultima8/gumps/resizable_gump.h
@@ -36,7 +36,7 @@ namespace Ultima8 {
 class ResizableGump : public Gump {
 public:
 	ResizableGump(int x, int y, int width, int height);
-	virtual ~ResizableGump();
+	~ResizableGump() override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/scaler_gump.h b/engines/ultima/ultima8/gumps/scaler_gump.h
index 26a9a524698..2d3d35edf0e 100644
--- a/engines/ultima/ultima8/gumps/scaler_gump.h
+++ b/engines/ultima/ultima8/gumps/scaler_gump.h
@@ -47,13 +47,13 @@ public:
 	//! \param sheight1 height before scaling (usually game-height)
 	//! \param scaler1 scaler to use
 	ScalerGump(int32 x, int32 y, int32 width, int32 height);
-	virtual ~ScalerGump(void);
+	~ScalerGump(void) override;
 
-	virtual void Paint(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
-	virtual void RenderSurfaceChanged() override;
-	virtual void ParentToGump(int32 &px, int32 &py,
+	void Paint(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+	void RenderSurfaceChanged() override;
+	void ParentToGump(int32 &px, int32 &py,
 	                          PointRoundDir r = ROUND_TOPLEFT) override;
-	virtual void GumpToParent(int32 &gx, int32 &gy,
+	void GumpToParent(int32 &gx, int32 &gy,
 	                          PointRoundDir r = ROUND_TOPLEFT) override;
 
 	void GetScaledSize(int32 &sw, int32 &sh) const {
diff --git a/engines/ultima/ultima8/gumps/scroll_gump.h b/engines/ultima/ultima8/gumps/scroll_gump.h
index dbc8cec66d6..30f43651d0d 100644
--- a/engines/ultima/ultima8/gumps/scroll_gump.h
+++ b/engines/ultima/ultima8/gumps/scroll_gump.h
@@ -38,16 +38,16 @@ public:
 
 	ScrollGump();
 	ScrollGump(ObjId owner, Std::string msg);
-	virtual ~ScrollGump();
+	~ScrollGump() override;
 
 	// Go to the next page on mouse click
-	virtual void OnMouseClick(int button, int32 mx, int32 my) override;
+	void OnMouseClick(int button, int32 mx, int32 my) override;
 
 	// Close on double click
-	virtual void OnMouseDouble(int button, int32 mx, int32 my) override;
+	void OnMouseDouble(int button, int32 mx, int32 my) override;
 
 	// Init the gump, call after construction
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
 	INTRINSIC(I_readScroll);
 
@@ -57,7 +57,7 @@ protected:
 public:
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/shape_viewer_gump.h b/engines/ultima/ultima8/gumps/shape_viewer_gump.h
index 5ab650f8d61..a3f402d27b2 100644
--- a/engines/ultima/ultima8/gumps/shape_viewer_gump.h
+++ b/engines/ultima/ultima8/gumps/shape_viewer_gump.h
@@ -42,19 +42,19 @@ public:
 	ShapeViewerGump(int width, int height,
 	                Std::vector<Std::pair<Std::string, ShapeArchive *> > &flexes,
 	                uint32 _Flags = 0, int32 layer = LAYER_MODAL);
-	virtual ~ShapeViewerGump(void);
+	~ShapeViewerGump(void) override;
 
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
-	virtual bool OnKeyDown(int key, int mod) override;
-	virtual bool OnTextInput(int unicode) override;
+	bool OnKeyDown(int key, int mod) override;
+	bool OnTextInput(int unicode) override;
 
 	static void U8ShapeViewer();
 	static void ConCmd_U8ShapeViewer(const Console::ArgvType &argv);
 
 	bool loadData(IDataSource *ids);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	Std::vector<Std::pair<Std::string, ShapeArchive *> > flexes;
 	unsigned int curflex;
diff --git a/engines/ultima/ultima8/gumps/slider_gump.h b/engines/ultima/ultima8/gumps/slider_gump.h
index 5593f5e58c2..5761d5cc05c 100644
--- a/engines/ultima/ultima8/gumps/slider_gump.h
+++ b/engines/ultima/ultima8/gumps/slider_gump.h
@@ -39,25 +39,25 @@ public:
 	SliderGump();
 	SliderGump(int x, int y, int16 min, int16 max,
 	           int16 value, int16 delta = 1);
-	virtual ~SliderGump(void);
+	~SliderGump(void) override;
 
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
-	virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
-	virtual void Close(bool no_del = false) override;
-	virtual void ChildNotify(Gump *child, uint32 message) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
+	void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+	void Close(bool no_del = false) override;
+	void ChildNotify(Gump *child, uint32 message) override;
 
 	void setUsecodeNotify(UCProcess *ucp);
 
 	// Dragging
-	virtual bool StartDraggingChild(Gump *gump, int32 mx, int32 my) override;
-	virtual void DraggingChild(Gump *gump, int mx, int my) override;
-	virtual void StopDraggingChild(Gump *gump) override;
+	bool StartDraggingChild(Gump *gump, int32 mx, int32 my) override;
+	void DraggingChild(Gump *gump, int mx, int my) override;
+	void StopDraggingChild(Gump *gump) override;
 
-	virtual bool OnKeyDown(int key, int mod) override;
+	bool OnKeyDown(int key, int mod) override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	int16 min;
 	int16 max;
diff --git a/engines/ultima/ultima8/gumps/target_gump.h b/engines/ultima/ultima8/gumps/target_gump.h
index a5ce202f5c1..51270936b8e 100644
--- a/engines/ultima/ultima8/gumps/target_gump.h
+++ b/engines/ultima/ultima8/gumps/target_gump.h
@@ -39,19 +39,19 @@ public:
 	TargetGump();
 	TargetGump(int x, int y);
 
-	virtual ~TargetGump(void);
+	~TargetGump(void) override;
 
-	virtual bool PointOnGump(int mx, int my) override;
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
-	virtual void Close(bool no_del = false) override;
-	virtual void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
-	virtual void OnMouseUp(int button, int32 mx, int32 my) override;
+	bool PointOnGump(int mx, int my) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
+	void Close(bool no_del = false) override;
+	void PaintThis(RenderSurface *surf, int32 lerp_factor, bool scaled) override;
+	void OnMouseUp(int button, int32 mx, int32 my) override;
 
 	INTRINSIC(I_target);
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 private:
 	bool target_tracing;
diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.h b/engines/ultima/ultima8/gumps/u8_save_gump.h
index dd56cb4d642..11641b998d9 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.h
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.h
@@ -38,16 +38,16 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	U8SaveGump(bool save, int page);
-	virtual ~U8SaveGump();
+	~U8SaveGump() override;
 
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
-	virtual void Close(bool no_del = false) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
+	void Close(bool no_del = false) override;
 
-	virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
-	virtual void OnMouseClick(int button, int32 mx, int32 my) override;
-	virtual bool OnKeyDown(int key, int mod) override;
-	virtual void ChildNotify(Gump *child, uint32 message) override;
-	virtual void OnFocus(bool gain) override;
+	Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+	void OnMouseClick(int button, int32 mx, int32 my) override;
+	bool OnKeyDown(int key, int mod) override;
+	void ChildNotify(Gump *child, uint32 message) override;
+	void OnFocus(bool gain) override;
 
 	static Std::string getFilename(int index);
 
diff --git a/engines/ultima/ultima8/gumps/widgets/button_widget.h b/engines/ultima/ultima8/gumps/widgets/button_widget.h
index 8c9e1f55d0a..4daf73b0693 100644
--- a/engines/ultima/ultima8/gumps/widgets/button_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/button_widget.h
@@ -41,19 +41,19 @@ public:
 	             int32 layer = LAYER_NORMAL);
 	ButtonWidget(int X, int Y, FrameID frame_up, FrameID frame_down,
 	             bool mouseOver = false, int32 layer = LAYER_NORMAL);
-	virtual ~ButtonWidget(void);
+	~ButtonWidget(void) override;
 
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
-	virtual uint16 TraceObjId(int32 mx, int32 my) override;
-	virtual bool PointOnGump(int mx, int my) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
+	uint16 TraceObjId(int32 mx, int32 my) override;
+	bool PointOnGump(int mx, int my) override;
 
-	virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
-	virtual void OnMouseUp(int button, int32 mx, int32 my) override;
-	virtual void OnMouseClick(int button, int32 mx, int32 my) override;
-	virtual void OnMouseDouble(int button, int32 mx, int32 my) override;
+	Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+	void OnMouseUp(int button, int32 mx, int32 my) override;
+	void OnMouseClick(int button, int32 mx, int32 my) override;
+	void OnMouseDouble(int button, int32 mx, int32 my) override;
 
-	virtual void OnMouseOver() override;
-	virtual void OnMouseLeft() override;
+	void OnMouseOver() override;
+	void OnMouseLeft() override;
 
 	//! return the textwidget's vlead, or 0 for an image button
 	int getVlead();
@@ -80,7 +80,7 @@ protected:
 public:
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/widgets/edit_widget.h b/engines/ultima/ultima8/gumps/widgets/edit_widget.h
index 92c11e072db..a0be97fe0bd 100644
--- a/engines/ultima/ultima8/gumps/widgets/edit_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/edit_widget.h
@@ -44,17 +44,17 @@ public:
 	EditWidget(int X, int Y, Std::string txt, bool gamefont, int fontnum,
 	           int width, int height, unsigned int maxlength = 0,
 	           bool multiline = false);
-	virtual ~EditWidget(void);
+	~EditWidget(void) override;
 
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
-	virtual void PaintComposited(RenderSurface *surf, int32 lerp_factor, int32 sx, int32 sy) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintComposited(RenderSurface *surf, int32 lerp_factor, int32 sx, int32 sy) override;
 
-	virtual Gump *OnMouseMotion(int32 mx, int32 my) override;
-	virtual bool OnKeyDown(int key, int mod) override;
-	virtual bool OnKeyUp(int key) override;
-	virtual bool OnTextInput(int unicode) override;
+	Gump *OnMouseMotion(int32 mx, int32 my) override;
+	bool OnKeyDown(int key, int mod) override;
+	bool OnKeyUp(int key) override;
+	bool OnTextInput(int unicode) override;
 
 	//! get the current text
 	Std::string getText() const {
diff --git a/engines/ultima/ultima8/gumps/widgets/game_widget.h b/engines/ultima/ultima8/gumps/widgets/game_widget.h
index 47566c9a63d..d34e72b019b 100644
--- a/engines/ultima/ultima8/gumps/widgets/game_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/game_widget.h
@@ -37,21 +37,21 @@ public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	GameWidget(int X, int Y, istring &game);
-	virtual ~GameWidget();
+	~GameWidget() override;
 
 	istring getGameName();
 
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
 
-	virtual uint16 TraceObjId(int32 mx, int32 my) override;
+	uint16 TraceObjId(int32 mx, int32 my) override;
 
-	virtual void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
-	virtual Gump *OnMouseDown(int button, int32 mx, int32 my) override;
-	virtual void OnMouseOver() override;
-	virtual void OnMouseLeft() override;
+	Gump *OnMouseDown(int button, int32 mx, int32 my) override;
+	void OnMouseOver() override;
+	void OnMouseLeft() override;
 
-	virtual void ChildNotify(Gump *child, uint32 message) override;
+	void ChildNotify(Gump *child, uint32 message) override;
 
 	enum Message {
 		GAME_PLAY     = 1,
diff --git a/engines/ultima/ultima8/gumps/widgets/sliding_widget.h b/engines/ultima/ultima8/gumps/widgets/sliding_widget.h
index be125200fd1..305e123abab 100644
--- a/engines/ultima/ultima8/gumps/widgets/sliding_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/sliding_widget.h
@@ -35,14 +35,14 @@ public:
 
 	SlidingWidget();
 	SlidingWidget(int x, int y, Shape *shape, uint32 framenum);
-	virtual ~SlidingWidget();
+	~SlidingWidget() override;
 
-	virtual void InitGump(Gump *newparent, bool take_focus = true) override;
-	virtual uint16 TraceObjId(int32 mx, int32 my) override;
+	void InitGump(Gump *newparent, bool take_focus = true) override;
+	uint16 TraceObjId(int32 mx, int32 my) override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/gumps/widgets/text_widget.h b/engines/ultima/ultima8/gumps/widgets/text_widget.h
index ecbe4ba9506..6509a1b431f 100644
--- a/engines/ultima/ultima8/gumps/widgets/text_widget.h
+++ b/engines/ultima/ultima8/gumps/widgets/text_widget.h
@@ -58,17 +58,17 @@ public:
 	TextWidget(int X, int Y, Std::string txt, bool gamefont, int fontnum,
 	           int width = 0, int height = 0,
 	           Font::TextAlign align = Font::TEXT_LEFT);
-	virtual ~TextWidget(void);
+	~TextWidget(void) override;
 
 	// Init the gump, call after construction
-	virtual void            InitGump(Gump *newparent, bool take_focus = true) override;
+	void            InitGump(Gump *newparent, bool take_focus = true) override;
 
 	// Overloadable method to Paint just this Gump (RenderSurface is relative to this)
-	virtual void            PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
+	void            PaintThis(RenderSurface *, int32 lerp_factor, bool scaled) override;
 
-	virtual void            PaintComposited(RenderSurface *surf, int32 lerp_factor, int32 scalex, int32 scaley) override;
+	void            PaintComposited(RenderSurface *surf, int32 lerp_factor, int32 scalex, int32 scaley) override;
 
-	virtual Gump *OnMouseMotion(int32 mx, int32 my) override;
+	Gump *OnMouseMotion(int32 mx, int32 my) override;
 
 	//! display the next part of the text
 	//! \return false if there is no more text to display
@@ -102,7 +102,7 @@ public:
 	bool loadData(IDataSource *ids, uint32 version);
 
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/kernel/delay_process.h b/engines/ultima/ultima8/kernel/delay_process.h
index 17bfd0f26c2..8f8d5985aa0 100644
--- a/engines/ultima/ultima8/kernel/delay_process.h
+++ b/engines/ultima/ultima8/kernel/delay_process.h
@@ -36,17 +36,17 @@ namespace Ultima8 {
 class DelayProcess : public Process {
 public:
 	explicit DelayProcess(int count_ = 0);
-	virtual ~DelayProcess();
+	~DelayProcess() override;
 
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
-	virtual void dumpInfo() override;
+	void dumpInfo() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	int count;
 };
diff --git a/engines/ultima/ultima8/kernel/joystick.h b/engines/ultima/ultima8/kernel/joystick.h
index 16bbe9b87cc..5e096120942 100644
--- a/engines/ultima/ultima8/kernel/joystick.h
+++ b/engines/ultima/ultima8/kernel/joystick.h
@@ -45,15 +45,15 @@ class JoystickCursorProcess : public Process {
 public:
 	JoystickCursorProcess();
 	JoystickCursorProcess(Joystick js_, int x_axis_, int y_axis_);
-	virtual ~JoystickCursorProcess();
+	~JoystickCursorProcess() override;
 
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	Joystick js;
 	int x_axis, y_axis;
diff --git a/engines/ultima/ultima8/kernel/segmented_allocator.h b/engines/ultima/ultima8/kernel/segmented_allocator.h
index f8ec628fcf8..65014e0fb0b 100644
--- a/engines/ultima/ultima8/kernel/segmented_allocator.h
+++ b/engines/ultima/ultima8/kernel/segmented_allocator.h
@@ -34,21 +34,21 @@ namespace Ultima8 {
 class SegmentedAllocator: public Allocator {
 public:
 	SegmentedAllocator(size_t nodeCapacity, uint32 nodes);
-	virtual ~SegmentedAllocator();
+	~SegmentedAllocator() override;
 
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void *allocate(size_t size) override;
+	void *allocate(size_t size) override;
 
-	virtual Pool *findPool(void *ptr) override;
+	Pool *findPool(void *ptr) override;
 
-	virtual void freeResources() override;
+	void freeResources() override;
 
-	virtual size_t getCapacity() override {
+	size_t getCapacity() override {
 		return nodeCapacity;
 	}
 
-	virtual void printInfo() override;
+	void printInfo() override;
 
 private:
 	Std::vector<SegmentedPool *> pools;
diff --git a/engines/ultima/ultima8/kernel/segmented_pool.h b/engines/ultima/ultima8/kernel/segmented_pool.h
index ac6068ea3f0..4fc7fe5974f 100644
--- a/engines/ultima/ultima8/kernel/segmented_pool.h
+++ b/engines/ultima/ultima8/kernel/segmented_pool.h
@@ -44,25 +44,25 @@ struct SegmentedPoolNode;
 class SegmentedPool: public Pool {
 public:
 	SegmentedPool(size_t nodeCapacity, uint32 nodes);
-	virtual ~SegmentedPool();
+	~SegmentedPool() override;
 
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void *allocate(size_t size) override;
-	virtual void deallocate(void *ptr) override;
+	void *allocate(size_t size) override;
+	void deallocate(void *ptr) override;
 
-	virtual bool isFull() override {
+	bool isFull() override {
 		return freeNodeCount == 0;
 	}
-	virtual bool isEmpty() override {
+	bool isEmpty() override {
 		return freeNodeCount == nodes;
 	}
 
-	virtual bool inPool(void *ptr) override {
+	bool inPool(void *ptr) override {
 		return (ptr > startOfPool && ptr < endOfPool);
 	}
 
-	virtual void printInfo() override;
+	void printInfo() override;
 
 	size_t getNodeCapacity() {
 		return nodeCapacity;
diff --git a/engines/ultima/ultima8/misc/console.h b/engines/ultima/ultima8/misc/console.h
index 471e0142546..8732d05ca1f 100644
--- a/engines/ultima/ultima8/misc/console.h
+++ b/engines/ultima/ultima8/misc/console.h
@@ -408,7 +408,7 @@ private:
 public:
 	ConsoleStream() : Common::WriteStream(), _precision(Std::dec) {}
 
-	virtual int32 pos() const override {
+	int32 pos() const override {
 		return 0;
 	}
 
@@ -447,7 +447,7 @@ public:
 
 template<class T>
 class console_ostream : public ConsoleStream {
-	virtual uint32 write(const void *dataPtr, uint32 dataSize) override {
+	uint32 write(const void *dataPtr, uint32 dataSize) override {
 		Common::String str((const char *)dataPtr, (const char *)dataPtr + dataSize);
 		debugN("%s", str.c_str());
 		return dataSize;
@@ -468,7 +468,7 @@ extern console_ostream<char>        *ppout;
 template<class T>
 class console_err_ostream : public ConsoleStream {
 public:
-	virtual uint32 write(const void *dataPtr, uint32 dataSize) override {
+	uint32 write(const void *dataPtr, uint32 dataSize) override {
 		Common::String str((const char *)dataPtr, dataSize);
 		::warning("%s", str.c_str());
 		return str.size();
diff --git a/engines/ultima/ultima8/misc/debugger.h b/engines/ultima/ultima8/misc/debugger.h
index a5f90f1d8ab..99717fde763 100644
--- a/engines/ultima/ultima8/misc/debugger.h
+++ b/engines/ultima/ultima8/misc/debugger.h
@@ -38,7 +38,7 @@ private:
 	bool cmdSpell(int argc, const char **argv);
 public:
 	Debugger();
-    virtual ~Debugger() {}
+    ~Debugger() override {}
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/misc/istring.h b/engines/ultima/ultima8/misc/istring.h
index f0b67c72701..e5ca3d56858 100644
--- a/engines/ultima/ultima8/misc/istring.h
+++ b/engines/ultima/ultima8/misc/istring.h
@@ -70,9 +70,9 @@ public:
 	istring(const String &str) : Std::string(str) {}
 	explicit istring(char c) : Std::string(c) {}
 	istring(size_t n, char c) : Std::string(n, c) {}
-	virtual ~istring() {}
+	~istring() override {}
 
-	virtual int Compare(const string &s) const override {
+	int Compare(const string &s) const override {
 		return compareToIgnoreCase(s);
 	}
 
diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h
index 42b54f46c74..040c262e38d 100644
--- a/engines/ultima/ultima8/ultima8.h
+++ b/engines/ultima/ultima8/ultima8.h
@@ -201,23 +201,23 @@ private:
 	void handleDelayedEvents();
 protected:
 	// Engine APIs
-	virtual Common::Error run() override;
+	Common::Error run() override;
 
-	virtual bool initialize() override;
+	bool initialize() override;
 
-	virtual void DeclareArgs() override;
+	void DeclareArgs() override;
 
 	/**
 	 * Returns the data archive folder and version that's required
 	 */
-	virtual bool isDataRequired(Common::String &folder, int &majorVersion, int &minorVersion) override;
+	bool isDataRequired(Common::String &folder, int &majorVersion, int &minorVersion) override;
 public:
 	PointScaler point_scaler;
 public:
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	Ultima8Engine(OSystem *syst, const Ultima::UltimaGameDescription *gameDesc);
-	virtual ~Ultima8Engine();
+	~Ultima8Engine() override;
 	void GUIError(const Common::String &msg);
 
 	static Ultima8Engine *get_instance() {
@@ -241,14 +241,14 @@ public:
 		return _screen;
 	}
 
-	virtual GUI::Debugger *getDebugger() override;
-	virtual Graphics::Screen *getScreen() const override;
+	GUI::Debugger *getDebugger() override;
+	Graphics::Screen *getScreen() const override;
 
-	virtual void runGame() override;
+	void runGame() override;
 	virtual void handleEvent(const Common::Event &event);
 
-	virtual void paint() override;
-	virtual bool isPainting() override {
+	void paint() override;
+	bool isPainting() override {
 		return _painting;
 	}
 
@@ -310,22 +310,22 @@ public:
 	/**
 	 * Notifies the engine that the sound settings may have changed
 	 */
-	virtual void syncSoundSettings() override;
+	void syncSoundSettings() override;
 
 	/**
 	 * Returns true if a savegame can be loaded
 	 */
-	virtual bool canLoadGameStateCurrently(bool isAutosave = false) override { return true; }
+	bool canLoadGameStateCurrently(bool isAutosave = false) override { return true; }
 
 	/**
 	 * Returns true if the game can be saved
 	 */
-	virtual bool canSaveGameStateCurrently(bool isAutosave = false) override;
+	bool canSaveGameStateCurrently(bool isAutosave = false) override;
 
 	/**
 	 * Load a game state
 	 */
-	virtual Common::Error loadGameState(int slot) override;
+	Common::Error loadGameState(int slot) override;
 
 	/**
 	 * Save a game state.
@@ -334,7 +334,7 @@ public:
 	 * @param isAutosave If true, autosave is being created
 	 * @return returns kNoError on success, else an error code.
 	 */
-	virtual Common::Error saveGameState(int slot, const Common::String &desc, bool isAutosave) override;
+	Common::Error saveGameState(int slot, const Common::String &desc, bool isAutosave) override;
 
 	//! save a game
 	//! \param filename the file to save to
diff --git a/engines/ultima/ultima8/usecode/uc_process.h b/engines/ultima/ultima8/usecode/uc_process.h
index 6127bdf30db..e7d6214741a 100644
--- a/engines/ultima/ultima8/usecode/uc_process.h
+++ b/engines/ultima/ultima8/usecode/uc_process.h
@@ -42,14 +42,14 @@ public:
 	UCProcess();
 	UCProcess(uint16 classid_, uint16 offset_, uint32 this_ptr = 0,
 	          int thissize = 0, const uint8 *args = 0, int argsize = 0);
-	~UCProcess();
+	~UCProcess() override;
 
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
-	virtual void terminate() override;
+	void terminate() override;
 
 	void freeOnTerminate(uint16 index, int type_);
 
@@ -58,11 +58,11 @@ public:
 	}
 
 	//! dump some info about this process to pout
-	virtual void dumpInfo() override;
+	void dumpInfo() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	void load(uint16 classid_, uint16 offset_, uint32 this_ptr = 0,
 	          int thissize = 0, const uint8 *args = 0, int argsize = 0);
diff --git a/engines/ultima/ultima8/usecode/uc_stack.h b/engines/ultima/ultima8/usecode/uc_stack.h
index 2791464aa2a..e4ff73451f5 100644
--- a/engines/ultima/ultima8/usecode/uc_stack.h
+++ b/engines/ultima/ultima8/usecode/uc_stack.h
@@ -166,7 +166,7 @@ public:
 class DynamicUCStack : public BaseUCStack {
 public:
 	DynamicUCStack(uint32 len = 0x1000) : BaseUCStack(len, new uint8[len]) { }
-	virtual ~DynamicUCStack() {
+	~DynamicUCStack() override {
 		delete [] buf;
 	}
 
@@ -182,7 +182,7 @@ class UCStack : public BaseUCStack {
 	uint8   buf_array[0x1000];
 public:
 	UCStack() : BaseUCStack(0x1000, buf_array) { }
-	virtual ~UCStack() { }
+	~UCStack() override { }
 
 	void save(ODataSource *ods);
 	bool load(IDataSource *ids, uint32 version);
diff --git a/engines/ultima/ultima8/usecode/usecode_flex.h b/engines/ultima/ultima8/usecode/usecode_flex.h
index 5bd6e5a1d45..69452942163 100644
--- a/engines/ultima/ultima8/usecode/usecode_flex.h
+++ b/engines/ultima/ultima8/usecode/usecode_flex.h
@@ -33,13 +33,13 @@ namespace Ultima8 {
 class UsecodeFlex : public Usecode, protected RawArchive {
 public:
 	UsecodeFlex(IDataSource *ds) : RawArchive(ds) { }
-	virtual ~UsecodeFlex() { }
+	~UsecodeFlex() override { }
 
-	virtual const uint8 *get_class(uint32 classid);
-	virtual uint32 get_class_size(uint32 classid);
-	virtual const char *get_class_name(uint32 classid);
-	virtual uint32 get_class_base_offset(uint32 classid);
-	virtual uint32 get_class_event_count(uint32 classid);
+	const uint8 *get_class(uint32 classid) override;
+	uint32 get_class_size(uint32 classid) override;
+	const char *get_class_name(uint32 classid) override;
+	uint32 get_class_base_offset(uint32 classid) override;
+	uint32 get_class_event_count(uint32 classid) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/actors/actor.h b/engines/ultima/ultima8/world/actors/actor.h
index 9e6fa055bc3..c8eded50171 100644
--- a/engines/ultima/ultima8/world/actors/actor.h
+++ b/engines/ultima/ultima8/world/actors/actor.h
@@ -39,7 +39,7 @@ class Actor : public Container {
 	friend class AnimationTracker;
 public:
 	Actor();
-	~Actor();
+	~Actor() override;
 
 	int16 getStr() const {
 		return strength;
@@ -146,7 +146,7 @@ public:
 
 	virtual void teleport(int mapnum, int32 x, int32 y, int32 z);
 
-	virtual bool removeItem(Item *item) override;
+	bool removeItem(Item *item) override;
 
 	//! \return the PID of the spawned usecode process if any (otherwise 0)
 	uint16 schedule(uint32 time);
@@ -159,7 +159,7 @@ public:
 	virtual int16 getAttackingDex();
 	virtual int16 getDefendingDex();
 
-	virtual uint16 getDamageType() override;
+	uint16 getDamageType() override;
 	virtual int getDamageAmount();
 
 	//! calculate the damage an attack against this Actor does.
@@ -172,7 +172,7 @@ public:
 	//! receive a hit
 	//! \param damage base damage (or zero to use attacker's default damage)
 	//! \param type damage type (or zero to use attacker's default type)
-	virtual void receiveHit(uint16 other, int dir, int damage, uint16 type) override;
+	void receiveHit(uint16 other, int dir, int damage, uint16 type) override;
 
 	//! die
 	//! \param damageType damage type that caused the death
@@ -212,9 +212,9 @@ public:
 	//! create an actor, assign objid, make it ethereal and load monster stats.
 	static Actor *createActor(uint32 shape, uint32 frame);
 
-	virtual uint16 assignObjId() override; // assign an NPC objid
+	uint16 assignObjId() override; // assign an NPC objid
 
-	virtual void dumpInfo() override;
+	void dumpInfo() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 
@@ -292,7 +292,7 @@ public:
 	};
 
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	int16 strength;
 	int16 dexterity;
diff --git a/engines/ultima/ultima8/world/actors/actor_anim_process.h b/engines/ultima/ultima8/world/actors/actor_anim_process.h
index 72f6bc85c30..a0e22511777 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim_process.h
+++ b/engines/ultima/ultima8/world/actors/actor_anim_process.h
@@ -44,11 +44,11 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
-	virtual void terminate() override;
+	void terminate() override;
 
-	virtual void dumpInfo() override;
+	void dumpInfo() override;
 
 	Animation::Sequence getAction() const {
 		return action;
@@ -56,7 +56,7 @@ public:
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	virtual bool init();
 
diff --git a/engines/ultima/ultima8/world/actors/actor_bark_notify_process.h b/engines/ultima/ultima8/world/actors/actor_bark_notify_process.h
index 17ef63e0877..673406bfb74 100644
--- a/engines/ultima/ultima8/world/actors/actor_bark_notify_process.h
+++ b/engines/ultima/ultima8/world/actors/actor_bark_notify_process.h
@@ -34,13 +34,13 @@ public:
 
 	ActorBarkNotifyProcess();
 	ActorBarkNotifyProcess(uint16 it);
-	virtual ~ActorBarkNotifyProcess(void);
+	~ActorBarkNotifyProcess(void) override;
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/actors/ambush_process.h b/engines/ultima/ultima8/world/actors/ambush_process.h
index 2a2d34a1b21..6be6aab831e 100644
--- a/engines/ultima/ultima8/world/actors/ambush_process.h
+++ b/engines/ultima/ultima8/world/actors/ambush_process.h
@@ -38,11 +38,11 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	uint32 delaycount;
 };
diff --git a/engines/ultima/ultima8/world/actors/avatar_death_process.h b/engines/ultima/ultima8/world/actors/avatar_death_process.h
index b8148261248..8a297565f2b 100644
--- a/engines/ultima/ultima8/world/actors/avatar_death_process.h
+++ b/engines/ultima/ultima8/world/actors/avatar_death_process.h
@@ -37,11 +37,11 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/actors/avatar_gravity_process.h b/engines/ultima/ultima8/world/actors/avatar_gravity_process.h
index 6378864f4e4..0a50075421c 100644
--- a/engines/ultima/ultima8/world/actors/avatar_gravity_process.h
+++ b/engines/ultima/ultima8/world/actors/avatar_gravity_process.h
@@ -38,11 +38,11 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	bool cling;
 };
diff --git a/engines/ultima/ultima8/world/actors/avatar_mover_process.h b/engines/ultima/ultima8/world/actors/avatar_mover_process.h
index 5e6853a5730..6692d915dce 100644
--- a/engines/ultima/ultima8/world/actors/avatar_mover_process.h
+++ b/engines/ultima/ultima8/world/actors/avatar_mover_process.h
@@ -33,12 +33,12 @@ namespace Ultima8 {
 class AvatarMoverProcess : public Process {
 public:
 	AvatarMoverProcess();
-	virtual ~AvatarMoverProcess();
+	~AvatarMoverProcess() override;
 
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	void OnMouseDown(int button, int32 mx, int32 my);
 	void OnMouseUp(int button);
@@ -49,7 +49,7 @@ public:
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	void handleHangingMode();
 	void handleCombatMode();
diff --git a/engines/ultima/ultima8/world/actors/clear_feign_death_process.h b/engines/ultima/ultima8/world/actors/clear_feign_death_process.h
index 87b70ccbc33..be3b62badd4 100644
--- a/engines/ultima/ultima8/world/actors/clear_feign_death_process.h
+++ b/engines/ultima/ultima8/world/actors/clear_feign_death_process.h
@@ -38,11 +38,11 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/actors/combat_process.h b/engines/ultima/ultima8/world/actors/combat_process.h
index 466a7b622db..16859b86d7f 100644
--- a/engines/ultima/ultima8/world/actors/combat_process.h
+++ b/engines/ultima/ultima8/world/actors/combat_process.h
@@ -38,19 +38,19 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
-	virtual void terminate() override;
+	void terminate() override;
 
 	ObjId getTarget();
 	void setTarget(ObjId target_);
 	ObjId seekTarget();
 
-	virtual void dumpInfo() override;
+	void dumpInfo() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	bool isValidTarget(Actor *target_);
 	bool isEnemy(Actor *target_);
diff --git a/engines/ultima/ultima8/world/actors/grant_peace_process.h b/engines/ultima/ultima8/world/actors/grant_peace_process.h
index 875b1095c98..7bd0f1d895b 100644
--- a/engines/ultima/ultima8/world/actors/grant_peace_process.h
+++ b/engines/ultima/ultima8/world/actors/grant_peace_process.h
@@ -39,13 +39,13 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	INTRINSIC(I_castGrantPeace);
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	bool havetarget;
 };
diff --git a/engines/ultima/ultima8/world/actors/heal_process.h b/engines/ultima/ultima8/world/actors/heal_process.h
index f0dce05ffdd..dd89a964fd5 100644
--- a/engines/ultima/ultima8/world/actors/heal_process.h
+++ b/engines/ultima/ultima8/world/actors/heal_process.h
@@ -36,13 +36,13 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	INTRINSIC(I_feedAvatar);
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	void feedAvatar(uint16 food);
 
diff --git a/engines/ultima/ultima8/world/actors/loiter_process.h b/engines/ultima/ultima8/world/actors/loiter_process.h
index 485cbc2bbd1..15156e1df35 100644
--- a/engines/ultima/ultima8/world/actors/loiter_process.h
+++ b/engines/ultima/ultima8/world/actors/loiter_process.h
@@ -38,11 +38,11 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	int32 count;
 };
diff --git a/engines/ultima/ultima8/world/actors/main_actor.h b/engines/ultima/ultima8/world/actors/main_actor.h
index cdc8fedcf47..1b9ca27cee6 100644
--- a/engines/ultima/ultima8/world/actors/main_actor.h
+++ b/engines/ultima/ultima8/world/actors/main_actor.h
@@ -33,13 +33,13 @@ struct WeaponOverlayFrame;
 class MainActor : public Actor {
 public:
 	MainActor();
-	virtual ~MainActor();
+	~MainActor() override;
 
-	virtual bool CanAddItem(Item *item, bool checkwghtvol = false) override;
-	virtual bool addItem(Item *item, bool checkwghtvol = false) override;
+	bool CanAddItem(Item *item, bool checkwghtvol = false) override;
+	bool addItem(Item *item, bool checkwghtvol = false) override;
 
 	//! teleport to the given location on the given map
-	virtual void teleport(int mapNum_, int32 x_, int32 y_, int32 z_) override;
+	void teleport(int mapNum_, int32 x_, int32 y_, int32 z_) override;
 
 	//! teleport to a teleport-destination egg
 	//! \param mapnum The map to teleport to
@@ -66,20 +66,20 @@ public:
 	void accumulateInt(int n);
 
 	//! Get the GravityProcess of this Item, creating it if necessary
-	virtual GravityProcess *ensureGravityProcess() override;
+	GravityProcess *ensureGravityProcess() override;
 
-	virtual uint32 getArmourClass() override;
-	virtual uint16 getDefenseType() override;
-	virtual int16 getAttackingDex() override;
-	virtual int16 getDefendingDex() override;
+	uint32 getArmourClass() override;
+	uint16 getDefenseType() override;
+	int16 getAttackingDex() override;
+	int16 getDefendingDex() override;
 
-	virtual uint16 getDamageType() override;
-	virtual int getDamageAmount() override;
+	uint16 getDamageType() override;
+	int getDamageAmount() override;
 
-	virtual void setInCombat() override;
-	virtual void clearInCombat() override;
+	void setInCombat() override;
+	void clearInCombat() override;
 
-	virtual ProcId die(uint16 DamageType) override;
+	ProcId die(uint16 DamageType) override;
 
 	Std::string getName() {
 		return name;
@@ -138,7 +138,7 @@ public:
 
 
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	void useInventoryItem(uint32 shapenum);
 
diff --git a/engines/ultima/ultima8/world/actors/pathfinder_process.h b/engines/ultima/ultima8/world/actors/pathfinder_process.h
index 7be8280982d..32485cd7380 100644
--- a/engines/ultima/ultima8/world/actors/pathfinder_process.h
+++ b/engines/ultima/ultima8/world/actors/pathfinder_process.h
@@ -37,19 +37,19 @@ public:
 	PathfinderProcess();
 	PathfinderProcess(Actor *actor, ObjId item, bool hit = false);
 	PathfinderProcess(Actor *actor, int32 x, int32 y, int32 z);
-	virtual ~PathfinderProcess();
+	~PathfinderProcess() override;
 
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
-	virtual void terminate() override;
+	void run() override;
+	void terminate() override;
 
 //	virtual void terminate();
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	int32 targetx, targety, targetz;
 	ObjId targetitem;
diff --git a/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h b/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h
index f405078fb53..548aa3f41e0 100644
--- a/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h
+++ b/engines/ultima/ultima8/world/actors/quick_avatar_mover_process.h
@@ -33,13 +33,13 @@ public:
 	QuickAvatarMoverProcess();
 
 	QuickAvatarMoverProcess(int x, int y, int z, int _dir);
-	virtual ~QuickAvatarMoverProcess();
+	~QuickAvatarMoverProcess() override;
 
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
-	virtual void terminate() override;
+	void run() override;
+	void terminate() override;
 
 	static bool isQuarterSpeed() {
 		return quarter;
@@ -76,7 +76,7 @@ public:
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	int dx, dy, dz, dir;
 	static ProcId amp[6];
diff --git a/engines/ultima/ultima8/world/actors/resurrection_process.h b/engines/ultima/ultima8/world/actors/resurrection_process.h
index d89cbe3d332..c62c2cef5a3 100644
--- a/engines/ultima/ultima8/world/actors/resurrection_process.h
+++ b/engines/ultima/ultima8/world/actors/resurrection_process.h
@@ -38,11 +38,11 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/actors/scheduler_process.h b/engines/ultima/ultima8/world/actors/scheduler_process.h
index 17f70a28072..4e492307624 100644
--- a/engines/ultima/ultima8/world/actors/scheduler_process.h
+++ b/engines/ultima/ultima8/world/actors/scheduler_process.h
@@ -36,11 +36,11 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	uint32 lastRun;
 	uint16 nextActor;
diff --git a/engines/ultima/ultima8/world/actors/targeted_anim_process.h b/engines/ultima/ultima8/world/actors/targeted_anim_process.h
index 20a2364148a..72bb016520f 100644
--- a/engines/ultima/ultima8/world/actors/targeted_anim_process.h
+++ b/engines/ultima/ultima8/world/actors/targeted_anim_process.h
@@ -42,9 +42,9 @@ public:
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
-	virtual bool init() override;
+	bool init() override;
 
 	int32 x, y, z;
 };
diff --git a/engines/ultima/ultima8/world/actors/teleport_to_egg_process.h b/engines/ultima/ultima8/world/actors/teleport_to_egg_process.h
index c4f6864ad0f..3d94e6d4691 100644
--- a/engines/ultima/ultima8/world/actors/teleport_to_egg_process.h
+++ b/engines/ultima/ultima8/world/actors/teleport_to_egg_process.h
@@ -37,12 +37,12 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	int mapnum;
 	int teleport_id;
diff --git a/engines/ultima/ultima8/world/camera_process.h b/engines/ultima/ultima8/world/camera_process.h
index 4907d25f259..dd522ff4b38 100644
--- a/engines/ultima/ultima8/world/camera_process.h
+++ b/engines/ultima/ultima8/world/camera_process.h
@@ -46,12 +46,12 @@ public:
 	CameraProcess(int32 x, int32 y, int32 z);               // Goto location
 	CameraProcess(int32 x, int32 y, int32 z, int32 time);   // Scroll to location
 
-	virtual ~CameraProcess();
+	~CameraProcess() override;
 
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	// You will notice that this isn't the same as how Item::GetLerped works
 	void GetLerped(int32 &x, int32 &y, int32 &z, int32 factor, bool noupdate = false);
@@ -81,11 +81,11 @@ public:
 
 	void                    ItemMoved();
 
-	virtual void terminate() override;   // Terminate NOW!
+	void terminate() override;   // Terminate NOW!
 
 	bool loadData(IDataSource *ids, uint32 version);
 private:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	int32 sx, sy, sz;
 	int32 ex, ey, ez;
diff --git a/engines/ultima/ultima8/world/container.h b/engines/ultima/ultima8/world/container.h
index 27050f5b7d7..3a04b6c8d5b 100644
--- a/engines/ultima/ultima8/world/container.h
+++ b/engines/ultima/ultima8/world/container.h
@@ -40,7 +40,7 @@ class Container : public Item {
 	friend class PaperdollGump;
 public:
 	Container();
-	virtual ~Container();
+	~Container() override;
 
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
@@ -76,7 +76,7 @@ public:
 	void destroyContents();
 
 	//! Set flag on container and all its contents recursively
-	virtual void setFlagRecursively(uint32 mask) override;
+	void setFlagRecursively(uint32 mask) override;
 
 	//! Search the container for items matching the given loopscript.
 	//! \param itemlist The matching items are appended to this list
@@ -88,7 +88,7 @@ public:
 
 	//! Get the weight of the container and its contents
 	//! \return weight
-	virtual uint32 getTotalWeight() override;
+	uint32 getTotalWeight() override;
 
 	//! Get the container's capacity
 	virtual uint32 getCapacity();
@@ -98,15 +98,15 @@ public:
 
 	//! Assign self and contents an objID
 	//! \return the assiged ID
-	virtual ObjId assignObjId() override;
+	ObjId assignObjId() override;
 
 	//! Clear objIDs of self and contents
-	virtual void clearObjId() override;
+	void clearObjId() override;
 
 	//! Destroy self
-	virtual void destroy(bool delnow = false) override;
+	void destroy(bool delnow = false) override;
 
-	virtual void dumpInfo() override;
+	void dumpInfo() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 
@@ -115,7 +115,7 @@ public:
 
 protected:
 	//! save Container data
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	Std::list<Item *> contents;
 };
diff --git a/engines/ultima/ultima8/world/create_item_process.h b/engines/ultima/ultima8/world/create_item_process.h
index cbfbeedd280..aae553b11fe 100644
--- a/engines/ultima/ultima8/world/create_item_process.h
+++ b/engines/ultima/ultima8/world/create_item_process.h
@@ -38,13 +38,13 @@ public:
 	CreateItemProcess(uint32 shape, uint32 frame, uint16 quality,
 	                  uint16 flags, uint16 npcnum, uint16 mapnum,
 	                  uint32 extendedflags, int32 x, int32 y, int32 z);
-	virtual ~CreateItemProcess(void);
+	~CreateItemProcess(void) override;
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	uint32 shape;
 	uint32 frame;
diff --git a/engines/ultima/ultima8/world/destroy_item_process.h b/engines/ultima/ultima8/world/destroy_item_process.h
index 1121f1c2959..22c5992ce67 100644
--- a/engines/ultima/ultima8/world/destroy_item_process.h
+++ b/engines/ultima/ultima8/world/destroy_item_process.h
@@ -42,11 +42,11 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/egg.h b/engines/ultima/ultima8/world/egg.h
index 28198e8523a..10a79300ca7 100644
--- a/engines/ultima/ultima8/world/egg.h
+++ b/engines/ultima/ultima8/world/egg.h
@@ -32,7 +32,7 @@ class Egg : public Item {
 	friend class ItemFactory;
 public:
 	Egg();
-	virtual ~Egg();
+	~Egg() override;
 
 	ENABLE_RUNTIME_CLASSTYPE()
 
@@ -56,14 +56,14 @@ public:
 	virtual uint16 hatch();
 
 	//! The item has left the fast area
-	virtual void leaveFastArea() override;
+	void leaveFastArea() override;
 
 	//! clear the 'hatched' flag
 	void reset() {
 		hatched = false;
 	}
 
-	virtual void dumpInfo() override;
+	void dumpInfo() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 
@@ -75,7 +75,7 @@ public:
 	INTRINSIC(I_setEggId);
 
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	bool hatched;
 };
diff --git a/engines/ultima/ultima8/world/egg_hatcher_process.h b/engines/ultima/ultima8/world/egg_hatcher_process.h
index a3624c733af..c2921adc980 100644
--- a/engines/ultima/ultima8/world/egg_hatcher_process.h
+++ b/engines/ultima/ultima8/world/egg_hatcher_process.h
@@ -34,19 +34,19 @@ class Egg;
 class EggHatcherProcess : public Process {
 public:
 	EggHatcherProcess();
-	virtual ~EggHatcherProcess();
+	~EggHatcherProcess() override;
 
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	void addEgg(Egg *egg);
 	void addEgg(uint16 egg);
 
 	bool loadData(IDataSource *ids, uint32 version);
 private:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	Std::vector<uint16> eggs;
 };
diff --git a/engines/ultima/ultima8/world/fireball_process.h b/engines/ultima/ultima8/world/fireball_process.h
index 873c235cac8..19516695680 100644
--- a/engines/ultima/ultima8/world/fireball_process.h
+++ b/engines/ultima/ultima8/world/fireball_process.h
@@ -39,15 +39,15 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
-	virtual void terminate() override;
+	void terminate() override;
 
 	INTRINSIC(I_TonysBalls);
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	void explode();
 
diff --git a/engines/ultima/ultima8/world/glob_egg.h b/engines/ultima/ultima8/world/glob_egg.h
index 1abb7385499..fdb33f4259c 100644
--- a/engines/ultima/ultima8/world/glob_egg.h
+++ b/engines/ultima/ultima8/world/glob_egg.h
@@ -34,17 +34,17 @@ class GlobEgg : public Item {
 	friend class ItemFactory;
 public:
 	GlobEgg();
-	virtual ~GlobEgg();
+	~GlobEgg() override;
 
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
 	//! The item has entered the fast area
-	virtual void enterFastArea() override;
+	void enterFastArea() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/gravity_process.h b/engines/ultima/ultima8/world/gravity_process.h
index 3265b17220b..094a8a2aa28 100644
--- a/engines/ultima/ultima8/world/gravity_process.h
+++ b/engines/ultima/ultima8/world/gravity_process.h
@@ -44,14 +44,14 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
-	virtual void terminate() override;
+	void run() override;
+	void terminate() override;
 
-	virtual void dumpInfo() override;
+	void dumpInfo() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	void fallStopped();
 
diff --git a/engines/ultima/ultima8/world/item.h b/engines/ultima/ultima8/world/item.h
index eb8b43099dd..d5a4f2e8c6d 100644
--- a/engines/ultima/ultima8/world/item.h
+++ b/engines/ultima/ultima8/world/item.h
@@ -44,7 +44,7 @@ class Item : public Object {
 
 public:
 	Item();
-	virtual ~Item();
+	~Item() override;
 
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
@@ -440,7 +440,7 @@ public:
 	virtual void leaveFastArea();
 
 	//! dump some info about this item to pout
-	virtual void dumpInfo() override;
+	void dumpInfo() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 
@@ -561,7 +561,7 @@ protected:
 	ProcId gravitypid;      // Item's GravityTracker (or 0)
 
 	//! save the actual Item data
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 private:
 
diff --git a/engines/ultima/ultima8/world/monster_egg.h b/engines/ultima/ultima8/world/monster_egg.h
index 6747e013b4f..da6f2cd8685 100644
--- a/engines/ultima/ultima8/world/monster_egg.h
+++ b/engines/ultima/ultima8/world/monster_egg.h
@@ -33,7 +33,7 @@ class MonsterEgg : public Item {
 	friend class ItemFactory;
 public:
 	MonsterEgg();
-	virtual ~MonsterEgg();
+	~MonsterEgg() override;
 
 	ENABLE_RUNTIME_CLASSTYPE()
 
@@ -55,7 +55,7 @@ public:
 	INTRINSIC(I_getMonId);
 
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/split_item_process.h b/engines/ultima/ultima8/world/split_item_process.h
index 8f7297d8989..c6d15843528 100644
--- a/engines/ultima/ultima8/world/split_item_process.h
+++ b/engines/ultima/ultima8/world/split_item_process.h
@@ -38,11 +38,11 @@ public:
 	// p_dynamic_cast stuff
 	ENABLE_RUNTIME_CLASSTYPE()
 
-	virtual void run() override;
+	void run() override;
 
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 	ObjId target;
 };
diff --git a/engines/ultima/ultima8/world/sprite_process.h b/engines/ultima/ultima8/world/sprite_process.h
index 2bb6b84a376..f7856965078 100644
--- a/engines/ultima/ultima8/world/sprite_process.h
+++ b/engines/ultima/ultima8/world/sprite_process.h
@@ -61,10 +61,10 @@ public:
 	              bool delayed_init = false);
 
 	//! The SpriteProcess destructor
-	virtual ~SpriteProcess(void);
+	~SpriteProcess(void) override;
 
 	//! The SpriteProcess run function
-	virtual void run() override;
+	void run() override;
 
 	INTRINSIC(I_createSprite);
 //	INTRINSIC(I_createSpriteEx);
@@ -75,7 +75,7 @@ protected:
 public:
 	bool loadData(IDataSource *ids, uint32 version);
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/world/teleport_egg.h b/engines/ultima/ultima8/world/teleport_egg.h
index 4bf09ecc16e..85b54f097b6 100644
--- a/engines/ultima/ultima8/world/teleport_egg.h
+++ b/engines/ultima/ultima8/world/teleport_egg.h
@@ -32,7 +32,7 @@ class TeleportEgg : public Egg {
 	friend class ItemFactory;
 public:
 	TeleportEgg();
-	virtual ~TeleportEgg();
+	~TeleportEgg() override;
 
 	ENABLE_RUNTIME_CLASSTYPE()
 
@@ -45,9 +45,9 @@ public:
 
 	bool loadData(IDataSource *ids, uint32 version);
 
-	virtual uint16 hatch() override;
+	uint16 hatch() override;
 protected:
-	virtual void saveData(ODataSource *ods) override;
+	void saveData(ODataSource *ods) override;
 
 };