diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Module.h b/GeneralsMD/Code/GameEngine/Include/Common/Module.h
index 2819460e229..526d77a0963 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/Module.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/Module.h
@@ -136,20 +136,20 @@ class ModuleData : public Snapshot
 #define MAKE_STANDARD_MODULE_MACRO( cls ) \
 public: \
 	static Module* friend_newModuleInstance( Thing *thing, const ModuleData* moduleData ) { return newInstance( cls )( thing, moduleData ); } \
-	virtual NameKeyType getModuleNameKey() const { static NameKeyType nk = NAMEKEY(#cls); return nk; } \
+	virtual NameKeyType getModuleNameKey() const override { static NameKeyType nk = NAMEKEY(#cls); return nk; } \
 protected: \
-	virtual void crc( Xfer *xfer ); \
-	virtual void xfer( Xfer *xfer ); \
-	virtual void loadPostProcess();
+	virtual void crc( Xfer *xfer ) override; \
+	virtual void xfer( Xfer *xfer ) override; \
+	virtual void loadPostProcess() override;
 
 // ------------------------------------------------------------------------------------------------
 // For the creation of abstract module classes
 // ------------------------------------------------------------------------------------------------
 #define MAKE_STANDARD_MODULE_MACRO_ABC( cls ) \
 protected: \
-	virtual void crc( Xfer *xfer ); \
-	virtual void xfer( Xfer *xfer ); \
-	virtual void loadPostProcess();
+	virtual void crc( Xfer *xfer ) override; \
+	virtual void xfer( Xfer *xfer ) override; \
+	virtual void loadPostProcess() override;
 
 //-------------------------------------------------------------------------------------------------
 // only use this macro for an ABC. for a real class, use MAKE_STANDARD_MODULE_MACRO_WITH_MODULE_DATA.
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h
index 645fde4b1af..6801b780eab 100644
--- a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h
+++ b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h
@@ -181,15 +181,6 @@ class State : public MemoryPoolObject, public Snapshot
 	inline void setName(AsciiString n) { m_name = n; }
 #endif
 
-protected:
-	// snapshot interface	 - pure virtual here.
-	// Essentially all the member data gets set up on creation and shouldn't change.
-	// So none of it needs to be saved, and it nicely forces all user states to
-	// remember to implement crc, xfer & loadPostProcess.  jba
-	virtual void crc( Xfer *xfer )=0;
-	virtual void xfer( Xfer *xfer )=0;
-	virtual void loadPostProcess()=0;
-
 private:
 
 	struct TransitionInfo
diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h
index 675fd35f8de..21a5b2d292d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h
@@ -470,7 +470,7 @@ friend class Drawable;	// for selection/deselection transactions
 	virtual void disregardDrawable( Drawable *draw );				///< Drawable is being destroyed, clean up any UI elements associated with it
 
 	virtual void preDraw();														///< Logic which needs to occur before the UI renders
-	virtual void draw() = 0;													///< Render the in-game user interface
+	virtual void draw() override = 0;													///< Render the in-game user interface
 	virtual void postDraw();													///< Logic which needs to occur after the UI renders
 	virtual void postWindowDraw();											///< Logic which needs to occur after the WindowManager has repainted the menus
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h
index 2ba2dca5030..668410d4980 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h
@@ -239,7 +239,7 @@ class AIGuardRetaliateAttackAggressorState : public State
 	virtual StateReturnType update() override;
 	virtual void onExit( StateExitType status ) override;
 #ifdef STATE_MACHINE_DEBUG
-	virtual AsciiString getName() const ;
+	virtual AsciiString getName() const override;
 #endif
 protected:
 	// snapshot interface
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h
index a5402263f4b..43e6c99c4c9 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h
@@ -163,7 +163,7 @@ class AIStateMachine : public StateMachine
 public:	// overrides.
 	virtual StateReturnType updateStateMachine() override;				///< run one step of the machine
 #ifdef STATE_MACHINE_DEBUG
-	virtual AsciiString getCurrentStateName() const ;
+	virtual AsciiString getCurrentStateName() const override;
 #endif
 
 protected:
@@ -579,7 +579,7 @@ EMPTY_DTOR(AIPickUpCrateState)
 	virtual void onExit( StateExitType status ) override;
 	virtual StateReturnType update() override;
 #ifdef STATE_MACHINE_DEBUG
-	virtual AsciiString getName() const ;
+	virtual AsciiString getName() const override;
 #endif
 
 protected:
@@ -690,7 +690,7 @@ class AIAttackFollowWaypointPathState : public AIFollowWaypointPathState
 	virtual void onExit( StateExitType status ) override;
 	virtual StateReturnType update() override;
 #ifdef STATE_MACHINE_DEBUG
-	virtual AsciiString getName() const ;
+	virtual AsciiString getName() const override;
 #endif
 
 protected:
@@ -995,7 +995,7 @@ class AIAttackState : public State, public NotifyWeaponFiredInterface
 	virtual Bool isAttackingObject() const override { return m_isAttackingObject; }
 	virtual Bool isForceAttacking() const { return m_isForceAttacking; }
 #ifdef STATE_MACHINE_DEBUG
-	virtual AsciiString getName() const ;
+	virtual AsciiString getName() const override;
 #endif
 
 protected:
@@ -1033,7 +1033,7 @@ class AIAttackSquadState : public State
 	virtual StateReturnType update() override;
 	Object *chooseVictim();
 #ifdef STATE_MACHINE_DEBUG
-	virtual AsciiString getName() const ;
+	virtual AsciiString getName() const override;
 #endif
 
 
@@ -1076,7 +1076,7 @@ class AIDockState : public State
 	virtual void onExit( StateExitType status ) override;
 	virtual StateReturnType update() override;
 #ifdef STATE_MACHINE_DEBUG
-	virtual AsciiString getName() const ;
+	virtual AsciiString getName() const override;
 #endif
 
 protected:
@@ -1169,7 +1169,7 @@ class AIGuardState : public State
 	virtual void onExit( StateExitType status ) override;
 	virtual StateReturnType update() override;
 #ifdef STATE_MACHINE_DEBUG
-	virtual AsciiString getName() const ;
+	virtual AsciiString getName() const override;
 #endif
 protected:
 	// snapshot interface
@@ -1196,7 +1196,7 @@ class AIGuardRetaliateState : public State
 	virtual void onExit( StateExitType status ) override;
 	virtual StateReturnType update() override;
 #ifdef STATE_MACHINE_DEBUG
-	virtual AsciiString getName() const ;
+	virtual AsciiString getName() const override;
 #endif
 protected:
 	// snapshot interface
@@ -1226,7 +1226,7 @@ class AITunnelNetworkGuardState : public State
 	virtual void onExit( StateExitType status ) override;
 	virtual StateReturnType update() override;
 #ifdef STATE_MACHINE_DEBUG
-	virtual AsciiString getName() const ;
+	virtual AsciiString getName() const override;
 #endif
 protected:
 	// snapshot interface
@@ -1256,7 +1256,7 @@ class AIHuntState : public State
 	virtual void onExit( StateExitType status ) override;
 	virtual StateReturnType update() override;
 #ifdef STATE_MACHINE_DEBUG
-	virtual AsciiString getName() const ;
+	virtual AsciiString getName() const override;
 #endif
 
 protected:
@@ -1287,7 +1287,7 @@ class AIAttackAreaState : public State
 	virtual void onExit( StateExitType status ) override;
 	virtual StateReturnType update() override;
 #ifdef STATE_MACHINE_DEBUG
-	virtual AsciiString getName() const ;
+	virtual AsciiString getName() const override;
 #endif
 
 protected:
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
index 995d79e4726..015b5e743ed 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h
@@ -217,30 +217,6 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface
 	// BehaviorModule
 	virtual BodyModuleInterface* getBody() override { return this; }
 
-	/**
-		Try to damage this Object. The module's Armor
-		will be taken into account, so the actual damage done may vary
-		considerably from what you requested. Also note that (if damage is done)
-		the DamageFX will be invoked to provide a/v fx as appropriate.
-	*/
-	virtual void attemptDamage( DamageInfo *damageInfo ) = 0;
-
-	/**
-		Instead of having negative damage count as healing, or allowing access to the private
-		changeHealth Method, we will use this parallel to attemptDamage to do healing without hack.
-	*/
-	virtual void attemptHealing( DamageInfo *healingInfo ) = 0;
-
-	/**
-		Estimate the (unclipped) damage that would be done to this object
-		by the given damage (taking bonuses, armor, etc into account),
-		but DO NOT alter the body in any way. (This is used by the AI system
-		to choose weapons.)
-	*/
-	virtual Real estimateDamage( DamageInfoInput& damageInfo ) const = 0;
-
-	virtual Real getHealth() const = 0;													///< get current health
-
 	virtual Real getMaxHealth() const override {return 0.0f;}  ///< return max health
 	virtual Real getPreviousHealth() const override { return 0.0f; } ///< return previous health
 
@@ -251,16 +227,6 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface
 
 	virtual Real getInitialHealth() const override {return 0.0f;}  // return initial health
 
-	virtual BodyDamageType getDamageState() const = 0;
-	virtual void setDamageState( BodyDamageType newState ) = 0;	///< control damage state directly.  Will adjust hitpoints.
-	virtual void setAflame( Bool setting ) = 0;///< This is a major change like a damage state.
-
-	virtual void onVeterancyLevelChanged( VeterancyLevel oldLevel, VeterancyLevel newLevel, Bool provideFeedback = FALSE ) = 0;	///< I just achieved this level right this moment
-
-	virtual void setArmorSetFlag(ArmorSetType ast) = 0;
-	virtual void clearArmorSetFlag(ArmorSetType ast) = 0;
-	virtual Bool testArmorSetFlag(ArmorSetType ast) = 0;
-
 	virtual const DamageInfo *getLastDamageInfo() const override { return nullptr; }	///< return info on last damage dealt to this object
 	virtual UnsignedInt getLastDamageTimestamp() const override { return 0; }	///< return frame of last damage dealt
 	virtual UnsignedInt getLastHealingTimestamp() const override { return 0; }	///< return frame of last healing dealt
@@ -283,15 +249,6 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface
 	virtual void applyDamageScalar( Real scalar ) override { m_damageScalar *= scalar; }
 	virtual Real getDamageScalar() const override { return m_damageScalar; }
 
-	/**
-		Change the module's health by the given delta. Note that
-		the module's DamageFX and Armor are NOT taken into
-		account, so you should think about what you're bypassing when you
-		call this directly (especially when when decreasing health, since
-		you probably want "attemptDamage" or "attemptHealing")
-	*/
-	virtual void internalChangeHealth( Real delta ) = 0;
-
 	virtual void evaluateVisualCondition() override { }
 	virtual void updateBodyParticleSystems() override { };// made public for topple anf building collapse updates -ML
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h
index e04b5b94d18..f9f42dd7003 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h
@@ -85,8 +85,6 @@ class CollideModule : public BehaviorModule,
 	// BehaviorModule
 	virtual CollideModuleInterface* getCollide() override { return this; }
 
-	virtual void onCollide( Object *other, const Coord3D *loc, const Coord3D *normal ) = 0;
-
 	/// this is used for things like pilots, to determine if they can "enter" something
 	virtual Bool wouldLikeToCollideWith(const Object* other) const override { return false; }
 	virtual Bool isHijackedVehicleCrateCollide() const override { return false; }
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h
index ff9f954da8c..27411ef2e8d 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h
@@ -73,7 +73,6 @@ class CreateModule : public BehaviorModule, public CreateModuleInterface
 	// BehaviorModule
 	virtual CreateModuleInterface* getCreate() override { return this; }
 
-	virtual void onCreate() = 0;				///< This is called when you become a code Object
 	virtual void onBuildComplete() override { m_needToRunOnBuildComplete = FALSE; }	///< This is called when you are a finished game object
 	virtual Bool shouldDoOnBuildComplete() const override { return m_needToRunOnBuildComplete; }
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
index 5933950fef6..4bb26827fc7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h
@@ -97,13 +97,6 @@ class DamageModule : public BehaviorModule, public DamageModuleInterface
 	// BehaviorModule
 	virtual DamageModuleInterface* getDamage() override { return this; }
 
-	// damage module callbacks
-	virtual void onDamage( DamageInfo *damageInfo ) = 0;	///< damage callback
-	virtual void onHealing( DamageInfo *damageInfo ) = 0;	///< healing callback
-	virtual void onBodyDamageStateChange( const DamageInfo* damageInfo,
-																				BodyDamageType oldState,
-																				BodyDamageType newState) = 0;  ///< state change callback
-
 protected:
 
 };
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h
index e51abb5eec6..62a2633e87a 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h
@@ -58,8 +58,6 @@ class DestroyModule : public BehaviorModule, public DestroyModuleInterface
 	// BehaviorModule
 	virtual DestroyModuleInterface* getDestroy() override { return this; }
 
-	virtual void onDestroy() = 0;
-
 protected:
 
 };
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h
index f062343ef39..d38105c71c5 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h
@@ -97,8 +97,6 @@ class DieModule : public BehaviorModule, public DieModuleInterface
 	// BehaviorModule
 	virtual DieModuleInterface* getDie() override { return this; }
 
-	virtual void onDie( const DamageInfo *damageInfo ) = 0;
-
 protected:
 	Bool isDieApplicable(const DamageInfo *damageInfo) const { return getDieModuleData()->isDieApplicable(getObject(), damageInfo); }
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h
index c284ecf2ab0..af14aa21ac7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h
@@ -116,7 +116,7 @@ class FlightDeckBehavior : public AIUpdateInterface,
 	virtual void unreserveDoorForExit( ExitDoorType exitDoor ) override;
 	virtual void exitObjectByBudding( Object *newObj, Object *budHost ) override { return; }
 	virtual Bool getExitPosition( Coord3D& rallyPoint ) const override { return FALSE; }
-	virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) { return FALSE; }
+	virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const override { return FALSE; }
 	virtual void setRallyPoint( const Coord3D *pos ) override {}
 	virtual const Coord3D *getRallyPoint() const override { return nullptr;}
 
@@ -150,8 +150,8 @@ class FlightDeckBehavior : public AIUpdateInterface,
 	// AIUpdateInterface
 	virtual void aiDoCommand(const AICommandParms* parms) override;
 
-	virtual const std::vector<Coord3D>* getTaxiLocations( ObjectID id ) const;
-	virtual const std::vector<Coord3D>* getCreationLocations( ObjectID id ) const;
+	virtual const std::vector<Coord3D>* getTaxiLocations( ObjectID id ) const override;
+	virtual const std::vector<Coord3D>* getCreationLocations( ObjectID id ) const override;
 
 private:
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h
index 0a8798c45ff..bfd59618338 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h
@@ -91,7 +91,7 @@ class HelixContain : public TransportContain
 
 	virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const override;
 	virtual void addToContain( Object *obj ) override;				///< add 'obj' to contain list
-	virtual void addToContainList( Object *obj );		///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved)
+	virtual void addToContainList( Object *obj ) override;		///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved)
 	virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ) override;	///< remove 'obj' from contain list
 	//virtual void removeAllContained( Bool exposeStealthUnits = FALSE );				///< remove all objects on contain list
 	virtual Bool isEnclosingContainerFor( const Object *obj ) const override;	///< Does this type of Contain Visibly enclose its contents?
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h
index 1986d76dfd8..0120cd2a48f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h
@@ -131,7 +131,7 @@ class JetAIUpdate : public AIUpdateInterface
 
 	virtual AIStateMachine* makeStateMachine() override;
 
-	virtual void privateFollowPath( std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource, Bool exitProduction );///< follow the path defined by the given array of points
+	virtual void privateFollowPath( std::vector<Coord3D>* path, Object *ignoreObject, CommandSourceType cmdSource, Bool exitProduction ) override;///< follow the path defined by the given array of points
 	virtual void privateFollowPathAppend( const Coord3D *pos, CommandSourceType cmdSource ) override;
 	virtual void privateEnter( Object *obj, CommandSourceType cmdSource ) override;							///< enter the given object
 	virtual void privateGetRepaired( Object *repairDepot, CommandSourceType cmdSource ) override;///< get repaired at repair depot
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h
index ca52a9aa3c0..ba73b43c65f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h
@@ -54,9 +54,6 @@ class ObjectHelper : public UpdateModule
 		setWakeFrame(getObject(), UPDATE_SLEEP_FOREVER);
 	}
 
-	// inherited from UpdateModuleInterface
-	virtual UpdateSleepTime update() = 0;
-
 	// custom to this class.
 	void sleepUntil(UnsignedInt when);
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h
index 94f54c349ff..0c447408c29 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h
@@ -152,7 +152,7 @@ class OpenContain : public UpdateModule,
 	// default OpenContain has unlimited capacity...!
 	virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const override;
 	virtual void addToContain( Object *obj ) override;				///< add 'obj' to contain list
-	virtual void addToContainList( Object *obj );		///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved)
+	virtual void addToContainList( Object *obj ) override;		///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved)
 	virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ) override;	///< remove 'obj' from contain list
 	virtual void removeAllContained( Bool exposeStealthUnits = FALSE ) override;				///< remove all objects on contain list
 	virtual void killAllContained() override;				///< kill all objects on contain list
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h
index 410dba263c6..e603bca71ce 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h
@@ -69,7 +69,7 @@ class OverlordContain : public TransportContain
 
 	virtual OpenContain *asOpenContain() override { return this; }  ///< treat as open container
 	virtual Bool isGarrisonable() const override;	///< can this unit be Garrisoned? (ick)
-  virtual Bool isBustable() { return false;};	///< can this container get busted by bunkerbuster? (ick)
+  virtual Bool isBustable() const override { return false;};	///< can this container get busted by bunkerbuster? (ick)
 	virtual Bool isHealContain() const override { return false; } ///< true when container only contains units while healing (not a transport!)
 	virtual Bool isTunnelContain() const override { return FALSE; }
 	virtual Bool isImmuneToClearBuildingAttacks() const override { return true; }
@@ -88,7 +88,7 @@ class OverlordContain : public TransportContain
 
 	virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const override;
 	virtual void addToContain( Object *obj ) override;				///< add 'obj' to contain list
-	virtual void addToContainList( Object *obj );		///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved)
+	virtual void addToContainList( Object *obj ) override;		///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved)
 	virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ) override;	///< remove 'obj' from contain list
 	virtual void removeAllContained( Bool exposeStealthUnits = FALSE ) override;				///< remove all objects on contain list
 	virtual Bool isEnclosingContainerFor( const Object *obj ) const override;	///< Does this type of Contain Visibly enclose its contents?
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h
index 50dfe9e5fea..9f06fa662a6 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h
@@ -149,8 +149,8 @@ class ParkingPlaceBehavior : public UpdateModule,
 	virtual void killAllParkedUnits() override;
 	virtual void defectAllParkedUnits(Team* newTeam, UnsignedInt detectionTime) override;
 	virtual Bool calcBestParkingAssignment( ObjectID id, Coord3D *pos, Int *oldIndex = nullptr, Int *newIndex = nullptr ) override { return FALSE; }
-	virtual const std::vector<Coord3D>* getTaxiLocations( ObjectID id ) const { return nullptr; }
-	virtual const std::vector<Coord3D>* getCreationLocations( ObjectID id ) const { return nullptr; }
+	virtual const std::vector<Coord3D>* getTaxiLocations( ObjectID id ) const override { return nullptr; }
+	virtual const std::vector<Coord3D>* getCreationLocations( ObjectID id ) const override { return nullptr; }
 
 private:
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h
index 857f9a238f5..918bb1eae77 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h
@@ -66,15 +66,4 @@ class SpecialPowerUpdateModule : public UpdateModule, public SpecialPowerUpdateI
 	virtual Bool doesSpecialPowerUpdatePassScienceTest() const override;
 	virtual ScienceType getExtraRequiredScience() const override { return SCIENCE_INVALID; } //Does this object have more than one special power module with the same spTemplate?
 
-	//SpecialPowerUpdateInterface PURE virtual implementations
-	virtual Bool initiateIntentToDoSpecialPower(const SpecialPowerTemplate *specialPowerTemplate, const Object *targetObj, const Coord3D *targetPos, const Waypoint *way, UnsignedInt commandOptions ) = 0;
-	virtual Bool isSpecialAbility() const = 0;
-	virtual Bool isSpecialPower() const = 0;
-	virtual Bool isActive() const = 0;
-	virtual CommandOption getCommandOption() const = 0;
-	virtual Bool doesSpecialPowerHaveOverridableDestinationActive() const = 0; //Is it active now?
-	virtual Bool doesSpecialPowerHaveOverridableDestination() const = 0;	//Does it have it, even if it's not active?
-	virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) = 0;
-	virtual Bool isPowerCurrentlyInUse( const CommandButton *command = nullptr ) const = 0;
-
 };
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h
index 25378e6bb10..5e295cd9603 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h
@@ -103,7 +103,7 @@ class TunnelContain : public OpenContain, public CreateModuleInterface
 	virtual void orderAllPassengersToIdle( CommandSourceType commandSource ) override; ///< Just like it sounds
 
 	virtual Bool isValidContainerFor(const Object* obj, Bool checkCapacity) const override;
-	virtual void addToContainList( Object *obj );		///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved)
+	virtual void addToContainList( Object *obj ) override;		///< The part of AddToContain that inheritors can override (Can't do whole thing because of all the private stuff involved)
 	virtual void removeFromContain( Object *obj, Bool exposeStealthUnits = FALSE ) override;	///< remove 'obj' from contain list
 	virtual void removeAllContained( Bool exposeStealthUnits = FALSE ) override;				///< remove all objects on contain list
   virtual void harmAndForceExitAllContained( DamageInfo *info ) override;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
index b38389eaced..2a4f5b3c724 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h
@@ -169,9 +169,6 @@ class UpdateModule : public BehaviorModule, public UpdateModuleInterface
 	// BehaviorModule
 	virtual UpdateModuleInterface* getUpdate() override { return this; }
 
-	// UpdateModuleInterface
-	virtual UpdateSleepTime update() = 0;
-
 	virtual DisabledMaskType getDisabledTypesToProcess() const override
 	{
 		return DISABLEDMASK_NONE;
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h
index eefb01c4a27..f8f0388cfa7 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h
@@ -131,7 +131,6 @@ class UpgradeMux : public UpgradeModuleInterface
 	virtual void getUpgradeActivationMasks(UpgradeMaskType& activation, UpgradeMaskType& conflicting) const = 0; ///< Here's the actual work of Upgrading
 	virtual void performUpgradeFX() = 0;	///< perform the associated fx list
 	virtual Bool requiresAllActivationUpgrades() const = 0;
-	virtual Bool isSubObjectsUpgrade() = 0;
 	virtual void processUpgradeRemoval() = 0;
 
 	void giveSelfUpgrade();
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h
index 2b2439601ee..a183f54feb0 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h
@@ -612,7 +612,7 @@ class PartitionFilterIsFlying : public PartitionFilter
 	PartitionFilterIsFlying() { }
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterIsFlying"; }
+	virtual const char* debugGetName() override { return "PartitionFilterIsFlying"; }
 #endif
 };
 
@@ -628,7 +628,7 @@ class PartitionFilterWouldCollide : public PartitionFilter
 	PartitionFilterWouldCollide(const Coord3D& pos, const GeometryInfo& geom, Real angle, Bool desired);
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterWouldCollide"; }
+	virtual const char* debugGetName() override { return "PartitionFilterWouldCollide"; }
 #endif
 };
 
@@ -644,7 +644,7 @@ class PartitionFilterSamePlayer : public PartitionFilter
 	PartitionFilterSamePlayer(const Player *player) : m_player(player) { }
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterSamePlayer"; }
+	virtual const char* debugGetName() override { return "PartitionFilterSamePlayer"; }
 #endif
 };
 
@@ -670,7 +670,7 @@ class PartitionFilterRelationship : public PartitionFilter
 	PartitionFilterRelationship(const Object *obj, Int flags) : m_obj(obj), m_flags(flags) { }
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterRelationship"; }
+	virtual const char* debugGetName() override { return "PartitionFilterRelationship"; }
 #endif
 };
 
@@ -687,7 +687,7 @@ class PartitionFilterAcceptOnTeam : public PartitionFilter
 	PartitionFilterAcceptOnTeam(const Team *team);
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterAcceptOnTeam"; }
+	virtual const char* debugGetName() override { return "PartitionFilterAcceptOnTeam"; }
 #endif
 };
 
@@ -704,7 +704,7 @@ class PartitionFilterAcceptOnSquad : public PartitionFilter
 	PartitionFilterAcceptOnSquad(const Squad *squad);
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterAcceptOnSquad"; }
+	virtual const char* debugGetName() override { return "PartitionFilterAcceptOnSquad"; }
 #endif
 };
 
@@ -727,7 +727,7 @@ class PartitionFilterLineOfSight : public PartitionFilter
 	PartitionFilterLineOfSight(const Object *obj);
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterLineOfSight"; }
+	virtual const char* debugGetName() override { return "PartitionFilterLineOfSight"; }
 #endif
 };
 
@@ -745,7 +745,7 @@ class PartitionFilterPossibleToAttack : public PartitionFilter
 	PartitionFilterPossibleToAttack(AbleToAttackType t, const Object *obj, CommandSourceType commandSource);
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterPossibleToAttack"; }
+	virtual const char* debugGetName() override { return "PartitionFilterPossibleToAttack"; }
 #endif
 };
 
@@ -763,7 +763,7 @@ class PartitionFilterPossibleToEnter : public PartitionFilter
 	PartitionFilterPossibleToEnter(const Object *obj, CommandSourceType commandSource);
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterPossibleToEnter"; }
+	virtual const char* debugGetName() override { return "PartitionFilterPossibleToEnter"; }
 #endif
 };
 
@@ -781,7 +781,7 @@ class PartitionFilterPossibleToHijack : public PartitionFilter
 	PartitionFilterPossibleToHijack(const Object *obj, CommandSourceType commandSource);
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterPossibleToHijack"; }
+	virtual const char* debugGetName() override { return "PartitionFilterPossibleToHijack"; }
 #endif
 };
 
@@ -797,7 +797,7 @@ class PartitionFilterLastAttackedBy : public PartitionFilter
 	PartitionFilterLastAttackedBy(Object *obj);
 	virtual Bool allow(Object *other) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterLastAttackedBy"; }
+	virtual const char* debugGetName() override { return "PartitionFilterLastAttackedBy"; }
 #endif
 };
 
@@ -813,7 +813,7 @@ class PartitionFilterAcceptByObjectStatus : public PartitionFilter
 	PartitionFilterAcceptByObjectStatus( ObjectStatusMaskType mustBeSet, ObjectStatusMaskType mustBeClear) : m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear) { }
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterAcceptByObjectStatus"; }
+	virtual const char* debugGetName() override { return "PartitionFilterAcceptByObjectStatus"; }
 #endif
 };
 
@@ -833,7 +833,7 @@ class PartitionFilterRejectByObjectStatus : public PartitionFilter
 	}
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterRejectByObjectStatus"; }
+	virtual const char* debugGetName() override { return "PartitionFilterRejectByObjectStatus"; }
 #endif
 };
 
@@ -850,7 +850,7 @@ class PartitionFilterStealthedAndUndetected : public PartitionFilter
 	PartitionFilterStealthedAndUndetected( const Object *obj, Bool allow ) { m_obj = obj; m_allow = allow; }
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterStealthedAndUndetected"; }
+	virtual const char* debugGetName() override { return "PartitionFilterStealthedAndUndetected"; }
 #endif
 };
 
@@ -866,7 +866,7 @@ class PartitionFilterAcceptByKindOf : public PartitionFilter
 	PartitionFilterAcceptByKindOf(const KindOfMaskType& mustBeSet, const KindOfMaskType& mustBeClear) : m_mustBeSet(mustBeSet), m_mustBeClear(mustBeClear) { }
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterAcceptByKindOf"; }
+	virtual const char* debugGetName() override { return "PartitionFilterAcceptByKindOf"; }
 #endif
 };
 
@@ -886,7 +886,7 @@ class PartitionFilterRejectByKindOf : public PartitionFilter
 	}
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterRejectByKindOf"; }
+	virtual const char* debugGetName() override { return "PartitionFilterRejectByKindOf"; }
 #endif
 };
 
@@ -903,7 +903,7 @@ class PartitionFilterRejectBehind: public PartitionFilter
 	PartitionFilterRejectBehind( Object *obj );
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterRejectBehind"; }
+	virtual const char* debugGetName() override { return "PartitionFilterRejectBehind"; }
 #endif
 };
 
@@ -918,7 +918,7 @@ class PartitionFilterAlive : public PartitionFilter
 protected:
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterAlive"; }
+	virtual const char* debugGetName() override { return "PartitionFilterAlive"; }
 #endif
 };
 
@@ -936,7 +936,7 @@ class PartitionFilterSameMapStatus : public PartitionFilter
 protected:
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterSameMapStatus"; }
+	virtual const char* debugGetName() override { return "PartitionFilterSameMapStatus"; }
 #endif
 };
 
@@ -951,7 +951,7 @@ class PartitionFilterOnMap : public PartitionFilter
 protected:
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterOnMap"; }
+	virtual const char* debugGetName() override { return "PartitionFilterOnMap"; }
 #endif
 };
 
@@ -971,7 +971,7 @@ class PartitionFilterRejectBuildings : public PartitionFilter
 protected:
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterRejectBuildings"; }
+	virtual const char* debugGetName() override { return "PartitionFilterRejectBuildings"; }
 #endif
 };
 
@@ -991,7 +991,7 @@ class PartitionFilterInsignificantBuildings : public PartitionFilter
 protected:
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterInsignificantBuildings"; }
+	virtual const char* debugGetName() override { return "PartitionFilterInsignificantBuildings"; }
 #endif
 };
 
@@ -1009,7 +1009,7 @@ class PartitionFilterFreeOfFog : public PartitionFilter
 protected:
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterFreeOfFog"; }
+	virtual const char* debugGetName() override { return "PartitionFilterFreeOfFog"; }
 #endif
 };
 
@@ -1026,7 +1026,7 @@ class PartitionFilterRepulsor : public PartitionFilter
 protected:
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterRepulsor"; }
+	virtual const char* debugGetName() override { return "PartitionFilterRepulsor"; }
 #endif
 };
 
@@ -1047,7 +1047,7 @@ class PartitionFilterIrregularArea : public PartitionFilter
 protected:
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterIrregularArea"; }
+	virtual const char* debugGetName() override { return "PartitionFilterIrregularArea"; }
 #endif
 };
 
@@ -1067,7 +1067,7 @@ class PartitionFilterPolygonTrigger : public PartitionFilter
 protected:
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterPolygonTrigger"; }
+	virtual const char* debugGetName() override { return "PartitionFilterPolygonTrigger"; }
 #endif
 };
 
@@ -1087,7 +1087,7 @@ class PartitionFilterPlayer : public PartitionFilter
 protected:
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterPlayer"; }
+	virtual const char* debugGetName() override { return "PartitionFilterPlayer"; }
 #endif
 };
 
@@ -1112,7 +1112,7 @@ class PartitionFilterPlayerAffiliation : public PartitionFilter
 protected:
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterPlayerAffiliation"; }
+	virtual const char* debugGetName() override { return "PartitionFilterPlayerAffiliation"; }
 #endif
 };
 
@@ -1134,7 +1134,7 @@ class PartitionFilterThing : public PartitionFilter
 protected:
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterThing"; }
+	virtual const char* debugGetName() override { return "PartitionFilterThing"; }
 #endif
 };
 
@@ -1156,7 +1156,7 @@ class PartitionFilterGarrisonable : public PartitionFilter
 protected:
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterGarrisonable"; }
+	virtual const char* debugGetName() override { return "PartitionFilterGarrisonable"; }
 #endif
 };
 
@@ -1179,7 +1179,7 @@ class PartitionFilterGarrisonableByPlayer : public PartitionFilter
 protected:
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterGarrisonableByPlayer"; }
+	virtual const char* debugGetName() override { return "PartitionFilterGarrisonableByPlayer"; }
 #endif
 };
 
@@ -1197,7 +1197,7 @@ class PartitionFilterUnmannedObject : public PartitionFilter
 protected:
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterUnmannedObject"; }
+	virtual const char* debugGetName() override { return "PartitionFilterUnmannedObject"; }
 #endif
 };
 
@@ -1219,7 +1219,7 @@ class PartitionFilterValidCommandButtonTarget : public PartitionFilter
 protected:
 	virtual Bool allow( Object *other ) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterValidCommandButtonTarget"; }
+	virtual const char* debugGetName() override { return "PartitionFilterValidCommandButtonTarget"; }
 #endif
 };
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h
index 08847103057..0e694b4c62f 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h
@@ -48,10 +48,6 @@ class ScriptActionsInterface : public SubsystemInterface
 
 	virtual ~ScriptActionsInterface() override { };
 
-	virtual void init() = 0;		///< Init
-	virtual void reset() = 0;		///< Reset
-	virtual void update() = 0;	///< Update
-
 	virtual void executeAction( ScriptAction *pAction ) = 0; ///< execute a script action.
 	virtual void closeWindows( Bool suppressNewWindows ) = 0;
 
diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h
index 2d627f6dbec..f7852463d94 100644
--- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h
+++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h
@@ -45,10 +45,6 @@ class ScriptConditionsInterface : public SubsystemInterface
 
 	virtual ~ScriptConditionsInterface() override { };
 
-	virtual void init() = 0;		///< Init
-	virtual void reset() = 0;		///< Reset
-	virtual void update() = 0;	///< Update
-
 	virtual Bool evaluateCondition( Condition *pCondition ) = 0; ///< evaluate a a script condition.
 
 	virtual Bool evaluateSkirmishCommandButtonIsReady( Parameter *pSkirmishPlayerParm, Parameter *pTeamParm, Parameter *pCommandButtonParm, Bool allReady ) = 0;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp
index 24b9a999ef7..9959cb42546 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AI.cpp
@@ -534,7 +534,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter
 	}
 
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterLiveMapEnemies"; }
+	virtual const char* debugGetName() override { return "PartitionFilterLiveMapEnemies"; }
 #endif
 };
 
@@ -564,7 +564,7 @@ class PartitionFilterWithinAttackRange : public PartitionFilter
 	}
 
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterWithinAttackRange"; }
+	virtual const char* debugGetName() override { return "PartitionFilterWithinAttackRange"; }
 #endif
 };
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
index 4aa23123c4d..e79b4feb7ea 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/JetAIUpdate.cpp
@@ -150,7 +150,7 @@ class PartitionFilterHasParkingPlace : public PartitionFilter
 	PartitionFilterHasParkingPlace(ObjectID id) : m_id(id) { }
 protected:
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterHasParkingPlace"; }
+	virtual const char* debugGetName() override { return "PartitionFilterHasParkingPlace"; }
 #endif
 	virtual Bool allow(Object *objOther) override
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
index 19bdbdd01d7..17fab63bad6 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/AIUpdate/RailroadGuideAIUpdate.cpp
@@ -903,7 +903,7 @@ class PartitionFilterIsValidCarriage : public PartitionFilter
 	PartitionFilterIsValidCarriage(Object* obj, const RailroadBehaviorModuleData* data) : m_obj(obj), m_data(data) { }
 
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterIsValidCarriage"; }
+	virtual const char* debugGetName() override { return "PartitionFilterIsValidCarriage"; }
 #endif
 
 	virtual Bool allow(Object *objOther) override
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
index ce710ac5188..b82a0e5f13a 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/FireSpreadUpdate.cpp
@@ -52,7 +52,7 @@ class PartitionFilterFlammable : public PartitionFilter
 
 	virtual Bool allow(Object *objOther) override;
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterFlammable"; }
+	virtual const char* debugGetName() override { return "PartitionFilterFlammable"; }
 #endif
 };
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
index df7271bd39c..524af685ed1 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/HordeUpdate.cpp
@@ -75,7 +75,7 @@ class PartitionFilterHordeMember : public PartitionFilter
 	PartitionFilterHordeMember(Object* obj, const HordeUpdateModuleData* data) : m_obj(obj), m_data(data) { }
 
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterHordeMember"; }
+	virtual const char* debugGetName() override { return "PartitionFilterHordeMember"; }
 #endif
 
 	virtual Bool allow(Object *objOther) override
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp
index 69c7b4988da..231e44578e2 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/SpectreGunshipUpdate.cpp
@@ -340,7 +340,7 @@ class PartitionFilterLiveMapEnemies : public PartitionFilter
 	}
 
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterLiveMapEnemies"; }
+	virtual const char* debugGetName() override { return "PartitionFilterLiveMapEnemies"; }
 #endif
 };
 //-----------------------------------------------------------------------------
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
index 30821129b0c..7be96b7a61f 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp
@@ -118,7 +118,7 @@ class PartitionFilterStealthedOrStealthGarrisoned : public PartitionFilter
 	virtual Bool allow(Object *objOther) override;
 
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterStealthedOrStealthGarrisoned"; }
+	virtual const char* debugGetName() override { return "PartitionFilterStealthedOrStealthGarrisoned"; }
 #endif
 };
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
index 66ef8bc1598..3764f948d9d 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/TensileFormationUpdate.cpp
@@ -72,7 +72,7 @@ class PartitionFilterTensileFormationMember : public PartitionFilter
 public:
 	PartitionFilterTensileFormationMember( Object* obj ) : m_obj( obj ) { }
 #if defined(RTS_DEBUG)
-	virtual const char* debugGetName() { return "PartitionFilterTensileFormationMember"; }
+	virtual const char* debugGetName() override { return "PartitionFilterTensileFormationMember"; }
 #endif
 	virtual Bool allow( Object *objOther ) override
 	{
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h
index 9372d69136f..763bcd13de0 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h
@@ -69,7 +69,7 @@ class W3DDisplay : public Display
  	virtual void setGamma(Real gamma, Real bright, Real contrast, Bool calibrate) override;
 	virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) override;
 #if defined(RTS_DEBUG)
-	virtual void dumpAssetUsage(const char* mapname);
+	virtual void dumpAssetUsage(const char* mapname) override;
 #endif
 
 	//---------------------------------------------------------------------------
@@ -133,7 +133,7 @@ class W3DDisplay : public Display
 	virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) override;
 	virtual void setBorderShroudLevel(UnsignedByte level) override;	///<color that will appear in unused border terrain.
 #if defined(RTS_DEBUG)
-	virtual void dumpModelAssets(const char *path);	///< dump all used models/textures to a file.
+	virtual void dumpModelAssets(const char *path) override;	///< dump all used models/textures to a file.
 #endif
 	virtual void preloadModelAssets( AsciiString model ) override;			///< preload model asset
 	virtual void preloadTextureAssets( AsciiString texture ) override;	///< preload texture asset
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h
index e99a4535f99..79ed5841864 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h
@@ -117,7 +117,7 @@ class W3DProjectedShadow	: public Shadow
 		void updateProjectionParameters(const Matrix3D &cameraXform);	///<recompute projection matrix - needed when light or object moves.
 		TexProjectClass *getShadowProjector()	{return m_shadowProjector;}
 		#if defined(RTS_DEBUG)
-		virtual void getRenderCost(RenderCost & rc) const;
+		virtual void getRenderCost(RenderCost & rc) const override;
 		#endif
 		W3DShadowTexture *getTexture(Int lightIndex) {return m_shadowTexture[lightIndex];}
 
diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h
index 288cddeb383..770e063a424 100644
--- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h
+++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h
@@ -105,7 +105,7 @@ class W3DVolumetricShadow	: public Shadow
 		virtual void release() override	{TheW3DVolumetricShadowManager->removeShadow(this);}	///<release shadow from manager
 
 		#if defined(RTS_DEBUG)
-		virtual void getRenderCost(RenderCost & rc) const;
+		virtual void getRenderCost(RenderCost & rc) const override;
 		#endif
 
 		// tie in geometry and transformation for this shadow
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp
index 7455905379f..78ad3a9480f 100644
--- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp
+++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.cpp
@@ -120,12 +120,12 @@ class FaceHasherClass : public HashCalculatorClass<MeshBuilderClass::FaceClass>
 		HashVal = (int)(item.VertIdx[0]*12345.6f + item.VertIdx[1]*1714.38484f + item.VertIdx[2]*27561.3f)&1023;
 	}
 
-	virtual int		Num_Hash_Bits()
+	virtual int		Num_Hash_Bits() override
 	{
 		return 10;
 	}
 
-	virtual int		Num_Hash_Values()
+	virtual int		Num_Hash_Values() override
 	{
 		return 1;
 	}
diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h
index 7b278b8f2d4..50d88804c4e 100644
--- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h
+++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h
@@ -116,11 +116,11 @@ class GUIEditDisplay : public Display
 	virtual void toggleLetterBox(void) override {}
 	virtual void enableLetterBox(Bool enable) override {}
 #if defined(RTS_DEBUG)
-	virtual void dumpModelAssets(const char *path) {}
+	virtual void dumpModelAssets(const char *path) override {}
 #endif
 	virtual void doSmartAssetPurgeAndPreload(const char* usageFileName) override {}
 #if defined(RTS_DEBUG)
-	virtual void dumpAssetUsage(const char* mapname) {}
+	virtual void dumpAssetUsage(const char* mapname) override {}
 #endif
 
 	virtual Real getAverageFPS(void) override { return 0; }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h
index 14d0c172850..95274dbe799 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h
@@ -76,8 +76,8 @@ class CMainFrame : public CFrameWnd
 public:
 	virtual ~CMainFrame() override;
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 	static CMainFrame *GetMainFrame() { return TheMainFrame; }
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h
index 81abb74b461..70a61a4ae41 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h
@@ -166,8 +166,8 @@ class CWorldBuilderDoc : public CDocument
 public:
 	virtual ~CWorldBuilderDoc() override;
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 	void AddAndDoUndoable(Undoable *pUndo);
 // Generated message map functions
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h
index a136a9891d7..e0555f8b28e 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h
@@ -56,8 +56,8 @@ class CWorldBuilderView : public WbView
 public:
 	virtual ~CWorldBuilderView() override;
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 protected:
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h
index 067880f2711..61636479cbd 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h
@@ -167,8 +167,8 @@ class WbView : public CView
 protected:
 	virtual ~WbView() override;
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 	// Generated message map functions
diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h
index 026a35e735f..0aad09c458f 100644
--- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h
+++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h
@@ -83,8 +83,8 @@ class WbView3d : public WbView, public DX8_CleanupHook
 protected:
 	virtual ~WbView3d() override;
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 	// Generated message map functions
diff --git a/GeneralsMD/Code/Tools/wdump/FindDialog.h b/GeneralsMD/Code/Tools/wdump/FindDialog.h
index e1e6a549db7..fe5c89ee2eb 100644
--- a/GeneralsMD/Code/Tools/wdump/FindDialog.h
+++ b/GeneralsMD/Code/Tools/wdump/FindDialog.h
@@ -64,7 +64,7 @@ class FindDialog : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(FindDialog)
 	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
+	virtual void DoDataExchange(CDataExchange* pDX) override;    // DDX/DDV support
 	//}}AFX_VIRTUAL
 
 // Implementation
@@ -72,7 +72,7 @@ class FindDialog : public CDialog
 
 	// Generated message map functions
 	//{{AFX_MSG(FindDialog)
-	virtual BOOL OnInitDialog();
+	virtual BOOL OnInitDialog() override;
 	afx_msg void OnChangeFindString();
 	afx_msg void OnUpdateFindString();
 	//}}AFX_MSG
diff --git a/GeneralsMD/Code/Tools/wdump/mainfrm.h b/GeneralsMD/Code/Tools/wdump/mainfrm.h
index 9015bd9f316..e3130518162 100644
--- a/GeneralsMD/Code/Tools/wdump/mainfrm.h
+++ b/GeneralsMD/Code/Tools/wdump/mainfrm.h
@@ -40,16 +40,16 @@ class CMainFrame : public CFrameWnd
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CMainFrame)
 	public:
-	virtual BOOL OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext);
-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
+	virtual BOOL OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext) override;
+	virtual BOOL PreCreateWindow(CREATESTRUCT& cs) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 public:
 	virtual ~CMainFrame();
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 protected:  // control bar embedded members
diff --git a/GeneralsMD/Code/Tools/wdump/wdeview.h b/GeneralsMD/Code/Tools/wdump/wdeview.h
index 5b280f8670f..c1f70adc3f9 100644
--- a/GeneralsMD/Code/Tools/wdump/wdeview.h
+++ b/GeneralsMD/Code/Tools/wdump/wdeview.h
@@ -40,16 +40,16 @@ class CWDumpEditView : public CEditView
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CWDumpEditView)
 	protected:
-	virtual void OnDraw(CDC* pDC);      // overridden to draw this view
-	virtual void OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint);
+	virtual void OnDraw(CDC* pDC) override;      // overridden to draw this view
+	virtual void OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	virtual ~CWDumpEditView();
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 	// Generated message map functions
diff --git a/GeneralsMD/Code/Tools/wdump/wdlview.h b/GeneralsMD/Code/Tools/wdump/wdlview.h
index 28fb9103dd9..e03fd17c1d6 100644
--- a/GeneralsMD/Code/Tools/wdump/wdlview.h
+++ b/GeneralsMD/Code/Tools/wdump/wdlview.h
@@ -40,18 +40,18 @@ class CWDumpListView : public CListView
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CWDumpListView)
 	public:
-	virtual void OnInitialUpdate();
+	virtual void OnInitialUpdate() override;
 	protected:
-	virtual void OnDraw(CDC* pDC);      // overridden to draw this view
-	virtual void OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint);
+	virtual void OnDraw(CDC* pDC) override;      // overridden to draw this view
+	virtual void OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	virtual ~CWDumpListView();
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 	// Generated message map functions
diff --git a/GeneralsMD/Code/Tools/wdump/wdtview.h b/GeneralsMD/Code/Tools/wdump/wdtview.h
index 37590e07f62..86631662926 100644
--- a/GeneralsMD/Code/Tools/wdump/wdtview.h
+++ b/GeneralsMD/Code/Tools/wdump/wdtview.h
@@ -40,16 +40,16 @@ class CWDumpTreeView : public CTreeView
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CWDumpTreeView)
 	protected:
-	virtual void OnDraw(CDC* pDC);      // overridden to draw this view
-	virtual void OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint);
+	virtual void OnDraw(CDC* pDC) override;      // overridden to draw this view
+	virtual void OnUpdate(CView* pSender, LPARAM lHint, CObject* pHint) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 protected:
 	virtual ~CWDumpTreeView();
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 	// Generated message map functions
diff --git a/GeneralsMD/Code/Tools/wdump/wdump.h b/GeneralsMD/Code/Tools/wdump/wdump.h
index 0cfc802e3bd..c8a4b42e821 100644
--- a/GeneralsMD/Code/Tools/wdump/wdump.h
+++ b/GeneralsMD/Code/Tools/wdump/wdump.h
@@ -45,7 +45,7 @@ class CWdumpApp : public CWinApp
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CWdumpApp)
 	public:
-	virtual BOOL InitInstance();
+	virtual BOOL InitInstance() override;
 	//}}AFX_VIRTUAL
 
 // Implementation
diff --git a/GeneralsMD/Code/Tools/wdump/wdumpdoc.h b/GeneralsMD/Code/Tools/wdump/wdumpdoc.h
index 5a6c9415748..6aef0d8ae06 100644
--- a/GeneralsMD/Code/Tools/wdump/wdumpdoc.h
+++ b/GeneralsMD/Code/Tools/wdump/wdumpdoc.h
@@ -48,16 +48,16 @@ class CWdumpDoc : public CDocument
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CWdumpDoc)
 	public:
-	virtual BOOL OnNewDocument();
-	virtual void Serialize(CArchive& ar);
+	virtual BOOL OnNewDocument() override;
+	virtual void Serialize(CArchive& ar) override;
 	//}}AFX_VIRTUAL
 
 // Implementation
 public:
 	virtual ~CWdumpDoc();
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 protected:
diff --git a/GeneralsMD/Code/Tools/wdump/wdview.h b/GeneralsMD/Code/Tools/wdump/wdview.h
index de270893e51..fc764b4c4dc 100644
--- a/GeneralsMD/Code/Tools/wdump/wdview.h
+++ b/GeneralsMD/Code/Tools/wdump/wdview.h
@@ -39,8 +39,8 @@ class CWdumpView : public CView
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CWdumpView)
 	public:
-	virtual void OnDraw(CDC* pDC);  // overridden to draw this view
-	virtual BOOL PreCreateWindow(CREATESTRUCT& cs);
+	virtual void OnDraw(CDC* pDC) override;  // overridden to draw this view
+	virtual BOOL PreCreateWindow(CREATESTRUCT& cs) override;
 	protected:
 	//}}AFX_VIRTUAL
 
@@ -48,8 +48,8 @@ class CWdumpView : public CView
 public:
 	virtual ~CWdumpView();
 #ifdef RTS_DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
+	virtual void AssertValid() const override;
+	virtual void Dump(CDumpContext& dc) const override;
 #endif
 
 protected: