Use C++11's explicit override feature if available

139 files changed, 498 insertions, 503 deletions

diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp
index b4d272d7b..5c1691047 100644
--- a/modules/commands/bs_assign.cpp
+++ b/modules/commands/bs_assign.cpp
@@ -22,7 +22,7 @@ class CommandBSAssign : public Command
 		this->SetSyntax(_("\037channel\037 \037nick\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &chan = params[0];
 		const Anope::string &nick = params[1];
@@ -74,7 +74,7 @@ class CommandBSAssign : public Command
 		source.Reply(_("Bot \002%s\002 has been assigned to %s."), bi->nick.c_str(), ci->name.c_str());
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -94,7 +94,7 @@ class CommandBSUnassign : public Command
 		this->SetSyntax(_("\037channel\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -136,7 +136,7 @@ class CommandBSUnassign : public Command
 		source.Reply(_("There is no bot assigned to %s anymore."), ci->name.c_str());
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/bs_badwords.cpp b/modules/commands/bs_badwords.cpp
index a700fa6c9..bb7a073f1 100644
--- a/modules/commands/bs_badwords.cpp
+++ b/modules/commands/bs_badwords.cpp
@@ -38,7 +38,7 @@ class BadwordsDelCallback : public NumberList
 			source.Reply(_("Deleted %d entries from %s bad words list."), Deleted, ci->name.c_str());
 	}
 
-	void HandleNumber(unsigned Number)
+	void HandleNumber(unsigned Number) anope_override
 	{
 		if (!Number || Number > ci->GetBadWordCount())
 			return;
@@ -76,7 +76,7 @@ class CommandBSBadwords : public Command
 				{
 				}
 
-				void HandleNumber(unsigned Number)
+				void HandleNumber(unsigned Number) anope_override
 				{
 					if (!Number || Number > ci->GetBadWordCount())
 						return;
@@ -229,7 +229,7 @@ class CommandBSBadwords : public Command
 		this->SetSyntax(_("\037channel\037 CLEAR"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &cmd = params[1];
 		const Anope::string &word = params.size() > 2 ? params[2] : "";
@@ -274,7 +274,7 @@ class CommandBSBadwords : public Command
 			this->OnSyntaxError(source, "");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/bs_bot.cpp b/modules/commands/bs_bot.cpp
index e5779ef73..526cd922c 100644
--- a/modules/commands/bs_bot.cpp
+++ b/modules/commands/bs_bot.cpp
@@ -300,7 +300,7 @@ class CommandBSBot : public Command
 		this->SetSyntax(_("\002DEL \037nick\037\002"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &cmd = params[0];
 		User *u = source.u;
@@ -374,7 +374,7 @@ class CommandBSBot : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/bs_botlist.cpp b/modules/commands/bs_botlist.cpp
index 45cea0998..ed50371fc 100644
--- a/modules/commands/bs_botlist.cpp
+++ b/modules/commands/bs_botlist.cpp
@@ -22,7 +22,7 @@ class CommandBSBotList : public Command
 		this->SetSyntax("");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		unsigned count = 0;
@@ -61,7 +61,7 @@ class CommandBSBotList : public Command
 		}
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/bs_control.cpp b/modules/commands/bs_control.cpp
index d6b126672..6ca435b37 100644
--- a/modules/commands/bs_control.cpp
+++ b/modules/commands/bs_control.cpp
@@ -22,7 +22,7 @@ class CommandBSSay : public Command
 		this->SetSyntax(_("\037channel\037 \037text\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &text = params[1];
 
@@ -68,7 +68,7 @@ class CommandBSSay : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -86,7 +86,7 @@ class CommandBSAct : public Command
 		this->SetSyntax(_("\037channel\037 \037text\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		Anope::string message = params[1];
@@ -129,7 +129,7 @@ class CommandBSAct : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/bs_info.cpp b/modules/commands/bs_info.cpp
index 39a299d32..5026de3c7 100644
--- a/modules/commands/bs_info.cpp
+++ b/modules/commands/bs_info.cpp
@@ -55,7 +55,7 @@ class CommandBSInfo : public Command
 		this->SetSyntax(_("\002INFO {\037chan\037 | \037nick\037}\002"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &query = params[0];
 
@@ -221,7 +221,7 @@ class CommandBSInfo : public Command
 			source.Reply(_("\002%s\002 is not a valid bot or registered channel."), query.c_str());
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp
index cccdd5b35..5824a8650 100644
--- a/modules/commands/bs_kick.cpp
+++ b/modules/commands/bs_kick.cpp
@@ -23,7 +23,7 @@ class CommandBSKick : public Command
 		this->SetSyntax(_("\037channel\037 \037option\037 {\037ON|\037} [\037settings\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &chan = params[0];
 		const Anope::string &option = params[1];
@@ -459,7 +459,7 @@ class CommandBSKick : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		if (subcommand.empty())
 		{
@@ -626,7 +626,7 @@ struct BanData : public ExtensibleItem
 		}
 	}
 
-	void OnDelete()
+	void OnDelete() anope_override
 	{
 		delete this;
 	}
@@ -659,7 +659,7 @@ struct UserData : public ExtensibleItem
 
 	Anope::string lastline;
 
-	void OnDelete()
+	void OnDelete() anope_override
 	{
 		delete this;
 	}
@@ -671,7 +671,7 @@ class BanDataPurger : public CallBack
  public:
 	BanDataPurger(Module *owner) : CallBack(owner, 300, Anope::CurTime, true) { }
 
-	void Tick(time_t)
+	void Tick(time_t) anope_override
 	{
 		Log(LOG_DEBUG) << "bs_main: Running bandata purger";
 
@@ -785,7 +785,7 @@ class BSKick : public Module
 		}
 	}
 
-	void OnPrivmsg(User *u, Channel *c, Anope::string &msg)
+	void OnPrivmsg(User *u, Channel *c, Anope::string &msg) anope_override
 	{
 		/* Now we can make kicker stuff. We try to order the checks
 		 * from the fastest one to the slowest one, since there's
diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp
index 0b1aba233..25472baf9 100644
--- a/modules/commands/bs_set.cpp
+++ b/modules/commands/bs_set.cpp
@@ -22,7 +22,7 @@ class CommandBSSet : public Command
 		this->SetSyntax(_("\037(channel | bot)\037 \037option\037 \037settings\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &chan = params[0];
 		const Anope::string &option = params[1];
@@ -150,7 +150,7 @@ class CommandBSSet : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		if (subcommand.empty())
 		{
@@ -226,7 +226,7 @@ class CommandBSSet : public Command
 		return true;
 	}
 
-	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
+	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		if (subcommand.empty())
 			Command::OnSyntaxError(source, "");
diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index 3c36fabbd..b8b5aa546 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -31,7 +31,7 @@ class AccessChanAccess : public ChanAccess
 	{
 	}
 
-	bool HasPriv(const Anope::string &name) const
+	bool HasPriv(const Anope::string &name) const anope_override
 	{
 		return this->ci->GetLevel(name) != ACCESS_INVALID && this->level >= this->ci->GetLevel(name);
 	}
@@ -41,7 +41,7 @@ class AccessChanAccess : public ChanAccess
 		return stringify(this->level);
 	}
 
-	void Unserialize(const Anope::string &data)
+	void Unserialize(const Anope::string &data) anope_override
 	{
 		this->level = convertTo<int>(data);
 	}
@@ -80,7 +80,7 @@ class AccessAccessProvider : public AccessProvider
 	{
 	}
 
-	ChanAccess *Create()
+	ChanAccess *Create() anope_override
 	{
 		return new AccessChanAccess(this);
 	}
@@ -211,7 +211,7 @@ class CommandCSAccess : public Command
 					}
 				}
 
-				void HandleNumber(unsigned Number)
+				void HandleNumber(unsigned Number) anope_override
 				{
 					if (!Number || Number > ci->GetAccessCount())
 						return;
@@ -294,7 +294,7 @@ class CommandCSAccess : public Command
 				{
 				}
 
-				void HandleNumber(unsigned number)
+				void HandleNumber(unsigned number) anope_override
 				{
 					if (!number || number > ci->GetAccessCount())
 						return;
@@ -434,7 +434,7 @@ class CommandCSAccess : public Command
 		this->SetSyntax(_("\037channel\037 CLEAR\002"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &cmd = params[1];
 		const Anope::string &nick = params.size() > 2 ? params[2] : "";
@@ -491,7 +491,7 @@ class CommandCSAccess : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -690,7 +690,7 @@ class CommandCSLevels : public Command
 		this->SetSyntax(_("\037channel\037 RESET"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &cmd = params[1];
 		const Anope::string &what = params.size() > 2 ? params[2] : "";
@@ -726,7 +726,7 @@ class CommandCSLevels : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		if (subcommand.equals_ci("DESC"))
 		{
@@ -804,7 +804,7 @@ class CSAccess : public Module
 		}
 	}
 
-	void OnReload()
+	void OnReload() anope_override
 	{
 		defaultLevels.clear();
 		ConfigReader config;
@@ -829,12 +829,12 @@ class CSAccess : public Module
 		}
 	}
 
-	void OnCreateChan(ChannelInfo *ci)
+	void OnCreateChan(ChannelInfo *ci) anope_override
 	{
 		reset_levels(ci);
 	}
 
-	EventReturn OnGroupCheckPriv(const AccessGroup *group, const Anope::string &priv)
+	EventReturn OnGroupCheckPriv(const AccessGroup *group, const Anope::string &priv) anope_override
 	{
 		if (group->ci == NULL)
 			return EVENT_CONTINUE;
diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp
index 47f174e59..328a169d4 100644
--- a/modules/commands/cs_akick.cpp
+++ b/modules/commands/cs_akick.cpp
@@ -202,7 +202,7 @@ class CommandCSAKick : public Command
 						source.Reply(_("Deleted %d entries from %s autokick list."), Deleted, ci->name.c_str());
 				}
 
-				void HandleNumber(unsigned Number)
+				void HandleNumber(unsigned Number) anope_override
 				{
 					if (!Number || Number > ci->GetAkickCount())
 						return;
@@ -258,7 +258,7 @@ class CommandCSAKick : public Command
 				{
 				}
 
-				void HandleNumber(unsigned number)
+				void HandleNumber(unsigned number) anope_override
 				{
 					if (!number || number > ci->GetAkickCount())
 						return;
@@ -413,7 +413,7 @@ class CommandCSAKick : public Command
 		this->SetSyntax(_("\037channel\037 CLEAR"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		Anope::string chan = params[0];
 		Anope::string cmd = params[1];
@@ -452,7 +452,7 @@ class CommandCSAKick : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_appendtopic.cpp b/modules/commands/cs_appendtopic.cpp
index 4186bdaff..fe1633b8a 100644
--- a/modules/commands/cs_appendtopic.cpp
+++ b/modules/commands/cs_appendtopic.cpp
@@ -48,7 +48,7 @@ class CommandCSAppendTopic : public Command
 		this->SetSyntax(_("\037channel\037 \037text\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &newtopic = params[1];
 
@@ -84,7 +84,7 @@ class CommandCSAppendTopic : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp
index e0c5dd95e..867d654c5 100644
--- a/modules/commands/cs_ban.cpp
+++ b/modules/commands/cs_ban.cpp
@@ -23,7 +23,7 @@ class CommandCSBan : public Command
 		this->SetSyntax(_("\037channel\037 \037mask\037 [\037reason\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &chan = params[0];
 		const Anope::string &target = params[1];
@@ -121,7 +121,7 @@ class CommandCSBan : public Command
 			source.Reply(NICK_X_NOT_IN_USE, target.c_str());
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_clearusers.cpp b/modules/commands/cs_clearusers.cpp
index e65aa34eb..58de57f5a 100644
--- a/modules/commands/cs_clearusers.cpp
+++ b/modules/commands/cs_clearusers.cpp
@@ -22,7 +22,7 @@ class CommandCSClearUsers : public Command
 		this->SetSyntax(_("\037channel\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &chan = params[0];
 
@@ -63,7 +63,7 @@ class CommandCSClearUsers : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_clone.cpp b/modules/commands/cs_clone.cpp
index 905a26177..8205b723c 100644
--- a/modules/commands/cs_clone.cpp
+++ b/modules/commands/cs_clone.cpp
@@ -22,7 +22,7 @@ public:
 		this->SetSyntax(_("\037channel\037 \037target\037 [\037what\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &channel = params[0];
 		const Anope::string &target = params[1];
@@ -159,7 +159,7 @@ public:
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp
index 429f70ad1..e9736851a 100644
--- a/modules/commands/cs_drop.cpp
+++ b/modules/commands/cs_drop.cpp
@@ -22,7 +22,7 @@ class CommandCSDrop : public Command
 		this->SetSyntax(_("\037channel\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &chan = params[0];
 
@@ -68,7 +68,7 @@ class CommandCSDrop : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		User *u = source.u;
 		this->SendSyntax(source);
diff --git a/modules/commands/cs_enforce.cpp b/modules/commands/cs_enforce.cpp
index ed13c3f4f..1c5cabddd 100644
--- a/modules/commands/cs_enforce.cpp
+++ b/modules/commands/cs_enforce.cpp
@@ -118,7 +118,7 @@ class CommandCSEnforce : public Command
 		this->SetSyntax(_("\037channel\037 [\037what\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &what = params.size() > 1 ? params[1] : "";
 
@@ -165,7 +165,7 @@ class CommandCSEnforce : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_entrymsg.cpp b/modules/commands/cs_entrymsg.cpp
index 758c3f96c..477f68cb2 100644
--- a/modules/commands/cs_entrymsg.cpp
+++ b/modules/commands/cs_entrymsg.cpp
@@ -29,12 +29,12 @@ struct EntryMsg : Serializable
 		this->when = ct;
 	}
 
-	Anope::string serialize_name() const
+	Anope::string serialize_name() const anope_override
 	{
 		return "EntryMsg";
 	}
 
-	serialized_data serialize()
+	serialized_data serialize() anope_override
 	{
 		serialized_data data;
 
@@ -167,7 +167,7 @@ class CommandEntryMessage : public Command
 		this->SetSyntax(_("\037channel\037 {ADD|DEL|LIST|CLEAR} [\037message\037|\037num\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -208,7 +208,7 @@ class CommandEntryMessage : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -233,7 +233,7 @@ class CSEntryMessage : public Module
 		this->OnReload();
 	}
 
-	void OnJoinChannel(User *u, Channel *c)
+	void OnJoinChannel(User *u, Channel *c) anope_override
 	{
 		if (u && c && c->ci && u->server->IsSynced())
 		{
@@ -245,7 +245,7 @@ class CSEntryMessage : public Module
 		}
 	}
 		
-	void OnReload()
+	void OnReload() anope_override
 	{
 		ConfigReader config;
 		MaxEntries = config.ReadInteger("cs_entrymsg", "maxentries", "5", 0, true);
diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp
index 0e48f59c7..f5dc7fe1c 100644
--- a/modules/commands/cs_flags.cpp
+++ b/modules/commands/cs_flags.cpp
@@ -24,7 +24,7 @@ class FlagsChanAccess : public ChanAccess
 	{
 	}
 
-	bool HasPriv(const Anope::string &priv) const
+	bool HasPriv(const Anope::string &priv) const anope_override
 	{
 		std::map<Anope::string, char>::iterator it = defaultFlags.find(priv);
 		if (it != defaultFlags.end() && this->flags.count(it->second) > 0)
@@ -37,7 +37,7 @@ class FlagsChanAccess : public ChanAccess
 		return Anope::string(this->flags.begin(), this->flags.end());
 	}
 
-	void Unserialize(const Anope::string &data)
+	void Unserialize(const Anope::string &data) anope_override
 	{
 		for (unsigned i = data.length(); i > 0; --i)
 			this->flags.insert(data[i - 1]);
@@ -65,7 +65,7 @@ class FlagsAccessProvider : public AccessProvider
 	{
 	}
 
-	ChanAccess *Create()
+	ChanAccess *Create() anope_override
 	{
 		return new FlagsChanAccess(this);
 	}
@@ -300,7 +300,7 @@ class CommandCSFlags : public Command
 		this->SetSyntax(_("\037channel\037 CLEAR\002"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &chan = params[0];
 		const Anope::string &cmd = params[1];
@@ -336,7 +336,7 @@ class CommandCSFlags : public Command
 			this->OnSyntaxError(source, cmd);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -394,7 +394,7 @@ class CSFlags : public Module
 		this->OnReload();
 	}
 
-	void OnReload()
+	void OnReload() anope_override
 	{
 		ConfigReader config;
 		defaultFlags.clear();
diff --git a/modules/commands/cs_getkey.cpp b/modules/commands/cs_getkey.cpp
index 287ed82b0..f8164707d 100644
--- a/modules/commands/cs_getkey.cpp
+++ b/modules/commands/cs_getkey.cpp
@@ -22,7 +22,7 @@ class CommandCSGetKey : public Command
 		this->SetSyntax(_("\037channel\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &chan = params[0];
 
@@ -55,7 +55,7 @@ class CommandCSGetKey : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_info.cpp b/modules/commands/cs_info.cpp
index b86755d58..1554a0693 100644
--- a/modules/commands/cs_info.cpp
+++ b/modules/commands/cs_info.cpp
@@ -34,7 +34,7 @@ class CommandCSInfo : public Command
 		this->SetSyntax(_("\037channel\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &chan = params[0];
 
@@ -119,7 +119,7 @@ class CommandCSInfo : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_invite.cpp b/modules/commands/cs_invite.cpp
index 7dc4b9f7d..b38828c9d 100644
--- a/modules/commands/cs_invite.cpp
+++ b/modules/commands/cs_invite.cpp
@@ -22,7 +22,7 @@ class CommandCSInvite : public Command
 		this->SetSyntax(_("\037channel\037 [\037nick\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &chan = params[0];
 
@@ -86,7 +86,7 @@ class CommandCSInvite : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_kick.cpp b/modules/commands/cs_kick.cpp
index 09d51b39f..3ee444698 100644
--- a/modules/commands/cs_kick.cpp
+++ b/modules/commands/cs_kick.cpp
@@ -23,7 +23,7 @@ class CommandCSKick : public Command
 		this->SetSyntax(_("\037channel\037 \037mask\037 [\037reason\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &chan = params[0];
 		const Anope::string &target = params[1];
@@ -105,7 +105,7 @@ class CommandCSKick : public Command
 			source.Reply(NICK_X_NOT_IN_USE, target.c_str());
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_list.cpp b/modules/commands/cs_list.cpp
index dff564d70..57c14d157 100644
--- a/modules/commands/cs_list.cpp
+++ b/modules/commands/cs_list.cpp
@@ -23,7 +23,7 @@ class CommandCSList : public Command
 		this->SetSyntax(_("\037pattern\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -117,7 +117,7 @@ class CommandCSList : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_log.cpp b/modules/commands/cs_log.cpp
index 35f8831e6..28c7e6f91 100644
--- a/modules/commands/cs_log.cpp
+++ b/modules/commands/cs_log.cpp
@@ -24,7 +24,7 @@ public:
 		this->SetSyntax(_("\037channel\037 \037command\037 \037method\037 [\037status\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &channel = params[0];
 
@@ -151,7 +151,7 @@ public:
 			this->OnSyntaxError(source, "");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -192,7 +192,7 @@ class CSLog : public Module
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
-	void OnLog(Log *l)
+	void OnLog(Log *l) anope_override
 	{
 		if (l->Type != LOG_COMMAND || l->u == NULL || l->c == NULL || l->ci == NULL || !Me || !Me->IsSynced())
 			return;
diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp
index f2e6479c1..e0dda5524 100644
--- a/modules/commands/cs_mode.cpp
+++ b/modules/commands/cs_mode.cpp
@@ -339,7 +339,7 @@ class CommandCSMode : public Command
 		this->SetSyntax(_("\037channel\037 SET \037modes\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &subcommand = params[1];
 
@@ -360,7 +360,7 @@ class CommandCSMode : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_modes.cpp b/modules/commands/cs_modes.cpp
index 0e1f9ef64..a460c6c87 100644
--- a/modules/commands/cs_modes.cpp
+++ b/modules/commands/cs_modes.cpp
@@ -90,14 +90,14 @@ class CommandCSOp : public CommandModeBase
 		this->SetDesc(_("Gives Op status to a selected nick on a channel"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OP);
 
 		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "OPDEOP", "OPDEOPME");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -119,14 +119,14 @@ class CommandCSDeOp : public CommandModeBase
 		this->SetDesc(_("Deops a selected nick on a channel"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OP);
 
 		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "OPDEOP", "OPDEOPME");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -148,14 +148,14 @@ class CommandCSVoice : public CommandModeBase
 		this->SetDesc(_("Voices a selected nick on a channel"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_VOICE);
 
 		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "VOICE", "VOICEME");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -178,14 +178,14 @@ class CommandCSDeVoice : public CommandModeBase
 		this->SetDesc(_("Devoices a selected nick on a channel"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_VOICE);
 
 		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "VOICE", "VOICEME");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -208,7 +208,7 @@ class CommandCSHalfOp : public CommandModeBase
 		this->SetDesc(_("Halfops a selected nick on a channel"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_HALFOP);
 
@@ -218,7 +218,7 @@ class CommandCSHalfOp : public CommandModeBase
 		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "HALFOP", "HALFOPME");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -241,7 +241,7 @@ class CommandCSDeHalfOp : public CommandModeBase
 		this->SetDesc(_("Dehalfops a selected nick on a channel"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_HALFOP);
 
@@ -251,7 +251,7 @@ class CommandCSDeHalfOp : public CommandModeBase
 		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "HALFOP", "HALFOPME");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -274,7 +274,7 @@ class CommandCSProtect : public CommandModeBase
 		this->SetDesc(_("Protects a selected nick on a channel"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_PROTECT);
 
@@ -284,7 +284,7 @@ class CommandCSProtect : public CommandModeBase
 		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "PROTECT", "PROTECTME");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -306,7 +306,7 @@ class CommandCSDeProtect : public CommandModeBase
 		this->SetDesc(_("Deprotects a selected nick on a channel"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_PROTECT);
 
@@ -316,7 +316,7 @@ class CommandCSDeProtect : public CommandModeBase
 		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "PROTECT", "PROTECTME");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -338,7 +338,7 @@ class CommandCSOwner : public CommandModeBase
 		this->SetDesc(_("Gives you owner status on channel"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OWNER);
 
@@ -348,7 +348,7 @@ class CommandCSOwner : public CommandModeBase
 		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", true, "OWNER", "OWNERME");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -369,7 +369,7 @@ class CommandCSDeOwner : public CommandModeBase
 		this->SetDesc(_("Removes your owner status on a channel"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_OWNER);
 
@@ -379,7 +379,7 @@ class CommandCSDeOwner : public CommandModeBase
 		return do_util(source, this, cm, !params.empty() ? params[0] : "", params.size() > 1 ? params[1] : "", false, "OWNER", "OWNERME");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_register.cpp b/modules/commands/cs_register.cpp
index bf834c01f..9cf5a7a9b 100644
--- a/modules/commands/cs_register.cpp
+++ b/modules/commands/cs_register.cpp
@@ -22,7 +22,7 @@ class CommandCSRegister : public Command
 		this->SetSyntax(_("\037channel\037 [\037description\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &chan = params[0];
 		const Anope::string &chdesc = params.size() > 1 ? params[1] : "";
@@ -101,7 +101,7 @@ class CommandCSRegister : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -142,7 +142,7 @@ class CSRegister : public Module
 		ModuleManager::Attach(I_OnDelChan, this);
 	}
 
-	void OnDelChan(ChannelInfo *ci)
+	void OnDelChan(ChannelInfo *ci) anope_override
 	{
 		if (ci->c && ci->c->HasMode(CMODE_REGISTERED))
 			ci->c->RemoveMode(NULL, CMODE_REGISTERED, "", false);
diff --git a/modules/commands/cs_saset.cpp b/modules/commands/cs_saset.cpp
index 3290e7cc3..c564a9c90 100644
--- a/modules/commands/cs_saset.cpp
+++ b/modules/commands/cs_saset.cpp
@@ -22,13 +22,13 @@ class CommandCSSASet : public Command
 		this->SetSyntax(_("\037option\037 \037channel\037 \037parameters\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->OnSyntaxError(source, "");
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_saset_noexpire.cpp b/modules/commands/cs_saset_noexpire.cpp
index 2e4ff774e..a71544a25 100644
--- a/modules/commands/cs_saset_noexpire.cpp
+++ b/modules/commands/cs_saset_noexpire.cpp
@@ -22,7 +22,7 @@ class CommandCSSASetNoexpire : public Command
 		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -54,7 +54,7 @@ class CommandCSSASetNoexpire : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp
index 59f2dcdc9..8466cf82c 100644
--- a/modules/commands/cs_seen.cpp
+++ b/modules/commands/cs_seen.cpp
@@ -37,12 +37,12 @@ struct SeenInfo : Serializable
 	{
 	}
 
-	Anope::string serialize_name() const
+	Anope::string serialize_name() const anope_override
 	{
 		return "SeenInfo";
 	}
 
-	serialized_data serialize()
+	serialized_data serialize() anope_override
 	{
 		serialized_data data;
 
@@ -110,7 +110,7 @@ class CommandOSSeen : public Command
 		this->SetSyntax(_("\037CLEAR\037 \037time\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		if (params[0].equals_ci("STATS"))
 		{
@@ -156,7 +156,7 @@ class CommandOSSeen : public Command
 			this->SendSyntax(source);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -181,7 +181,7 @@ class CommandSeen : public Command
 		this->SetSyntax(_("\037nick\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &target = params[0];
 		User *u = source.u;
@@ -276,7 +276,7 @@ class CommandSeen : public Command
 		}
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -292,7 +292,7 @@ class DataBasePurger : public CallBack
  public:
 	DataBasePurger(Module *owner) : CallBack(owner, 300, Anope::CurTime, true) { }
 
-	void Tick(time_t)
+	void Tick(time_t) anope_override
 	{
 		size_t previous_size = database.size();
 		for (database_map::iterator it = database.begin(), it_end = database.end(); it != it_end;)
@@ -334,7 +334,7 @@ class CSSeen : public Module
 		OnReload();
 	}
 
-	void OnReload()
+	void OnReload() anope_override
 	{
 		ConfigReader config;
 		purgetime = dotime(config.ReadValue("cs_seen", "purgetime", "30d", 0));
@@ -344,37 +344,38 @@ class CSSeen : public Module
 			purger.SetSecs(expiretimeout);
 	}
 
-	void OnUserConnect(User *u)
+	void OnUserConnect(dynamic_reference<User> &u, bool &exempt) anope_override
 	{
 		UpdateUser(u, NEW, u->nick, "", "", "");
 	}
 
-	void OnUserNickChange(User *u, const Anope::string &oldnick)
+	void OnUserNickChange(User *u, const Anope::string &oldnick) anope_override
 	{
 		UpdateUser(u, NICK_TO, oldnick, u->nick, "", "");
 		UpdateUser(u, NICK_FROM, u->nick, oldnick, "", "");
 	}
 
-	void OnUserQuit(User *u, const Anope::string &msg)
+	void OnUserQuit(User *u, const Anope::string &msg) anope_override
 	{
 		UpdateUser(u, QUIT, u->nick, "", "", msg);
 	}
 
-	void OnJoinChannel(User *u, Channel *c)
+	void OnJoinChannel(User *u, Channel *c) anope_override
 	{
 		UpdateUser(u, JOIN, u->nick, "", c->name, "");
 	}
 
-	void OnPartChannel(User *u, Channel *c, const Anope::string &channel, const Anope::string &msg)
+	void OnPartChannel(User *u, Channel *c, const Anope::string &channel, const Anope::string &msg) anope_override
 	{
 		UpdateUser(u, PART, u->nick, "", channel, msg);
 	}
 
-	void OnUserKicked(Channel *c, User *target, const Anope::string &source, const Anope::string &msg)
+	void OnUserKicked(Channel *c, User *target, const Anope::string &source, const Anope::string &msg) anope_override
 	{
 		UpdateUser(target, KICK, target->nick, source, c->name, msg);
 	}
 
+ private:
 	void UpdateUser(const User *u, const TypeInfo Type, const Anope::string &nick, const Anope::string &nick2, const Anope::string &channel, const Anope::string &message)
 	{
 		SeenInfo *info = FindInfo(nick);
diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp
index 9a63c8335..ac91d213f 100644
--- a/modules/commands/cs_set.cpp
+++ b/modules/commands/cs_set.cpp
@@ -22,13 +22,13 @@ class CommandCSSet : public Command
 		this->SetSyntax(_("\037option\037 \037channel\037 \037parameters\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->OnSyntaxError(source, "");
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_bantype.cpp b/modules/commands/cs_set_bantype.cpp
index e55093d6d..af63d0568 100644
--- a/modules/commands/cs_set_bantype.cpp
+++ b/modules/commands/cs_set_bantype.cpp
@@ -22,7 +22,7 @@ class CommandCSSetBanType : public Command
 		this->SetSyntax(_("\037channel\037 \037bantype\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -54,7 +54,7 @@ class CommandCSSetBanType : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_description.cpp b/modules/commands/cs_set_description.cpp
index 79cb93b24..0abd8462e 100644
--- a/modules/commands/cs_set_description.cpp
+++ b/modules/commands/cs_set_description.cpp
@@ -22,7 +22,7 @@ class CommandCSSetDescription : public Command
 		this->SetSyntax(_("\037channel\037 [\037description\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -52,7 +52,7 @@ class CommandCSSetDescription : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_founder.cpp b/modules/commands/cs_set_founder.cpp
index fade8a27b..0d375f760 100644
--- a/modules/commands/cs_set_founder.cpp
+++ b/modules/commands/cs_set_founder.cpp
@@ -22,7 +22,7 @@ class CommandCSSetFounder : public Command
 		this->SetSyntax(_("\037channel\037 \037nick\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params)anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -68,7 +68,7 @@ class CommandCSSetFounder : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_keeptopic.cpp b/modules/commands/cs_set_keeptopic.cpp
index 2c07d2a7b..3c9df3f3f 100644
--- a/modules/commands/cs_set_keeptopic.cpp
+++ b/modules/commands/cs_set_keeptopic.cpp
@@ -22,7 +22,7 @@ class CommandCSSetKeepTopic : public Command
 		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -54,7 +54,7 @@ class CommandCSSetKeepTopic : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_misc.cpp b/modules/commands/cs_set_misc.cpp
index beb0cf255..75794697d 100644
--- a/modules/commands/cs_set_misc.cpp
+++ b/modules/commands/cs_set_misc.cpp
@@ -22,12 +22,12 @@ struct CSMiscData : Anope::string, ExtensibleItem, Serializable
 	{
 	}
 
-	Anope::string serialize_name() const
+	Anope::string serialize_name() const anope_override
 	{
 		return "CSMiscData";
 	}
 
-	serialized_data serialize()
+	serialized_data serialize() anope_override
 	{
 		serialized_data sdata;
 
@@ -64,7 +64,7 @@ class CommandCSSetMisc : public Command
 		this->SetSyntax(_("\037channel\037 [\037parameters\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		ChannelInfo *ci = cs_findchan(params[0]);
 		if (ci == NULL)
@@ -115,7 +115,7 @@ class CSSetMisc : public Module
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
-	void OnChanInfo(CommandSource &source, ChannelInfo *ci, InfoFormatter &info, bool ShowHidden)
+	void OnChanInfo(CommandSource &source, ChannelInfo *ci, InfoFormatter &info, bool ShowHidden) anope_override
 	{
 		std::deque<Anope::string> list;
 		ci->GetExtList(list);
diff --git a/modules/commands/cs_set_peace.cpp b/modules/commands/cs_set_peace.cpp
index e670993fd..002690721 100644
--- a/modules/commands/cs_set_peace.cpp
+++ b/modules/commands/cs_set_peace.cpp
@@ -22,7 +22,7 @@ class CommandCSSetPeace : public Command
 		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -54,7 +54,7 @@ class CommandCSSetPeace : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_persist.cpp b/modules/commands/cs_set_persist.cpp
index 7d31b9fff..4136a2fa2 100644
--- a/modules/commands/cs_set_persist.cpp
+++ b/modules/commands/cs_set_persist.cpp
@@ -22,7 +22,7 @@ class CommandCSSetPersist : public Command
 		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -126,7 +126,7 @@ class CommandCSSetPersist : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_private.cpp b/modules/commands/cs_set_private.cpp
index 733c4a22e..4fd261c45 100644
--- a/modules/commands/cs_set_private.cpp
+++ b/modules/commands/cs_set_private.cpp
@@ -22,7 +22,7 @@ class CommandCSSetPrivate : public Command
 		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -54,7 +54,7 @@ class CommandCSSetPrivate : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_restricted.cpp b/modules/commands/cs_set_restricted.cpp
index 2ea996224..f02d17f3f 100644
--- a/modules/commands/cs_set_restricted.cpp
+++ b/modules/commands/cs_set_restricted.cpp
@@ -21,7 +21,7 @@ class CommandCSSetRestricted : public Command
 		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -53,7 +53,7 @@ class CommandCSSetRestricted : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_secure.cpp b/modules/commands/cs_set_secure.cpp
index c58501bf4..480071cbc 100644
--- a/modules/commands/cs_set_secure.cpp
+++ b/modules/commands/cs_set_secure.cpp
@@ -22,7 +22,7 @@ class CommandCSSetSecure : public Command
 		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -54,7 +54,7 @@ class CommandCSSetSecure : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_securefounder.cpp b/modules/commands/cs_set_securefounder.cpp
index cd5666b05..ad4a91033 100644
--- a/modules/commands/cs_set_securefounder.cpp
+++ b/modules/commands/cs_set_securefounder.cpp
@@ -22,7 +22,7 @@ class CommandCSSetSecureFounder : public Command
 		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -55,7 +55,7 @@ class CommandCSSetSecureFounder : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_secureops.cpp b/modules/commands/cs_set_secureops.cpp
index 912c56f57..b83e32a63 100644
--- a/modules/commands/cs_set_secureops.cpp
+++ b/modules/commands/cs_set_secureops.cpp
@@ -22,7 +22,7 @@ class CommandCSSetSecureOps : public Command
 		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -54,7 +54,7 @@ class CommandCSSetSecureOps : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_signkick.cpp b/modules/commands/cs_set_signkick.cpp
index 8804fdf4e..f8cce4022 100644
--- a/modules/commands/cs_set_signkick.cpp
+++ b/modules/commands/cs_set_signkick.cpp
@@ -22,7 +22,7 @@ class CommandCSSetSignKick : public Command
 		this->SetSyntax(_("\037channel\037 SIGNKICK {ON | LEVEL | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -61,7 +61,7 @@ class CommandCSSetSignKick : public Command
 			this->OnSyntaxError(source, "SIGNKICK");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_successor.cpp b/modules/commands/cs_set_successor.cpp
index 4b7015b9d..fe2860920 100644
--- a/modules/commands/cs_set_successor.cpp
+++ b/modules/commands/cs_set_successor.cpp
@@ -22,7 +22,7 @@ class CommandCSSetSuccessor : public Command
 		this->SetSyntax(_("\037channel\037 \037nick\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -77,7 +77,7 @@ class CommandCSSetSuccessor : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_set_topiclock.cpp b/modules/commands/cs_set_topiclock.cpp
index 0f33c911f..3a3c7d47c 100644
--- a/modules/commands/cs_set_topiclock.cpp
+++ b/modules/commands/cs_set_topiclock.cpp
@@ -22,7 +22,7 @@ class CommandCSSetTopicLock : public Command
 		this->SetSyntax(_("\037channel\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -54,7 +54,7 @@ class CommandCSSetTopicLock : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp
index 2d7e6d29c..676ffebfa 100644
--- a/modules/commands/cs_suspend.cpp
+++ b/modules/commands/cs_suspend.cpp
@@ -27,7 +27,7 @@ struct ChanSuspend : ExtensibleItem, Serializable
 		return "ChanSuspend";
 	}
 
-	serialized_data serialize()
+	serialized_data serialize() anope_override
 	{
 		serialized_data sd;
 
@@ -61,7 +61,7 @@ class CommandCSSuspend : public Command
 		this->SetSyntax(_("\037channel\037 [+\037expiry\037] [\037reason\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &chan = params[0];
 		Anope::string expiry = params.size() > 1 ? params[1] : "";
@@ -130,7 +130,7 @@ class CommandCSSuspend : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -155,7 +155,7 @@ class CommandCSUnSuspend : public Command
 		this->SetSyntax(_("\037channel\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -192,7 +192,7 @@ class CommandCSUnSuspend : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -228,7 +228,7 @@ class CSSuspend : public Module
 		}
 	}
 
-	void OnPreChanExpire(ChannelInfo *ci, bool &expire)
+	void OnPreChanExpire(ChannelInfo *ci, bool &expire) anope_override
 	{
 		if (!ci->HasFlag(CI_SUSPENDED))
 			return;
diff --git a/modules/commands/cs_sync.cpp b/modules/commands/cs_sync.cpp
index 50c451fa7..d3542398b 100644
--- a/modules/commands/cs_sync.cpp
+++ b/modules/commands/cs_sync.cpp
@@ -20,7 +20,7 @@ class CommandCSSync : public Command
 		this->SetSyntax(_("\037channel\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		ChannelInfo *ci = cs_findchan(params[0]);
@@ -40,7 +40,7 @@ class CommandCSSync : public Command
 		}
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &params)
+	bool OnHelp(CommandSource &source, const Anope::string &params) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_tban.cpp b/modules/commands/cs_tban.cpp
index 4f063c6e1..61f1f810f 100644
--- a/modules/commands/cs_tban.cpp
+++ b/modules/commands/cs_tban.cpp
@@ -28,7 +28,7 @@ class TempBan : public CallBack
  public:
 	TempBan(time_t seconds, Channel *c, const Anope::string &banmask) : CallBack(me, seconds), chan(c), mask(banmask) { }
 
-	void Tick(time_t ctime)
+	void Tick(time_t ctime) anope_override
 	{
 		if (chan && chan->ci)
 			chan->RemoveMode(NULL, CMODE_BAN, mask);
@@ -44,7 +44,7 @@ class CommandCSTBan : public Command
 		this->SetSyntax(_("\037channel\037 \037nick\037 \037time\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		Channel *c = findchan(params[0]);
 
@@ -78,7 +78,7 @@ class CommandCSTBan : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->OnSyntaxError(source, "");
 		source.Reply(" ");
diff --git a/modules/commands/cs_topic.cpp b/modules/commands/cs_topic.cpp
index 910e2129b..e1aba12fb 100644
--- a/modules/commands/cs_topic.cpp
+++ b/modules/commands/cs_topic.cpp
@@ -22,7 +22,7 @@ class CommandCSTopic : public Command
 		this->SetSyntax(_("\037channel\037 [\037topic\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &topic = params.size() > 1 ? params[1] : "";
 
@@ -53,7 +53,7 @@ class CommandCSTopic : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_unban.cpp b/modules/commands/cs_unban.cpp
index 6963dd308..24d9caab8 100644
--- a/modules/commands/cs_unban.cpp
+++ b/modules/commands/cs_unban.cpp
@@ -22,7 +22,7 @@ class CommandCSUnban : public Command
 		this->SetSyntax(_("\037channel\037 [\037nick\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -64,7 +64,7 @@ class CommandCSUnban : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_updown.cpp b/modules/commands/cs_updown.cpp
index 50f1297d1..da272835f 100644
--- a/modules/commands/cs_updown.cpp
+++ b/modules/commands/cs_updown.cpp
@@ -22,7 +22,7 @@ class CommandCSUp : public Command
 		this->SetSyntax(_("[\037channel\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -47,7 +47,7 @@ class CommandCSUp : public Command
 
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -77,7 +77,7 @@ class CommandCSDown : public Command
 		this->SetSyntax(_("[\037channel\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -101,7 +101,7 @@ class CommandCSDown : public Command
 		}
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp
index 39789bf89..5ca488535 100644
--- a/modules/commands/cs_xop.cpp
+++ b/modules/commands/cs_xop.cpp
@@ -99,7 +99,7 @@ class XOPChanAccess : public ChanAccess
 	{
 	}
 
-	bool HasPriv(const Anope::string &priv) const
+	bool HasPriv(const Anope::string &priv) const anope_override
 	{
 		for (int i = 0; xopAccess[i].type != XOP_UNKNOWN; ++i)
 		{
@@ -129,7 +129,7 @@ class XOPChanAccess : public ChanAccess
 		return "";
 	}
 
-	void Unserialize(const Anope::string &data)
+	void Unserialize(const Anope::string &data) anope_override
 	{
 		for (int i = 0; xopAccess[i].type != XOP_UNKNOWN; ++i)
 		{
@@ -188,7 +188,7 @@ class XOPAccessProvider : public AccessProvider
 	{
 	}
 
-	ChanAccess *Create()
+	ChanAccess *Create() anope_override
 	{
 		return new XOPChanAccess(this);
 	}
@@ -340,7 +340,7 @@ class XOPBase : public Command
 					}
 				}
 
-				void HandleNumber(unsigned Number)
+				void HandleNumber(unsigned Number) anope_override
 				{
 					if (!Number || Number > ci->GetAccessCount())
 						return;
@@ -394,17 +394,11 @@ class XOPBase : public Command
 		const Anope::string &nick = params.size() > 2 ? params[2] : "";
 
 		AccessGroup access = ci->AccessFor(u);
-		bool override = false;
 
-		if (!access.HasPriv("ACCESS_LIST"))
+		if (!access.HasPriv("ACCESS_LIST") && !u->HasCommand("chanserv/access/list"))
 		{
-			if (u->HasCommand("chanserv/access/list"))
-				override = true;
-			else
-			{
-				source.Reply(ACCESS_DENIED);
-				return;
-			}
+			source.Reply(ACCESS_DENIED);
+			return;
 		}
 
 		if (!ci->GetAccessCount())
@@ -428,7 +422,7 @@ class XOPBase : public Command
 				{
 				}
 
-				void HandleNumber(unsigned Number)
+				void HandleNumber(unsigned Number) anope_override
 				{
 					if (!Number || Number > ci->GetAccessCount())
 						return;
@@ -567,12 +561,12 @@ class CommandCSQOP : public XOPBase
 		this->SetDesc(_("Modify the list of QOP users"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		return this->DoXop(source, params, XOP_QOP);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -621,12 +615,12 @@ class CommandCSAOP : public XOPBase
 		this->SetDesc(_("Modify the list of AOP users"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		return this->DoXop(source, params, XOP_AOP);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -677,12 +671,12 @@ class CommandCSHOP : public XOPBase
 		this->SetDesc(_("Maintains the HOP (HalfOP) list for a channel"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		return this->DoXop(source, params, XOP_HOP);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -731,12 +725,12 @@ class CommandCSSOP : public XOPBase
 		this->SetDesc(_("Modify the list of SOP users"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		return this->DoXop(source, params, XOP_SOP);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -786,12 +780,12 @@ class CommandCSVOP : public XOPBase
 		this->SetDesc(_("Maintains the VOP (VOicePeople) list for a channel"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		return this->DoXop(source, params, XOP_VOP);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/gl_global.cpp b/modules/commands/gl_global.cpp
index 3622833ad..0933efb13 100644
--- a/modules/commands/gl_global.cpp
+++ b/modules/commands/gl_global.cpp
@@ -23,7 +23,7 @@ class CommandGLGlobal : public Command
 		this->SetSyntax(_("\037message\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &msg = params[0];
@@ -37,7 +37,7 @@ class CommandGLGlobal : public Command
 		}
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/help.cpp b/modules/commands/help.cpp
index a7356c0d0..a329eb63c 100644
--- a/modules/commands/help.cpp
+++ b/modules/commands/help.cpp
@@ -23,7 +23,7 @@ class CommandHelp : public Command
 		this->SetFlag(CFLAG_ALLOW_UNREGISTERED);
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		EventReturn MOD_RESULT;
 		FOREACH_RESULT(I_OnPreHelp, OnPreHelp(source, params));
diff --git a/modules/commands/hs_del.cpp b/modules/commands/hs_del.cpp
index 44b2bf5e6..80b8333d9 100644
--- a/modules/commands/hs_del.cpp
+++ b/modules/commands/hs_del.cpp
@@ -22,7 +22,7 @@ class CommandHSDel : public Command
 		this->SetSyntax(_("\037nick\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &nick = params[0];
@@ -38,7 +38,7 @@ class CommandHSDel : public Command
 			source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -57,7 +57,7 @@ class CommandHSDelAll : public Command
 		this->SetSyntax(_("\037nick\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &nick = params[0];
 		User *u = source.u;
@@ -78,7 +78,7 @@ class CommandHSDelAll : public Command
 			source.Reply(NICK_X_NOT_REGISTERED, nick.c_str());
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/hs_group.cpp b/modules/commands/hs_group.cpp
index 78c863a51..79db12536 100644
--- a/modules/commands/hs_group.cpp
+++ b/modules/commands/hs_group.cpp
@@ -34,7 +34,7 @@ class CommandHSGroup : public Command
 		this->SetSyntax("");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		NickAlias *na = findnick(u->nick);
@@ -52,7 +52,7 @@ class CommandHSGroup : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/hs_list.cpp b/modules/commands/hs_list.cpp
index acba0528f..3bc8be862 100644
--- a/modules/commands/hs_list.cpp
+++ b/modules/commands/hs_list.cpp
@@ -22,7 +22,7 @@ class CommandHSList : public Command
 		this->SetSyntax(_("\002[<key>|<#X-Y>]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &key = !params.empty() ? params[0] : "";
 		int from = 0, to = 0, counter = 1;
@@ -131,7 +131,7 @@ class CommandHSList : public Command
 			source.Reply(replies[i]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/hs_off.cpp b/modules/commands/hs_off.cpp
index 45a8befd3..c9c2fecd1 100644
--- a/modules/commands/hs_off.cpp
+++ b/modules/commands/hs_off.cpp
@@ -22,7 +22,7 @@ class CommandHSOff : public Command
 		this->SetSyntax("");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		NickAlias *na = findnick(u->nick);
@@ -39,7 +39,7 @@ class CommandHSOff : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/hs_on.cpp b/modules/commands/hs_on.cpp
index 2c7d12f41..2dfa18c12 100644
--- a/modules/commands/hs_on.cpp
+++ b/modules/commands/hs_on.cpp
@@ -22,7 +22,7 @@ class CommandHSOn : public Command
 		this->SetSyntax("");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		NickAlias *na = findnick(u->nick);
@@ -49,7 +49,7 @@ class CommandHSOn : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/hs_request.cpp b/modules/commands/hs_request.cpp
index d5f63d175..06308c8cb 100644
--- a/modules/commands/hs_request.cpp
+++ b/modules/commands/hs_request.cpp
@@ -30,12 +30,12 @@ struct HostRequest : ExtensibleItem, Serializable
 	Anope::string host;
 	time_t time;
 
-	Anope::string serialize_name() const
+	Anope::string serialize_name() const anope_override
 	{
 		return "HostRequest";
 	}
 
-	serialized_data serialize()
+	serialized_data serialize() anope_override
 	{
 		serialized_data data;
 
@@ -79,7 +79,7 @@ class CommandHSRequest : public Command
 		this->SetSyntax(_("vhost"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -162,7 +162,7 @@ class CommandHSRequest : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -182,7 +182,7 @@ class CommandHSActivate : public Command
 		this->SetSyntax(_("\037nick\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -206,7 +206,7 @@ class CommandHSActivate : public Command
 			source.Reply(_("No request for nick %s found."), nick.c_str());
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -226,7 +226,7 @@ class CommandHSReject : public Command
 		this->SetDesc(_("Reject the requested vHost of a user"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -259,7 +259,7 @@ class CommandHSReject : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -321,12 +321,12 @@ class CommandHSWaiting : public Command
 		this->SetSyntax("");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		return this->DoList(source);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -362,7 +362,7 @@ class HSRequest : public Module
 			it->second->Shrink("hs_request");
 	}
 
-	void OnReload()
+	void OnReload() anope_override
 	{
 		ConfigReader config;
 		HSRequestMemoUser = config.ReadFlag("hs_request", "memouser", "no", 0);
diff --git a/modules/commands/hs_set.cpp b/modules/commands/hs_set.cpp
index d648952f7..72ec9f07c 100644
--- a/modules/commands/hs_set.cpp
+++ b/modules/commands/hs_set.cpp
@@ -22,7 +22,7 @@ class CommandHSSet : public Command
 		this->SetSyntax(_("\037nick\037 \037hostmask\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -90,7 +90,7 @@ class CommandHSSet : public Command
 			source.Reply(_("VHost for \002%s\002 set to \002%s\002."), nick.c_str(), host.c_str());
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -123,7 +123,7 @@ class CommandHSSetAll : public Command
 		this->SetSyntax(_("\037nick\037 \037hostmask>\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -192,7 +192,7 @@ class CommandHSSetAll : public Command
 			source.Reply(_("VHost for group \002%s\002 set to \002%s\002."), nick.c_str(), host.c_str());
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ms_cancel.cpp b/modules/commands/ms_cancel.cpp
index 7e382ac90..46f410aec 100644
--- a/modules/commands/ms_cancel.cpp
+++ b/modules/commands/ms_cancel.cpp
@@ -23,7 +23,7 @@ class CommandMSCancel : public Command
 		this->SetSyntax(_("{\037nick\037 | \037channel\037}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		if (!memoserv)
 			return;
@@ -53,7 +53,7 @@ class CommandMSCancel : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ms_check.cpp b/modules/commands/ms_check.cpp
index e3ad2fcaf..a77b7192f 100644
--- a/modules/commands/ms_check.cpp
+++ b/modules/commands/ms_check.cpp
@@ -22,7 +22,7 @@ class CommandMSCheck : public Command
 		this->SetSyntax(_("\037nick\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -62,7 +62,7 @@ class CommandMSCheck : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ms_del.cpp b/modules/commands/ms_del.cpp
index d1e982309..f0b65eeac 100644
--- a/modules/commands/ms_del.cpp
+++ b/modules/commands/ms_del.cpp
@@ -23,7 +23,7 @@ class MemoDelCallback : public NumberList
 	{
 	}
 
-	void HandleNumber(unsigned Number)
+	void HandleNumber(unsigned Number) anope_override
 	{
 		if (!Number || Number > mi->memos.size())
 			return;
@@ -47,7 +47,7 @@ class CommandMSDel : public Command
 		this->SetSyntax(_("[\037channel\037] {\037num\037 | \037list\037 | LAST | ALL}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -124,7 +124,7 @@ class CommandMSDel : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ms_ignore.cpp b/modules/commands/ms_ignore.cpp
index a58cb5248..caea7d147 100644
--- a/modules/commands/ms_ignore.cpp
+++ b/modules/commands/ms_ignore.cpp
@@ -24,7 +24,7 @@ class CommandMSIgnore : public Command
 		this->SetSyntax(_("[\037channel\037] {\002ADD|DEL|LIST\002} [\037entry\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		if (!memoserv)
 			return;
@@ -101,7 +101,7 @@ class CommandMSIgnore : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ms_info.cpp b/modules/commands/ms_info.cpp
index e04797005..4efac86eb 100644
--- a/modules/commands/ms_info.cpp
+++ b/modules/commands/ms_info.cpp
@@ -22,7 +22,7 @@ class CommandMSInfo : public Command
 		this->SetSyntax(_("[\037nick\037 | \037channel\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -183,7 +183,7 @@ class CommandMSInfo : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ms_list.cpp b/modules/commands/ms_list.cpp
index 37340f18b..41b0d05a7 100644
--- a/modules/commands/ms_list.cpp
+++ b/modules/commands/ms_list.cpp
@@ -22,7 +22,7 @@ class CommandMSList : public Command
 		this->SetSyntax(_("[\037channel\037] [\037list\037 | NEW]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -77,7 +77,7 @@ class CommandMSList : public Command
 					{
 					}
 
-					void HandleNumber(unsigned Number)
+					void HandleNumber(unsigned Number) anope_override
 					{
 						if (!Number || Number > mi->memos.size())
 							return;
@@ -137,7 +137,7 @@ class CommandMSList : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ms_read.cpp b/modules/commands/ms_read.cpp
index 95953c71d..01dba1592 100644
--- a/modules/commands/ms_read.cpp
+++ b/modules/commands/ms_read.cpp
@@ -58,7 +58,7 @@ class MemoListCallback : public NumberList
 	{
 	}
 
-	void HandleNumber(unsigned Number)
+	void HandleNumber(unsigned Number) anope_override
 	{
 		if (!Number || Number > mi->memos.size())
 			return;
@@ -91,7 +91,7 @@ class CommandMSRead : public Command
 		this->SetSyntax(_("[\037channel\037] {\037num\037 | \037list\037 | LAST | NEW}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -163,7 +163,7 @@ class CommandMSRead : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ms_rsend.cpp b/modules/commands/ms_rsend.cpp
index 1033060be..aca957b05 100644
--- a/modules/commands/ms_rsend.cpp
+++ b/modules/commands/ms_rsend.cpp
@@ -23,7 +23,7 @@ class CommandMSRSend : public Command
 		this->SetSyntax(_("{\037nick\037 | \037channel\037} \037memo-text\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		if (!memoserv)
 			return;
@@ -74,7 +74,7 @@ class CommandMSRSend : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ms_send.cpp b/modules/commands/ms_send.cpp
index d125718a7..ba33233e8 100644
--- a/modules/commands/ms_send.cpp
+++ b/modules/commands/ms_send.cpp
@@ -23,7 +23,7 @@ class CommandMSSend : public Command
 		this->SetSyntax(_("{\037nick\037 | \037channel\037} \037memo-text\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		if (!memoserv)
 			return;
@@ -44,7 +44,7 @@ class CommandMSSend : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ms_sendall.cpp b/modules/commands/ms_sendall.cpp
index f52f824d6..db72a4905 100644
--- a/modules/commands/ms_sendall.cpp
+++ b/modules/commands/ms_sendall.cpp
@@ -23,7 +23,7 @@ class CommandMSSendAll : public Command
 		this->SetSyntax(_("\037memo-text\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		if (!memoserv)
 			return;
@@ -51,7 +51,7 @@ class CommandMSSendAll : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ms_set.cpp b/modules/commands/ms_set.cpp
index 8fb857661..b4ffa95c1 100644
--- a/modules/commands/ms_set.cpp
+++ b/modules/commands/ms_set.cpp
@@ -205,7 +205,7 @@ class CommandMSSet : public Command
 		this->SetSyntax(_("\037option\037 \037parameters\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &cmd = params[0];
@@ -225,7 +225,7 @@ class CommandMSSet : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		if (subcommand.empty())
 		{
diff --git a/modules/commands/ms_staff.cpp b/modules/commands/ms_staff.cpp
index a41a28be1..254a12b7b 100644
--- a/modules/commands/ms_staff.cpp
+++ b/modules/commands/ms_staff.cpp
@@ -23,7 +23,7 @@ class CommandMSStaff : public Command
 		this->SetSyntax(_("\037memo-text\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		if (!memoserv)
 			return;
@@ -47,7 +47,7 @@ class CommandMSStaff : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_access.cpp b/modules/commands/ns_access.cpp
index 14735e408..2d63c472e 100644
--- a/modules/commands/ns_access.cpp
+++ b/modules/commands/ns_access.cpp
@@ -93,7 +93,7 @@ class CommandNSAccess : public Command
 		this->SetSyntax(_("LIST [\037user\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &cmd = params[0];
@@ -151,7 +151,7 @@ class CommandNSAccess : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp
index 933fc19da..5a5dbe7f0 100644
--- a/modules/commands/ns_ajoin.cpp
+++ b/modules/commands/ns_ajoin.cpp
@@ -19,12 +19,12 @@ struct AJoinList : std::vector<std::pair<Anope::string, Anope::string> >, Extens
 
 	AJoinList(NickCore *n) : nc(n) { }
 
-	Anope::string serialize_name() const
+	Anope::string serialize_name() const anope_override
 	{
 		return "AJoinList";
 	}
 
-	serialized_data serialize()
+	serialized_data serialize() anope_override
 	{
 		serialized_data sd;
 
@@ -150,7 +150,7 @@ class CommandNSAJoin : public Command
 		this->SetSyntax(_("{ADD | DEL | LIST} [\037channel\037] [\037key\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		if (params[0].equals_ci("LIST"))
 			this->DoList(source, params);
@@ -166,7 +166,7 @@ class CommandNSAJoin : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -191,7 +191,7 @@ class NSAJoin : public Module
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
-	void OnNickIdentify(User *u)
+	void OnNickIdentify(User *u) anope_override
 	{
 		AJoinList *channels = u->Account()->GetExt<AJoinList *>("ns_ajoin_channels");
 
diff --git a/modules/commands/ns_alist.cpp b/modules/commands/ns_alist.cpp
index 15b236078..abb8c722c 100644
--- a/modules/commands/ns_alist.cpp
+++ b/modules/commands/ns_alist.cpp
@@ -22,7 +22,7 @@ class CommandNSAList : public Command
 		this->SetSyntax(_("[\037nickname\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		Anope::string nick = u->Account()->display;
@@ -80,7 +80,7 @@ class CommandNSAList : public Command
 			source.Reply(replies[i]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_cert.cpp b/modules/commands/ns_cert.cpp
index e0d70b88d..6ad106161 100644
--- a/modules/commands/ns_cert.cpp
+++ b/modules/commands/ns_cert.cpp
@@ -148,7 +148,7 @@ class CommandNSCert : public Command
 		this->SetSyntax("LIST");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &cmd = params[0];
@@ -172,7 +172,7 @@ class CommandNSCert : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -234,7 +234,7 @@ class NSCert : public Module
 
 	}
 
-	void OnFingerprint(User *u)
+	void OnFingerprint(User *u) anope_override
 	{
 		DoAutoIdentify(u);
 	}
diff --git a/modules/commands/ns_drop.cpp b/modules/commands/ns_drop.cpp
index a89cbec8f..0bb6eecc2 100644
--- a/modules/commands/ns_drop.cpp
+++ b/modules/commands/ns_drop.cpp
@@ -22,7 +22,7 @@ class CommandNSDrop : public Command
 		this->SetDesc(_("Cancel the registration of a nickname"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		Anope::string nick = !params.empty() ? params[0] : "";
@@ -81,7 +81,7 @@ class CommandNSDrop : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		User *u = source.u;
 		if (u->Account() && u->HasPriv("nickserv/drop"))
diff --git a/modules/commands/ns_getemail.cpp b/modules/commands/ns_getemail.cpp
index 35921dfb1..f8ace530d 100644
--- a/modules/commands/ns_getemail.cpp
+++ b/modules/commands/ns_getemail.cpp
@@ -26,7 +26,7 @@ class CommandNSGetEMail : public Command
 		this->SetSyntax(_("\037user@email-host\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &email = params[0];
@@ -54,7 +54,7 @@ class CommandNSGetEMail : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_getpass.cpp b/modules/commands/ns_getpass.cpp
index 5e1015bb4..8ffc85520 100644
--- a/modules/commands/ns_getpass.cpp
+++ b/modules/commands/ns_getpass.cpp
@@ -22,7 +22,7 @@ class CommandNSGetPass : public Command
 		this->SetSyntax(_("\037nickname\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &nick = params[0];
@@ -46,7 +46,7 @@ class CommandNSGetPass : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_ghost.cpp b/modules/commands/ns_ghost.cpp
index 067feb341..05b60eacd 100644
--- a/modules/commands/ns_ghost.cpp
+++ b/modules/commands/ns_ghost.cpp
@@ -23,7 +23,7 @@ class CommandNSGhost : public Command
 		this->SetSyntax("\037nickname\037 [\037password\037]");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &nick = params[0];
 		const Anope::string &pass = params.size() > 1 ? params[1] : "";
@@ -87,7 +87,7 @@ class CommandNSGhost : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_group.cpp b/modules/commands/ns_group.cpp
index 69c66ff16..2f8617c11 100644
--- a/modules/commands/ns_group.cpp
+++ b/modules/commands/ns_group.cpp
@@ -23,7 +23,7 @@ class CommandNSGroup : public Command
 		this->SetSyntax(_("\037target\037 \037password\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -129,7 +129,7 @@ class CommandNSGroup : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -172,7 +172,7 @@ class CommandNSUngroup : public Command
 		this->SetSyntax(_("[\037nick\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		Anope::string nick = !params.empty() ? params[0] : "";
@@ -216,7 +216,7 @@ class CommandNSUngroup : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -237,7 +237,7 @@ class CommandNSGList : public Command
 		this->SetDesc(_("Lists all nicknames in your group"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		Anope::string nick = !params.empty() ? params[0] : "";
@@ -273,7 +273,7 @@ class CommandNSGList : public Command
 		}
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		User *u = source.u;
 		if (u->IsServicesOper())
diff --git a/modules/commands/ns_identify.cpp b/modules/commands/ns_identify.cpp
index 7c3a0b5d0..cd0b14ddb 100644
--- a/modules/commands/ns_identify.cpp
+++ b/modules/commands/ns_identify.cpp
@@ -23,7 +23,7 @@ class CommandNSIdentify : public Command
 		this->SetSyntax(_("[\037account\037] \037password\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -63,7 +63,7 @@ class CommandNSIdentify : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_info.cpp b/modules/commands/ns_info.cpp
index 514757037..2af036a96 100644
--- a/modules/commands/ns_info.cpp
+++ b/modules/commands/ns_info.cpp
@@ -34,7 +34,7 @@ class CommandNSInfo : public Command
 		this->SetSyntax(_("[\037nickname\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -145,7 +145,7 @@ class CommandNSInfo : public Command
 		}
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_list.cpp b/modules/commands/ns_list.cpp
index 2a43fa091..491ed8733 100644
--- a/modules/commands/ns_list.cpp
+++ b/modules/commands/ns_list.cpp
@@ -22,7 +22,7 @@ class CommandNSList : public Command
 		this->SetSyntax(_("\037pattern\037 [SUSPENDED] [NOEXPIRE] [UNCONFIRMED]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -129,7 +129,7 @@ class CommandNSList : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_logout.cpp b/modules/commands/ns_logout.cpp
index 7bd9b77c9..240054db6 100644
--- a/modules/commands/ns_logout.cpp
+++ b/modules/commands/ns_logout.cpp
@@ -23,7 +23,7 @@ class CommandNSLogout : public Command
 		this->SetSyntax(_("[\037nickname\037 [REVALIDATE]]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -61,7 +61,7 @@ class CommandNSLogout : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_recover.cpp b/modules/commands/ns_recover.cpp
index 7406378dd..e985f2881 100644
--- a/modules/commands/ns_recover.cpp
+++ b/modules/commands/ns_recover.cpp
@@ -42,7 +42,7 @@ class CommandNSRecover : public Command
 		this->SetSyntax(_("\037nickname\037 [\037password\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -92,7 +92,7 @@ class CommandNSRecover : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		/* Convert Config->NSReleaseTimeout seconds to string format */
 		Anope::string relstr = duration(Config->NSReleaseTimeout);
diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp
index 341397c67..0ebc5dadc 100644
--- a/modules/commands/ns_register.cpp
+++ b/modules/commands/ns_register.cpp
@@ -25,7 +25,7 @@ class CommandNSConfirm : public Command
 		this->SetSyntax(_("\037passcode\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &passcode = params[0];
@@ -68,7 +68,7 @@ class CommandNSConfirm : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		User *u = source.u;
 		this->SendSyntax(source);
@@ -87,7 +87,7 @@ class CommandNSConfirm : public Command
 		return true;
 	}
 
-	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand)
+	void OnSyntaxError(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		source.Reply(NICK_CONFIRM_INVALID);
 	}
@@ -106,7 +106,7 @@ class CommandNSRegister : public Command
 			this->SetSyntax(_("\037password\037 \037[email]\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		NickAlias *na;
@@ -212,7 +212,7 @@ class CommandNSRegister : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply("\n");
@@ -259,7 +259,7 @@ class CommandNSResend : public Command
 		this->SetSyntax("");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		if (!Config->NSEmailReg)
 			return;
@@ -288,7 +288,7 @@ class CommandNSResend : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		if (!Config->NSEmailReg)
 			return false;
@@ -300,7 +300,7 @@ class CommandNSResend : public Command
 		return true;
 	}
 
-	void OnServHelp(CommandSource &source)
+	void OnServHelp(CommandSource &source) anope_override
 	{
 		if (Config->NSEmailReg)
 			Command::OnServHelp(source);
diff --git a/modules/commands/ns_release.cpp b/modules/commands/ns_release.cpp
index 2725c5f17..d843b2f84 100644
--- a/modules/commands/ns_release.cpp
+++ b/modules/commands/ns_release.cpp
@@ -23,7 +23,7 @@ class CommandNSRelease : public Command
 		this->SetSyntax(_("\037nickname\037 [\037password\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &nick = params[0];
@@ -70,7 +70,7 @@ class CommandNSRelease : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		/* Convert Config->NSReleaseTimeout seconds to string format */
 		Anope::string relstr = duration(Config->NSReleaseTimeout);
diff --git a/modules/commands/ns_resetpass.cpp b/modules/commands/ns_resetpass.cpp
index f3aa47630..f0dfe1aad 100644
--- a/modules/commands/ns_resetpass.cpp
+++ b/modules/commands/ns_resetpass.cpp
@@ -25,7 +25,7 @@ class CommandNSResetPass : public Command
 		this->SetSyntax(_("\037nickname\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		NickAlias *na;
@@ -46,7 +46,7 @@ class CommandNSResetPass : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -79,7 +79,7 @@ class NSResetPass : public Module
 		ModuleManager::Attach(I_OnPreCommand, this);
 	}
 
-	EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> &params)
+	EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> &params) anope_override
 	{
 		if (command->name == "nickserv/confirm" && params.size() > 1)
 		{
diff --git a/modules/commands/ns_saset.cpp b/modules/commands/ns_saset.cpp
index 793c8c670..1b77c2b57 100644
--- a/modules/commands/ns_saset.cpp
+++ b/modules/commands/ns_saset.cpp
@@ -22,13 +22,13 @@ class CommandNSSASet : public Command
 		this->SetSyntax(_("\037option\037 \037nickname\037 \037parameters\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->OnSyntaxError(source, "");
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(_("Sets various nickname options. \037option\037 can be one of:"));
@@ -64,7 +64,7 @@ class CommandNSSASetPassword : public Command
 		this->SetSyntax(_("\037nickname\037 \037new-password\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		NickAlias *setter_na = findnick(params[0]);
@@ -103,7 +103,7 @@ class CommandNSSASetPassword : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_saset_noexpire.cpp b/modules/commands/ns_saset_noexpire.cpp
index 71ecad3f6..5ebfdce89 100644
--- a/modules/commands/ns_saset_noexpire.cpp
+++ b/modules/commands/ns_saset_noexpire.cpp
@@ -22,7 +22,7 @@ class CommandNSSASetNoexpire : public Command
 		this->SetSyntax(_("\037nickname\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		NickAlias *na = findnick(params[0]);
 		if (na == NULL)
@@ -49,7 +49,7 @@ class CommandNSSASetNoexpire : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_sendpass.cpp b/modules/commands/ns_sendpass.cpp
index 52128bdc8..678518d5d 100644
--- a/modules/commands/ns_sendpass.cpp
+++ b/modules/commands/ns_sendpass.cpp
@@ -25,7 +25,7 @@ class CommandNSSendPass : public Command
 		this->SetSyntax(_("\037nickname\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &nick = params[0];
@@ -53,7 +53,7 @@ class CommandNSSendPass : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_set.cpp b/modules/commands/ns_set.cpp
index b52bec52a..d81c4c3c8 100644
--- a/modules/commands/ns_set.cpp
+++ b/modules/commands/ns_set.cpp
@@ -22,13 +22,13 @@ class CommandNSSet : public Command
 		this->SetSyntax(_("\037option\037 \037parameters\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->OnSyntaxError(source, "");
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -64,7 +64,7 @@ class CommandNSSetPassword : public Command
 		this->SetSyntax(_("\037new-password\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -92,7 +92,7 @@ class CommandNSSetPassword : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_set_autoop.cpp b/modules/commands/ns_set_autoop.cpp
index 4a77db52f..452717c3d 100644
--- a/modules/commands/ns_set_autoop.cpp
+++ b/modules/commands/ns_set_autoop.cpp
@@ -48,12 +48,12 @@ class CommandNSSetAutoOp : public Command
 		return;
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, source.u->Account()->display, params[0]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -72,12 +72,12 @@ class CommandNSSASetAutoOp : public CommandNSSetAutoOp
 		this->SetSyntax(_("\037nickname\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, params[0], params[1]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_set_display.cpp b/modules/commands/ns_set_display.cpp
index e3f1e237f..e89655f06 100644
--- a/modules/commands/ns_set_display.cpp
+++ b/modules/commands/ns_set_display.cpp
@@ -41,12 +41,12 @@ class CommandNSSetDisplay : public Command
 		source.Reply(NICK_SET_DISPLAY_CHANGED, user_na->nc->display.c_str());
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, source.u->Account()->display, params[0]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -65,12 +65,12 @@ class CommandNSSASetDisplay : public CommandNSSetDisplay
 		this->SetSyntax(_("\037nickname\037 \037new-display\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, params[0], params[1]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_set_email.cpp b/modules/commands/ns_set_email.cpp
index 8ce71165e..09ef8732c 100644
--- a/modules/commands/ns_set_email.cpp
+++ b/modules/commands/ns_set_email.cpp
@@ -104,12 +104,12 @@ class CommandNSSetEmail : public Command
 		return;
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, source.u->Account()->display, params.size() ? params[0] : "");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -129,12 +129,12 @@ class CommandNSSASetEmail : public CommandNSSetEmail
 		this->SetSyntax(_("\037nickname\037 \037address\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, params[0], params.size() > 1 ? params[1] : "");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -158,7 +158,7 @@ class NSSetEmail : public Module
 
 	}
 
-	EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> &params)
+	EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		if (command->name == "nickserv/confirm" && !params.empty() && u->IsIdentified())
diff --git a/modules/commands/ns_set_greet.cpp b/modules/commands/ns_set_greet.cpp
index c986eadf8..ed620dc05 100644
--- a/modules/commands/ns_set_greet.cpp
+++ b/modules/commands/ns_set_greet.cpp
@@ -46,12 +46,12 @@ class CommandNSSetGreet : public Command
 		return;
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, source.u->Account()->display, params.size() > 0 ? params[0] : "");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -72,12 +72,12 @@ class CommandNSSASetGreet : public CommandNSSetGreet
 		this->SetSyntax(_("\037nickname\037 \037message\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, params[0], params.size() > 1 ? params[1] : "");
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_set_hide.cpp b/modules/commands/ns_set_hide.cpp
index af6f1998f..8d0ee7fb3 100644
--- a/modules/commands/ns_set_hide.cpp
+++ b/modules/commands/ns_set_hide.cpp
@@ -81,12 +81,12 @@ class CommandNSSetHide : public Command
 		return;
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, source.u->Account()->display, params[0], params[1]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -109,13 +109,13 @@ class CommandNSSASetHide : public CommandNSSetHide
 		this->SetSyntax("\037nickname\037 {EMAIL | STATUS | USERMASK | QUIT} {ON | OFF}");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->ClearSyntax();
 		this->Run(source, params[0], params[1], params[2]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_set_kill.cpp b/modules/commands/ns_set_kill.cpp
index 3ead7aabd..0fc64196d 100644
--- a/modules/commands/ns_set_kill.cpp
+++ b/modules/commands/ns_set_kill.cpp
@@ -71,12 +71,12 @@ class CommandNSSetKill : public Command
 		return;
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, source.u->Account()->display, params[0]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -104,13 +104,13 @@ class CommandNSSASetKill : public CommandNSSetKill
 		this->SetSyntax(_("\037nickname\037 {ON | QUICK | IMMED | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->ClearSyntax();
 		this->Run(source, params[0], params[1]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_set_language.cpp b/modules/commands/ns_set_language.cpp
index 17be16b06..ecd8d9259 100644
--- a/modules/commands/ns_set_language.cpp
+++ b/modules/commands/ns_set_language.cpp
@@ -49,12 +49,12 @@ class CommandNSSetLanguage : public Command
 		return;
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &param)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &param) anope_override
 	{
 		this->Run(source, source.u->Account()->display, param[0]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -85,12 +85,12 @@ class CommandNSSASetLanguage : public CommandNSSetLanguage
 		this->SetSyntax(_("\037nickname\037 \037language\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, params[0], params[1]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_set_message.cpp b/modules/commands/ns_set_message.cpp
index 33d925f1b..cb0d5107a 100644
--- a/modules/commands/ns_set_message.cpp
+++ b/modules/commands/ns_set_message.cpp
@@ -54,12 +54,12 @@ class CommandNSSetMessage : public Command
 		return;
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, source.u->Account()->display, params[0]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -79,7 +79,7 @@ class CommandNSSASetMessage : public CommandNSSetMessage
 		this->SetSyntax(_("\037nickname\037 {ON | OFF}"));
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -89,7 +89,7 @@ class CommandNSSASetMessage : public CommandNSSetMessage
 		return true;
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, params[0], params[1]);
 	}
diff --git a/modules/commands/ns_set_misc.cpp b/modules/commands/ns_set_misc.cpp
index 322a7de07..184eddf40 100644
--- a/modules/commands/ns_set_misc.cpp
+++ b/modules/commands/ns_set_misc.cpp
@@ -23,12 +23,12 @@ struct NSMiscData : Anope::string, ExtensibleItem, Serializable
 	{
 	}
 
-	Anope::string serialize_name() const
+	Anope::string serialize_name() const anope_override
 	{
 		return "NSMiscData";
 	}
 
-	serialized_data serialize()
+	serialized_data serialize() anope_override
 	{
 		serialized_data sdata;
 
@@ -89,7 +89,7 @@ class CommandNSSetMisc : public Command
 		return;
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, source.u->Account()->display, !params.empty() ? params[0] : "");
 	}
@@ -104,7 +104,7 @@ class CommandNSSASetMisc : public CommandNSSetMisc
 		this->SetSyntax(_("\037nickname\037 [\037parameter\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, params[0], params.size() > 1 ? params[1] : "");
 	}
@@ -126,7 +126,7 @@ class NSSetMisc : public Module
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
-	void OnNickInfo(CommandSource &source, NickAlias *na, InfoFormatter &info, bool ShowHidden)
+	void OnNickInfo(CommandSource &source, NickAlias *na, InfoFormatter &info, bool ShowHidden) anope_override
 	{
 		std::deque<Anope::string> list;
 		na->nc->GetExtList(list);
diff --git a/modules/commands/ns_set_private.cpp b/modules/commands/ns_set_private.cpp
index cbdddd561..a7d29b39c 100644
--- a/modules/commands/ns_set_private.cpp
+++ b/modules/commands/ns_set_private.cpp
@@ -48,12 +48,12 @@ class CommandNSSetPrivate : public Command
 		return;
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, source.u->Account()->display, params[0]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -76,12 +76,12 @@ class CommandNSSASetPrivate : public CommandNSSetPrivate
 		this->SetSyntax(_("\037nickname\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, params[0], params[1]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_set_secure.cpp b/modules/commands/ns_set_secure.cpp
index 89fa7dea2..3827197ba 100644
--- a/modules/commands/ns_set_secure.cpp
+++ b/modules/commands/ns_set_secure.cpp
@@ -46,12 +46,12 @@ class CommandNSSetSecure : public Command
 			this->OnSyntaxError(source, "SECURE");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, source.u->Account()->display, params[0]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -75,12 +75,12 @@ class CommandNSSASetSecure : public CommandNSSetSecure
 		this->SetSyntax(_("\037nickname\037 {ON | OFF}"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		this->Run(source, params[0], params[1]);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_status.cpp b/modules/commands/ns_status.cpp
index 24165a2fb..b0ce63797 100644
--- a/modules/commands/ns_status.cpp
+++ b/modules/commands/ns_status.cpp
@@ -23,7 +23,7 @@ class CommandNSStatus : public Command
 		this->SetSyntax(_("\037nickname\037..."));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &nick = !params.empty() ? params[0] : u->nick;
@@ -51,7 +51,7 @@ class CommandNSStatus : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/ns_suspend.cpp b/modules/commands/ns_suspend.cpp
index a9ff33488..40989c84c 100644
--- a/modules/commands/ns_suspend.cpp
+++ b/modules/commands/ns_suspend.cpp
@@ -27,7 +27,7 @@ struct NickSuspend : ExtensibleItem, Serializable
 		return "NickSuspend";
 	}
 
-	serialized_data serialize()
+	serialized_data serialize() anope_override
 	{
 		serialized_data sd;
 
@@ -61,7 +61,7 @@ class CommandNSSuspend : public Command
 		this->SetSyntax(_("\037nickname\037 [+\037expiry\037] \037reason\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 
@@ -138,7 +138,7 @@ class CommandNSSuspend : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -159,7 +159,7 @@ class CommandNSUnSuspend : public Command
 		this->SetSyntax(_("\037nickname\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &nick = params[0];
@@ -194,7 +194,7 @@ class CommandNSUnSuspend : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -225,7 +225,7 @@ class NSSuspend : public Module
 			it->second->Shrink("ns_suspend_expire");
 	}
 
-	void OnPreNickExpire(NickAlias *na, bool &expire)
+	void OnPreNickExpire(NickAlias *na, bool &expire) anope_override
 	{
 		if (!na->nc->HasFlag(NI_SUSPENDED))
 			return;
diff --git a/modules/commands/ns_update.cpp b/modules/commands/ns_update.cpp
index 8e0d0d5be..5297bc4d3 100644
--- a/modules/commands/ns_update.cpp
+++ b/modules/commands/ns_update.cpp
@@ -22,7 +22,7 @@ class CommandNSUpdate : public Command
 		this->SetSyntax("");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		NickAlias *na = findnick(u->nick);
@@ -42,7 +42,7 @@ class CommandNSUpdate : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &)
+	bool OnHelp(CommandSource &source, const Anope::string &) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_akill.cpp b/modules/commands/os_akill.cpp
index c34e932b0..89485f706 100644
--- a/modules/commands/os_akill.cpp
+++ b/modules/commands/os_akill.cpp
@@ -34,7 +34,7 @@ class AkillDelCallback : public NumberList
 			source.Reply(_("Deleted %d entries from the AKILL list."), Deleted);
 	}
 
-	void HandleNumber(unsigned Number)
+	void HandleNumber(unsigned Number) anope_override
 	{
 		if (!Number)
 			return;
@@ -226,7 +226,7 @@ class CommandOSAKill : public Command
 				{
 				}
 
-				void HandleNumber(unsigned number)
+				void HandleNumber(unsigned number) anope_override
 				{
 					if (!number)
 						return;
@@ -337,7 +337,7 @@ class CommandOSAKill : public Command
 		this->SetSyntax(_("CLEAR"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &cmd = params[0];
 
@@ -360,7 +360,7 @@ class CommandOSAKill : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_chankill.cpp b/modules/commands/os_chankill.cpp
index 43ac0b3ee..8b56eb3c2 100644
--- a/modules/commands/os_chankill.cpp
+++ b/modules/commands/os_chankill.cpp
@@ -24,7 +24,7 @@ class CommandOSChanKill : public Command
 		this->SetSyntax(_("[+\037expiry\037] \037channel\037 \037reason\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		if (!akills)
 			return;
@@ -93,7 +93,7 @@ class CommandOSChanKill : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_config.cpp b/modules/commands/os_config.cpp
index 45e067d9f..6f7ebb90c 100644
--- a/modules/commands/os_config.cpp
+++ b/modules/commands/os_config.cpp
@@ -38,7 +38,7 @@ class CommandOSConfig : public Command
 		this->SetSyntax(_("{\037MODIFY\037|\037VIEW\037} [\037block name\037 \037item name\037 \037item value\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &what = params[0];
 
@@ -197,7 +197,7 @@ class CommandOSConfig : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_defcon.cpp b/modules/commands/os_defcon.cpp
index 3bd1fc111..a8b9891a4 100644
--- a/modules/commands/os_defcon.cpp
+++ b/modules/commands/os_defcon.cpp
@@ -111,7 +111,7 @@ class DefConTimeout : public CallBack
  public:
 	DefConTimeout(Module *mod, int newlevel) : CallBack(mod, DConfig.timeout), level(newlevel) { }
 
-	void Tick(time_t)
+	void Tick(time_t) anope_override
 	{
 		if (DConfig.defaultlevel != level)
 		{
@@ -169,7 +169,7 @@ class CommandOSDefcon : public Command
 		this->SetSyntax(_("[\0021\002|\0022\002|\0023\002|\0024\002|\0025\002]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &lvl = params[0];
@@ -230,7 +230,7 @@ class CommandOSDefcon : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -353,7 +353,7 @@ class OSDefcon : public Module
 		}
 	}
 
-	void OnReload()
+	void OnReload() anope_override
 	{
 		ConfigReader config;
 		DefconConfig dconfig;
@@ -438,7 +438,7 @@ class OSDefcon : public Module
 		return EVENT_CONTINUE;
 	}
 
-	EventReturn OnChannelModeSet(Channel *c, ChannelModeName Name, const Anope::string &param)
+	EventReturn OnChannelModeSet(Channel *c, ChannelModeName Name, const Anope::string &param) anope_override
 	{
 		ChannelMode *cm = ModeManager::FindChannelModeByName(Name);
 
@@ -452,7 +452,7 @@ class OSDefcon : public Module
 		return EVENT_CONTINUE;
 	}
 
-	EventReturn OnChannelModeUnset(Channel *c, ChannelModeName Name, const Anope::string &)
+	EventReturn OnChannelModeUnset(Channel *c, ChannelModeName Name, const Anope::string &) anope_override
 	{
 		ChannelMode *cm = ModeManager::FindChannelModeByName(Name);
 
@@ -472,7 +472,7 @@ class OSDefcon : public Module
 		return EVENT_CONTINUE;
 	}
 
-	EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> &params)
+	EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> &params) anope_override
 	{
 		if (command->name == "nickserv/register" || command->name == "nickserv/group")
 		{
@@ -510,7 +510,7 @@ class OSDefcon : public Module
 		return EVENT_CONTINUE;
 	}
 
-	void OnUserConnect(dynamic_reference<User> &u, bool &exempt)
+	void OnUserConnect(dynamic_reference<User> &u, bool &exempt) anope_override
 	{
 		if (exempt || !u || !u->server->IsSynced() || u->server->IsULined())
 			return;
@@ -565,13 +565,13 @@ class OSDefcon : public Module
 		}
 	}
 
-	void OnChannelModeAdd(ChannelMode *cm)
+	void OnChannelModeAdd(ChannelMode *cm) anope_override
 	{
 		if (DConfig.chanmodes.find(cm->ModeChar) != Anope::string::npos)
 			this->ParseModeString();
 	}
 
-	void OnChannelCreate(Channel *c)
+	void OnChannelCreate(Channel *c) anope_override
 	{
 		if (DConfig.Check(DEFCON_FORCE_CHAN_MODES))
 			c->SetModes(findbot(Config->OperServ), false, "%s", DConfig.chanmodes.c_str());
diff --git a/modules/commands/os_forbid.cpp b/modules/commands/os_forbid.cpp
index b5b184740..908e2f2ca 100644
--- a/modules/commands/os_forbid.cpp
+++ b/modules/commands/os_forbid.cpp
@@ -21,12 +21,12 @@ class MyForbidService : public ForbidService
  public:
 	MyForbidService(Module *m) : ForbidService(m) { }
 
-	void AddForbid(ForbidData *d)
+	void AddForbid(ForbidData *d) anope_override
 	{
 		this->forbidData.push_back(d);
 	}
 
-	void RemoveForbid(ForbidData *d)
+	void RemoveForbid(ForbidData *d) anope_override
 	{
 		std::vector<ForbidData *>::iterator it = std::find(this->forbidData.begin(), this->forbidData.end(), d);
 		if (it != this->forbidData.end())
@@ -34,7 +34,7 @@ class MyForbidService : public ForbidService
 		delete d;
 	}
 
-	ForbidData *FindForbid(const Anope::string &mask, ForbidType ftype)
+	ForbidData *FindForbid(const Anope::string &mask, ForbidType ftype) anope_override
 	{
 		const std::vector<ForbidData *> &forbids = this->GetForbids();
 		for (unsigned i = forbids.size(); i > 0; --i)
@@ -47,7 +47,7 @@ class MyForbidService : public ForbidService
 		return NULL;
 	}
 
-	const std::vector<ForbidData *> &GetForbids()
+	const std::vector<ForbidData *> &GetForbids() anope_override
 	{
 		for (unsigned i = this->forbidData.size(); i > 0; --i)
 		{
@@ -85,7 +85,7 @@ class CommandOSForbid : public Command
 		this->SetSyntax(_("LIST (NICK|CHAN|EMAIL)"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		if (!this->fs)
 			return;
@@ -211,7 +211,7 @@ class CommandOSForbid : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -237,7 +237,7 @@ class OSForbid : public Module
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
-	void OnUserConnect(dynamic_reference<User> &u, bool &exempt)
+	void OnUserConnect(dynamic_reference<User> &u, bool &exempt) anope_override
 	{
 		if (!u || exempt)
 			return;
@@ -245,7 +245,7 @@ class OSForbid : public Module
 		this->OnUserNickChange(u, "");
 	}
 
-	void OnUserNickChange(User *u, const Anope::string &)
+	void OnUserNickChange(User *u, const Anope::string &) anope_override
 	{
 		if (u->HasMode(UMODE_OPER))
 			return;
@@ -265,7 +265,7 @@ class OSForbid : public Module
 		}
 	}
 
-	void OnJoinChannel(User *u, Channel *c)
+	void OnJoinChannel(User *u, Channel *c) anope_override
 	{
 		if (u->HasMode(UMODE_OPER))
 			return;
@@ -293,7 +293,7 @@ class OSForbid : public Module
 		}
 	}
 
-	EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> &params)
+	EventReturn OnPreCommand(CommandSource &source, Command *command, std::vector<Anope::string> &params) anope_override
 	{
 		if (source.u->HasMode(UMODE_OPER))
 			return EVENT_CONTINUE;
diff --git a/modules/commands/os_forbid.h b/modules/commands/os_forbid.h
index 98e5fdc81..fec721420 100644
--- a/modules/commands/os_forbid.h
+++ b/modules/commands/os_forbid.h
@@ -18,8 +18,8 @@ struct ForbidData : Serializable
 	time_t expires;
 	ForbidType type;
 
-	Anope::string serialize_name() const { return "ForbidData"; }
-	serialized_data serialize();
+	Anope::string serialize_name() const anope_override { return "ForbidData"; }
+	serialized_data serialize() anope_override;
 	static void unserialize(serialized_data &data);
 };
 
diff --git a/modules/commands/os_ignore.cpp b/modules/commands/os_ignore.cpp
index 526e19775..f2012f212 100644
--- a/modules/commands/os_ignore.cpp
+++ b/modules/commands/os_ignore.cpp
@@ -19,7 +19,7 @@ class OSIgnoreService : public IgnoreService
  public:
 	OSIgnoreService(Module *o) : IgnoreService(o) { }
 
-	void AddIgnore(const Anope::string &mask, const Anope::string &creator, const Anope::string &reason, time_t delta = Anope::CurTime)
+	void AddIgnore(const Anope::string &mask, const Anope::string &creator, const Anope::string &reason, time_t delta = Anope::CurTime) anope_override
 	{
 		/* If it s an existing user, we ignore the hostmask. */
 		Anope::string realmask = mask;
@@ -67,7 +67,7 @@ class OSIgnoreService : public IgnoreService
 		}
 	}
 
-	bool DelIgnore(const Anope::string &mask)
+	bool DelIgnore(const Anope::string &mask) anope_override
 	{
 		for (std::list<IgnoreData>::iterator it = this->ignores.begin(), it_end = this->ignores.end(); it != it_end; ++it)
 		{
@@ -82,7 +82,7 @@ class OSIgnoreService : public IgnoreService
 		return false;
 	}
 
-	IgnoreData *Find(const Anope::string &mask)
+	IgnoreData *Find(const Anope::string &mask) anope_override
 	{
 		User *u = finduser(mask);
 		std::list<IgnoreData>::iterator ign = this->ignores.begin(), ign_end = this->ignores.end();
@@ -263,7 +263,7 @@ class CommandOSIgnore : public Command
 		this->SetSyntax(_("CLEAR"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &cmd = params[0];
 
@@ -281,7 +281,7 @@ class CommandOSIgnore : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -318,7 +318,7 @@ class OSIgnore : public Module
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
-	EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message)
+	EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message) anope_override
 	{
 		if (!u->HasMode(UMODE_OPER) && this->osignoreservice.Find(u->nick))
 			return EVENT_STOP;
diff --git a/modules/commands/os_ignore.h b/modules/commands/os_ignore.h
index 4a47c947f..44235f7cc 100644
--- a/modules/commands/os_ignore.h
+++ b/modules/commands/os_ignore.h
@@ -17,8 +17,8 @@ struct IgnoreData : Serializable
 	Anope::string reason;
 	time_t time; /* When do we stop ignoring them? */
 
-	Anope::string serialize_name() const { return "IgnoreData"; }
-	serialized_data serialize();
+	Anope::string serialize_name() const anope_override { return "IgnoreData"; }
+	serialized_data serialize() anope_override;
 	static void unserialize(serialized_data &data);
 };
 
diff --git a/modules/commands/os_jupe.cpp b/modules/commands/os_jupe.cpp
index 1e3c2c46c..e11ed9f04 100644
--- a/modules/commands/os_jupe.cpp
+++ b/modules/commands/os_jupe.cpp
@@ -22,7 +22,7 @@ class CommandOSJupe : public Command
 		this->SetSyntax(_("\037server\037 [\037reason\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &jserver = params[0];
@@ -46,7 +46,7 @@ class CommandOSJupe : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_kick.cpp b/modules/commands/os_kick.cpp
index 029264315..f5dce15c7 100644
--- a/modules/commands/os_kick.cpp
+++ b/modules/commands/os_kick.cpp
@@ -22,7 +22,7 @@ class CommandOSKick : public Command
 		this->SetSyntax(_("\037channel\037 \037user\037 \037reason\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &chan = params[0];
@@ -52,7 +52,7 @@ class CommandOSKick : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_kill.cpp b/modules/commands/os_kill.cpp
index 077b3861c..bee5777ea 100644
--- a/modules/commands/os_kill.cpp
+++ b/modules/commands/os_kill.cpp
@@ -22,7 +22,7 @@ class CommandOSKill : public Command
 		this->SetSyntax(_("\037user\037 [\037reason\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &nick = params[0];
@@ -44,7 +44,7 @@ class CommandOSKill : public Command
 		}
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_list.cpp b/modules/commands/os_list.cpp
index 26d11c047..e9d67b52e 100644
--- a/modules/commands/os_list.cpp
+++ b/modules/commands/os_list.cpp
@@ -22,7 +22,7 @@ class CommandOSChanList : public Command
 		this->SetSyntax(_("[{\037pattern\037 | \037nick\037} [\037SECRET\037]]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &pattern = !params.empty() ? params[0] : "";
 		const Anope::string &opt = params.size() > 1 ? params[1] : "";
@@ -92,7 +92,7 @@ class CommandOSChanList : public Command
 		source.Reply(_("End of channel list."));
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -115,7 +115,7 @@ class CommandOSUserList : public Command
 		this->SetSyntax(_("[{\037pattern\037 | \037channel\037} [\037INVISIBLE\037]]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &pattern = !params.empty() ? params[0] : "";
 		const Anope::string &opt = params.size() > 1 ? params[1] : "";
@@ -183,7 +183,7 @@ class CommandOSUserList : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_login.cpp b/modules/commands/os_login.cpp
index 620bc0788..1bae1cf58 100644
--- a/modules/commands/os_login.cpp
+++ b/modules/commands/os_login.cpp
@@ -23,7 +23,7 @@ class CommandOSLogin : public Command
 		this->SetSyntax(_("\037password\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &password = params[0];
 
@@ -49,7 +49,7 @@ class CommandOSLogin : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -69,7 +69,7 @@ class CommandOSLogout : public Command
 		this->SetSyntax("");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		Oper *o = source.u->Account()->o;
 		if (o == NULL)
@@ -86,7 +86,7 @@ class CommandOSLogout : public Command
 		}
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -117,7 +117,7 @@ class OSLogin : public Module
 			it->second->Shrink("os_login_password_correct");
 	}
 
-	EventReturn IsServicesOper(User *u)
+	EventReturn IsServicesOper(User *u) anope_override
 	{
 		if (!u->Account()->o->password.empty())
 		{
diff --git a/modules/commands/os_mode.cpp b/modules/commands/os_mode.cpp
index f3f4942c7..d5836fe51 100644
--- a/modules/commands/os_mode.cpp
+++ b/modules/commands/os_mode.cpp
@@ -22,7 +22,7 @@ class CommandOSMode : public Command
 		this->SetSyntax(_("\037channel\037 \037modes\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &target = params[0];
@@ -41,7 +41,7 @@ class CommandOSMode : public Command
 		}
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -60,7 +60,7 @@ class CommandOSUMode : public Command
 		this->SetSyntax(_("\037user\037 \037modes\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &target = params[0];
@@ -80,7 +80,7 @@ class CommandOSUMode : public Command
 		}
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_modinfo.cpp b/modules/commands/os_modinfo.cpp
index 75859a762..032db21f9 100644
--- a/modules/commands/os_modinfo.cpp
+++ b/modules/commands/os_modinfo.cpp
@@ -22,7 +22,7 @@ class CommandOSModInfo : public Command
 		this->SetSyntax(_("\037modname\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &file = params[0];
 
@@ -61,7 +61,7 @@ class CommandOSModInfo : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -79,7 +79,7 @@ class CommandOSModList : public Command
 		this->SetSyntax(_("[Core|3rd|protocol|encryption|supported]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &param = !params.empty() ? params[0] : "";
 
@@ -218,7 +218,7 @@ class CommandOSModList : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_module.cpp b/modules/commands/os_module.cpp
index 196a9bed8..6d7a5db04 100644
--- a/modules/commands/os_module.cpp
+++ b/modules/commands/os_module.cpp
@@ -22,7 +22,7 @@ class CommandOSModLoad : public Command
 		this->SetSyntax(_("\037modname\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &mname = params[0];
@@ -41,7 +41,7 @@ class CommandOSModLoad : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -60,7 +60,7 @@ class CommandOSModReLoad : public Command
 		this->SetSyntax(_("\037modname\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &mname = params[0];
@@ -108,7 +108,7 @@ class CommandOSModReLoad : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -126,7 +126,7 @@ class CommandOSModUnLoad : public Command
 		this->SetSyntax(_("\037modname\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &mname = params[0];
@@ -159,7 +159,7 @@ class CommandOSModUnLoad : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_news.cpp b/modules/commands/os_news.cpp
index 1f96337cd..268f2ef0d 100644
--- a/modules/commands/os_news.cpp
+++ b/modules/commands/os_news.cpp
@@ -258,12 +258,12 @@ class CommandOSLogonNews : public NewsBase
 		this->SetDesc(_("Define messages to be shown to users at logon"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		return this->DoNews(source, params, NEWS_LOGON);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -287,12 +287,12 @@ class CommandOSOperNews : public NewsBase
 		this->SetDesc(_("Define messages to be shown to users who oper"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		return this->DoNews(source, params, NEWS_OPER);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -316,12 +316,12 @@ class CommandOSRandomNews : public NewsBase
 		this->SetDesc(_("Define messages to be randomly shown to users at logon"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		return this->DoNews(source, params, NEWS_RANDOM);
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -399,13 +399,13 @@ class OSNews : public Module
 		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
-	void OnUserModeSet(User *u, UserModeName Name)
+	void OnUserModeSet(User *u, UserModeName Name) anope_override
 	{
 		if (Name == UMODE_OPER)
 			DisplayNews(u, NEWS_OPER);
 	}
 
-	void OnUserConnect(dynamic_reference<User> &user, bool &)
+	void OnUserConnect(dynamic_reference<User> &user, bool &) anope_override
 	{
 		if (!user || !user->server->IsSynced())
 			return;
diff --git a/modules/commands/os_news.h b/modules/commands/os_news.h
index 7bc36d987..d848d73ad 100644
--- a/modules/commands/os_news.h
+++ b/modules/commands/os_news.h
@@ -22,8 +22,8 @@ struct NewsItem : Serializable
 	Anope::string who;
 	time_t time;
 
-	Anope::string serialize_name() const { return "NewsItem"; }
-	serialized_data serialize();
+	Anope::string serialize_name() const anope_override { return "NewsItem"; }
+	serialized_data serialize() anope_override;
 	static void unserialize(serialized_data &data);
 };
 
diff --git a/modules/commands/os_noop.cpp b/modules/commands/os_noop.cpp
index a7b324a3a..454299c89 100644
--- a/modules/commands/os_noop.cpp
+++ b/modules/commands/os_noop.cpp
@@ -23,7 +23,7 @@ class CommandOSNOOP : public Command
 		this->SetSyntax(_("REVOKE \037server\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &cmd = params[0];
@@ -63,7 +63,7 @@ class CommandOSNOOP : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_oline.cpp b/modules/commands/os_oline.cpp
index 9ce76d95c..5992f296e 100644
--- a/modules/commands/os_oline.cpp
+++ b/modules/commands/os_oline.cpp
@@ -22,7 +22,7 @@ class CommandOSOLine : public Command
 		this->SetSyntax(_("\037nick\037 \037flags\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &nick = params[0];
@@ -52,7 +52,7 @@ class CommandOSOLine : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_oper.cpp b/modules/commands/os_oper.cpp
index 6b5ebc0ed..6e8800e74 100644
--- a/modules/commands/os_oper.cpp
+++ b/modules/commands/os_oper.cpp
@@ -17,12 +17,12 @@ struct MyOper : Oper, Serializable
 {
 	MyOper(const Anope::string &n, OperType *o) : Oper(n, o) { }
 
-	Anope::string serialize_name() const
+	Anope::string serialize_name() const anope_override
 	{
 		return "Oper";
 	}
 
-	serialized_data serialize()
+	serialized_data serialize() anope_override
 	{
 		serialized_data data;
 
@@ -58,7 +58,7 @@ class CommandOSOper : public Command
 		this->SetSyntax(_("LIST"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &subcommand = params[0];
 
@@ -188,7 +188,7 @@ class CommandOSOper : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_reload.cpp b/modules/commands/os_reload.cpp
index 425ed4842..eec113c3e 100644
--- a/modules/commands/os_reload.cpp
+++ b/modules/commands/os_reload.cpp
@@ -22,7 +22,7 @@ class CommandOSReload : public Command
 		this->SetSyntax("");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		ServerConfig *old_config = Config;
 
@@ -43,7 +43,7 @@ class CommandOSReload : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_session.cpp b/modules/commands/os_session.cpp
index d89fbe1a6..e9666c6d2 100644
--- a/modules/commands/os_session.cpp
+++ b/modules/commands/os_session.cpp
@@ -21,19 +21,19 @@ class MySessionService : public SessionService
  public:
 	MySessionService(Module *m) : SessionService(m) { }
 
-	void AddException(Exception *e)
+	void AddException(Exception *e) anope_override
 	{
 		this->Exceptions.push_back(e);
 	}
 
-	void DelException(Exception *e)
+	void DelException(Exception *e) anope_override
 	{
 		ExceptionVector::iterator it = std::find(this->Exceptions.begin(), this->Exceptions.end(), e);
 		if (it != this->Exceptions.end())
 			this->Exceptions.erase(it);
 	}
 
-	Exception *FindException(User *u)
+	Exception *FindException(User *u) anope_override
 	{
 		for (std::vector<Exception *>::const_iterator it = this->Exceptions.begin(), it_end = this->Exceptions.end(); it != it_end; ++it)
 		{
@@ -44,7 +44,7 @@ class MySessionService : public SessionService
 		return NULL;
 	}
 
-	Exception *FindException(const Anope::string &host)
+	Exception *FindException(const Anope::string &host) anope_override
 	{
 		for (std::vector<Exception *>::const_iterator it = this->Exceptions.begin(), it_end = this->Exceptions.end(); it != it_end; ++it)
 		{
@@ -56,22 +56,22 @@ class MySessionService : public SessionService
 		return NULL;
 	}
 
-	ExceptionVector &GetExceptions()
+	ExceptionVector &GetExceptions() anope_override
 	{
 		return this->Exceptions;
 	}
 
-	void AddSession(Session *s)
+	void AddSession(Session *s) anope_override
 	{
 		this->Sessions[s->host] = s;
 	}
 
-	void DelSession(Session *s)
+	void DelSession(Session *s) anope_override
 	{
 		this->Sessions.erase(s->host);
 	}
 
-	Session *FindSession(const Anope::string &mask)
+	Session *FindSession(const Anope::string &mask) anope_override
 	{
 		SessionMap::iterator it = this->Sessions.find(mask);
 		if (it != this->Sessions.end())
@@ -79,7 +79,7 @@ class MySessionService : public SessionService
 		return NULL;
 	}
 
-	SessionMap &GetSessions()
+	SessionMap &GetSessions() anope_override
 	{
 		return this->Sessions;
 	}
@@ -90,7 +90,7 @@ class ExpireTimer : public Timer
  public:
 	ExpireTimer() : Timer(Config->ExpireTimeout, Anope::CurTime, true) { }
 
-	void Tick(time_t)
+	void Tick(time_t) anope_override
 	{
 		if (!session_service)
 			return;
@@ -127,7 +127,7 @@ class ExceptionDelCallback : public NumberList
 			source.Reply(_("Deleted %d entries from session-limit exception list."), Deleted);
 	}
 
-	virtual void HandleNumber(unsigned Number)
+	virtual void HandleNumber(unsigned Number) anope_override
 	{
 		if (!Number || Number > session_service->GetExceptions().size())
 			return;
@@ -217,7 +217,7 @@ class CommandOSSession : public Command
 		this->SetSyntax(_("VIEW \037host\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &cmd = params[0];
 
@@ -237,7 +237,7 @@ class CommandOSSession : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -451,7 +451,7 @@ class CommandOSException : public Command
 				{
 				}
 
-				void HandleNumber(unsigned Number)
+				void HandleNumber(unsigned Number) anope_override
 				{
 					if (!Number || Number > session_service->GetExceptions().size())
 						return;
@@ -531,7 +531,7 @@ class CommandOSException : public Command
 		this->SetSyntax(_("VIEW [\037mask\037 | \037list\037]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &cmd = params[0];
 
@@ -557,7 +557,7 @@ class CommandOSException : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -702,13 +702,13 @@ class OSSession : public Module
 		ModuleManager::SetPriority(this, PRIORITY_FIRST);
 	}
 
-	void OnUserConnect(dynamic_reference<User> &user, bool &exempt)
+	void OnUserConnect(dynamic_reference<User> &user, bool &exempt) anope_override
 	{
 		if (user && Config->LimitSessions)
 			this->AddSession(user, exempt);
 	}
 
-	void OnUserLogoff(User *u)
+	void OnUserLogoff(User *u) anope_override
 	{
 		if (Config->LimitSessions && (!u->server || !u->server->IsULined()))
 			this->DelSession(u);
diff --git a/modules/commands/os_session.h b/modules/commands/os_session.h
index 0d2cee9ad..561280170 100644
--- a/modules/commands/os_session.h
+++ b/modules/commands/os_session.h
@@ -17,8 +17,8 @@ struct Exception : Serializable
 	time_t time;			/* When this exception was added */
 	time_t expires;			/* Time when it expires. 0 == no expiry */
 
-	Anope::string serialize_name() const { return "Exception"; }
-	serialized_data serialize();
+	Anope::string serialize_name() const anope_override { return "Exception"; }
+	serialized_data serialize() anope_override;
 	static void unserialize(serialized_data &data);
 };
 
@@ -36,7 +36,7 @@ class SessionService : public Service
 
 	virtual Exception *FindException(User *u) = 0;
 
-	virtual Exception *FindException(const Anope::string &host) = 0;
+	virtual Exception *FindException(const Anope::string &host) = 0; 
 
 	virtual ExceptionVector &GetExceptions() = 0;
 
diff --git a/modules/commands/os_set.cpp b/modules/commands/os_set.cpp
index 1cea0e90c..ec08e0322 100644
--- a/modules/commands/os_set.cpp
+++ b/modules/commands/os_set.cpp
@@ -172,7 +172,7 @@ class CommandOSSet : public Command
 		this->SetSyntax(_("\037option\037 \037setting\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &option = params[0];
 
@@ -192,7 +192,7 @@ class CommandOSSet : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		if (subcommand.empty())
 		{
diff --git a/modules/commands/os_shutdown.cpp b/modules/commands/os_shutdown.cpp
index 597257955..b7ead98b3 100644
--- a/modules/commands/os_shutdown.cpp
+++ b/modules/commands/os_shutdown.cpp
@@ -22,7 +22,7 @@ class CommandOSQuit : public Command
 		this->SetSyntax("");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		quitmsg = "QUIT command received from " + u->nick;
@@ -30,7 +30,7 @@ class CommandOSQuit : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -51,7 +51,7 @@ class CommandOSRestart : public Command
 		this->SetSyntax("");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		quitmsg = "RESTART command received from " + u->nick;
@@ -60,7 +60,7 @@ class CommandOSRestart : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(_("Causes Services to save all databases and then restart\n"
@@ -78,7 +78,7 @@ class CommandOSShutdown : public Command
 		this->SetSyntax("");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		quitmsg = source.command + " command received from " + u->nick;
@@ -87,7 +87,7 @@ class CommandOSShutdown : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_stats.cpp b/modules/commands/os_stats.cpp
index 994b330ab..85eed7072 100644
--- a/modules/commands/os_stats.cpp
+++ b/modules/commands/os_stats.cpp
@@ -141,7 +141,7 @@ class CommandOSStats : public Command
 		this->SetSyntax(_("[AKILL | ALL | RESET | UPLINK]"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		Anope::string extra = !params.empty() ? params[0] : "";
 
@@ -161,7 +161,7 @@ class CommandOSStats : public Command
 			source.Reply(_("Unknown STATS option \002%s\002."), extra.c_str());
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_svsnick.cpp b/modules/commands/os_svsnick.cpp
index be5f8c320..ef5d151f9 100644
--- a/modules/commands/os_svsnick.cpp
+++ b/modules/commands/os_svsnick.cpp
@@ -22,7 +22,7 @@ class CommandOSSVSNick : public Command
 		this->SetSyntax(_("\037nick\037 \037newnick\037"));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		User *u = source.u;
 		const Anope::string &nick = params[0];
@@ -63,7 +63,7 @@ class CommandOSSVSNick : public Command
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_sxline.cpp b/modules/commands/os_sxline.cpp
index db2cad0e7..e65811571 100644
--- a/modules/commands/os_sxline.cpp
+++ b/modules/commands/os_sxline.cpp
@@ -34,7 +34,7 @@ class SXLineDelCallback : public NumberList
 			source.Reply(_("Deleted %d entries from the %s list."), Deleted, this->command->name.c_str());
 	}
 
-	void HandleNumber(unsigned Number)
+	void HandleNumber(unsigned Number) anope_override
 	{
 		if (!Number)
 			return;
@@ -127,7 +127,7 @@ class CommandOSSXLineBase : public Command
 				{
 				}
 
-				void HandleNumber(unsigned Number)
+				void HandleNumber(unsigned Number) anope_override
 				{
 					if (!Number)
 						return;
@@ -220,7 +220,7 @@ class CommandOSSXLineBase : public Command
 		this->SetDesc(Anope::printf(_("Manipulate the %s list"), cmd.c_str()));
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		const Anope::string &cmd = params[0];
 
@@ -250,7 +250,7 @@ class CommandOSSNLine : public CommandOSSXLineBase
 		return this->snlines;
 	}
 
-	void OnAdd(CommandSource &source, const std::vector<Anope::string> &params)
+	void OnAdd(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		if (!this->xlm() ||! ircd->snline)
 		{
@@ -399,7 +399,7 @@ class CommandOSSNLine : public CommandOSSXLineBase
 		this->SetSyntax(_("CLEAR"));
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
@@ -451,7 +451,7 @@ class CommandOSSQLine : public CommandOSSXLineBase
 		return this->sqlines;
 	}
 
-	void OnAdd(CommandSource &source, const std::vector<Anope::string> &params)
+	void OnAdd(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		if (!this->xlm() || !ircd->sqline)
 		{
@@ -598,7 +598,7 @@ class CommandOSSQLine : public CommandOSSXLineBase
 		this->SetSyntax(_("CLEAR"));
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");
diff --git a/modules/commands/os_update.cpp b/modules/commands/os_update.cpp
index 4d4bc39ad..b9b43230f 100644
--- a/modules/commands/os_update.cpp
+++ b/modules/commands/os_update.cpp
@@ -22,14 +22,14 @@ class CommandOSUpdate : public Command
 		this->SetSyntax("");
 	}
 
-	void Execute(CommandSource &source, const std::vector<Anope::string> &params)
+	void Execute(CommandSource &source, const std::vector<Anope::string> &params) anope_override
 	{
 		source.Reply(_("Updating databases."));
 		save_databases();
 		return;
 	}
 
-	bool OnHelp(CommandSource &source, const Anope::string &subcommand)
+	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
 	{
 		this->SendSyntax(source);
 		source.Reply(" ");