Mark types that have no inheritors as final.

103 files changed, 359 insertions, 359 deletions

diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp
index e1e744842..43abdd55f 100644
--- a/modules/commands/bs_assign.cpp
+++ b/modules/commands/bs_assign.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandBSAssign
+class CommandBSAssign final
 	: public Command
 {
 public:
@@ -83,7 +83,7 @@ public:
 	}
 };
 
-class CommandBSUnassign
+class CommandBSUnassign final
 	: public Command
 {
 public:
@@ -147,7 +147,7 @@ public:
 	}
 };
 
-class CommandBSSetNoBot
+class CommandBSSetNoBot final
 	: public Command
 {
 public:
@@ -205,7 +205,7 @@ public:
 	}
 };
 
-class BSAssign
+class BSAssign final
 	: public Module
 {
 	ExtensibleItem<bool> nobot;
diff --git a/modules/commands/bs_badwords.cpp b/modules/commands/bs_badwords.cpp
index cf863e442..e513170e7 100644
--- a/modules/commands/bs_badwords.cpp
+++ b/modules/commands/bs_badwords.cpp
@@ -12,7 +12,7 @@
 #include "module.h"
 #include "modules/bs_badwords.h"
 
-struct BadWordImpl
+struct BadWordImpl final
 	: BadWord
 	, Serializable
 {
@@ -29,7 +29,7 @@ struct BadWordImpl
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &);
 };
 
-struct BadWordsImpl
+struct BadWordsImpl final
 	: BadWords
 {
 	Serialize::Reference<ChannelInfo> ci;
@@ -147,7 +147,7 @@ Serializable* BadWordImpl::Unserialize(Serializable *obj, Serialize::Data &data)
 	return bw;
 }
 
-class BadwordsDelCallback
+class BadwordsDelCallback final
 	: public NumberList
 {
 	CommandSource &source;
@@ -185,7 +185,7 @@ public:
 	}
 };
 
-class CommandBSBadwords
+class CommandBSBadwords final
 	: public Command
 {
 private:
@@ -205,7 +205,7 @@ private:
 		}
 		else if (!word.empty() && word.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
-			class BadwordsListCallback
+			class BadwordsListCallback final
 				: public NumberList
 			{
 				ListFormatter &list;
@@ -459,7 +459,7 @@ public:
 	}
 };
 
-class BSBadwords
+class BSBadwords final
 	: public Module
 {
 	CommandBSBadwords commandbsbadwords;
diff --git a/modules/commands/bs_bot.cpp b/modules/commands/bs_bot.cpp
index e882d3e04..170e1073a 100644
--- a/modules/commands/bs_bot.cpp
+++ b/modules/commands/bs_bot.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandBSBot
+class CommandBSBot final
 	: public Command
 {
 private:
@@ -371,7 +371,7 @@ public:
 	}
 };
 
-class BSBot
+class BSBot final
 	: public Module
 {
 	CommandBSBot commandbsbot;
diff --git a/modules/commands/bs_botlist.cpp b/modules/commands/bs_botlist.cpp
index 828b5af99..915117916 100644
--- a/modules/commands/bs_botlist.cpp
+++ b/modules/commands/bs_botlist.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandBSBotList
+class CommandBSBotList final
 	: public Command
 {
 public:
@@ -66,7 +66,7 @@ public:
 	}
 };
 
-class BSBotList
+class BSBotList final
 	: public Module
 {
 	CommandBSBotList commandbsbotlist;
diff --git a/modules/commands/bs_control.cpp b/modules/commands/bs_control.cpp
index 1230f03e1..32101be6e 100644
--- a/modules/commands/bs_control.cpp
+++ b/modules/commands/bs_control.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandBSSay
+class CommandBSSay final
 	: public Command
 {
 public:
@@ -72,7 +72,7 @@ public:
 	}
 };
 
-class CommandBSAct
+class CommandBSAct final
 	: public Command
 {
 public:
@@ -132,7 +132,7 @@ public:
 	}
 };
 
-class BSControl
+class BSControl final
 	: public Module
 {
 	CommandBSSay commandbssay;
diff --git a/modules/commands/bs_info.cpp b/modules/commands/bs_info.cpp
index f8381836d..e42ad23b8 100644
--- a/modules/commands/bs_info.cpp
+++ b/modules/commands/bs_info.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandBSInfo
+class CommandBSInfo final
 	: public Command
 {
 private:
@@ -118,7 +118,7 @@ public:
 	}
 };
 
-class BSInfo
+class BSInfo final
 	: public Module
 {
 	CommandBSInfo commandbsinfo;
diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp
index e02c6cab8..f6012d07f 100644
--- a/modules/commands/bs_kick.cpp
+++ b/modules/commands/bs_kick.cpp
@@ -15,7 +15,7 @@
 
 static Module *me;
 
-struct KickerDataImpl
+struct KickerDataImpl final
 	: KickerData
 {
 	KickerDataImpl(Extensible *obj)
@@ -38,7 +38,7 @@ struct KickerDataImpl
 		ci->Shrink<KickerData>("kickerdata");
 	}
 
-	struct ExtensibleItem
+	struct ExtensibleItem final
 		: ::ExtensibleItem<KickerDataImpl>
 	{
 		ExtensibleItem(Module *m, const Anope::string &ename) : ::ExtensibleItem<KickerDataImpl>(m, ename) { }
@@ -117,7 +117,7 @@ struct KickerDataImpl
 	};
 };
 
-class CommandBSKick
+class CommandBSKick final
 	: public Command
 {
 public:
@@ -248,7 +248,7 @@ protected:
 	}
 };
 
-class CommandBSKickAMSG
+class CommandBSKickAMSG final
 	: public CommandBSKickBase
 {
 public:
@@ -285,7 +285,7 @@ public:
 	}
 };
 
-class CommandBSKickBadwords
+class CommandBSKickBadwords final
 	: public CommandBSKickBase
 {
 public:
@@ -325,7 +325,7 @@ public:
 	}
 };
 
-class CommandBSKickBolds
+class CommandBSKickBolds final
 	: public CommandBSKickBase
 {
 public:
@@ -360,7 +360,7 @@ public:
 	}
 };
 
-class CommandBSKickCaps
+class CommandBSKickCaps final
 	: public CommandBSKickBase
 {
 public:
@@ -457,7 +457,7 @@ public:
 	}
 };
 
-class CommandBSKickColors
+class CommandBSKickColors final
 	: public CommandBSKickBase
 {
 public:
@@ -492,7 +492,7 @@ public:
 	}
 };
 
-class CommandBSKickFlood
+class CommandBSKickFlood final
 	: public CommandBSKickBase
 {
 public:
@@ -591,7 +591,7 @@ public:
 	}
 };
 
-class CommandBSKickItalics
+class CommandBSKickItalics final
 	: public CommandBSKickBase
 {
 public:
@@ -626,7 +626,7 @@ public:
 	}
 };
 
-class CommandBSKickRepeat
+class CommandBSKickRepeat final
 	: public CommandBSKickBase
 {
 public:
@@ -728,7 +728,7 @@ public:
 	}
 };
 
-class CommandBSKickReverses
+class CommandBSKickReverses final
 	: public CommandBSKickBase
 {
 public:
@@ -763,7 +763,7 @@ public:
 	}
 };
 
-class CommandBSKickUnderlines
+class CommandBSKickUnderlines final
 	: public CommandBSKickBase
 {
 public:
@@ -798,7 +798,7 @@ public:
 	}
 };
 
-class CommandBSSetDontKickOps
+class CommandBSSetDontKickOps final
 	: public Command
 {
 public:
@@ -864,7 +864,7 @@ public:
 	}
 };
 
-class CommandBSSetDontKickVoices
+class CommandBSSetDontKickVoices final
 	: public Command
 {
 public:
@@ -930,9 +930,9 @@ public:
 	}
 };
 
-struct BanData
+struct BanData final
 {
-	struct Data
+	struct Data final
 	{
 		Anope::string mask;
 		time_t last_use;
@@ -978,7 +978,7 @@ public:
 	}
 };
 
-struct UserData
+struct UserData final
 {
 	UserData(Extensible *)
 	{
@@ -1001,7 +1001,7 @@ struct UserData
 	Anope::string lastline;
 };
 
-class BanDataPurger
+class BanDataPurger final
 	: public Timer
 {
 public:
@@ -1024,7 +1024,7 @@ public:
 	}
 };
 
-class BSKick
+class BSKick final
 	: public Module
 {
 	ExtensibleItem<BanData> bandata;
diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp
index b2ffa24cb..636313785 100644
--- a/modules/commands/bs_set.cpp
+++ b/modules/commands/bs_set.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandBSSet
+class CommandBSSet final
 	: public Command
 {
 public:
@@ -65,11 +65,11 @@ public:
 	}
 };
 
-class CommandBSSetBanExpire
+class CommandBSSetBanExpire final
 	: public Command
 {
 public:
-	class UnbanTimer
+	class UnbanTimer final
 		: public Timer
 	{
 		Anope::string chname;
@@ -154,7 +154,7 @@ public:
 	}
 };
 
-class CommandBSSetPrivate
+class CommandBSSetPrivate final
 	: public Command
 {
 public:
@@ -205,7 +205,7 @@ public:
 	}
 };
 
-class BSSet
+class BSSet final
 	: public Module
 {
 	CommandBSSet commandbsset;
diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index 939cc9ad4..7625f05aa 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -20,7 +20,7 @@ static inline void reset_levels(ChannelInfo *ci)
 		ci->SetLevel(priv, level);
 }
 
-class AccessChanAccess
+class AccessChanAccess final
 	: public ChanAccess
 {
 public:
@@ -68,7 +68,7 @@ public:
 	}
 };
 
-class AccessAccessProvider
+class AccessAccessProvider final
 	: public AccessProvider
 {
 public:
@@ -86,7 +86,7 @@ public:
 };
 AccessAccessProvider* AccessAccessProvider::me;
 
-class CommandCSAccess
+class CommandCSAccess final
 	: public Command
 {
 	void DoAdd(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
@@ -260,7 +260,7 @@ class CommandCSAccess
 			source.Reply(_("%s access list is empty."), ci->name.c_str());
 		else if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
-			class AccessDelCallback
+			class AccessDelCallback final
 				: public NumberList
 			{
 				CommandSource &source;
@@ -365,7 +365,7 @@ class CommandCSAccess
 			source.Reply(_("%s access list is empty."), ci->name.c_str());
 		else if (!nick.empty() && nick.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
-			class AccessListCallback
+			class AccessListCallback final
 				: public NumberList
 			{
 				ListFormatter &list;
@@ -638,7 +638,7 @@ public:
 	}
 };
 
-class CommandCSLevels
+class CommandCSLevels final
 	: public Command
 {
 	void DoSet(CommandSource &source, ChannelInfo *ci, const std::vector<Anope::string> &params)
@@ -863,7 +863,7 @@ public:
 	}
 };
 
-class CSAccess
+class CSAccess final
 	: public Module
 {
 	AccessAccessProvider accessprovider;
diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp
index 99c1dd2ee..6457f2856 100644
--- a/modules/commands/cs_akick.cpp
+++ b/modules/commands/cs_akick.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandCSAKick
+class CommandCSAKick final
 	: public Command
 {
 	void Enforce(CommandSource &source, ChannelInfo *ci)
@@ -204,7 +204,7 @@ class CommandCSAKick
 		/* Special case: is it a number/list?  Only do search if it isn't. */
 		if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
-			class AkickDelCallback
+			class AkickDelCallback final
 				: public NumberList
 			{
 				CommandSource &source;
@@ -282,7 +282,7 @@ class CommandCSAKick
 
 		if (!mask.empty() && isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
-			class AkickListCallback
+			class AkickListCallback final
 				: public NumberList
 			{
 				ListFormatter &list;
@@ -528,7 +528,7 @@ public:
 	}
 };
 
-class CSAKick
+class CSAKick final
 	: public Module
 {
 	CommandCSAKick commandcsakick;
diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp
index 5419ac263..ff019e602 100644
--- a/modules/commands/cs_ban.cpp
+++ b/modules/commands/cs_ban.cpp
@@ -13,7 +13,7 @@
 
 static Module *me;
 
-class TempBan
+class TempBan final
 	: public Timer
 {
 private:
@@ -32,7 +32,7 @@ public:
 	}
 };
 
-class CommandCSBan
+class CommandCSBan final
 	: public Command
 {
 public:
@@ -239,7 +239,7 @@ public:
 	}
 };
 
-class CSBan
+class CSBan final
 	: public Module
 {
 	CommandCSBan commandcsban;
diff --git a/modules/commands/cs_clone.cpp b/modules/commands/cs_clone.cpp
index 5201b332c..79db9fd57 100644
--- a/modules/commands/cs_clone.cpp
+++ b/modules/commands/cs_clone.cpp
@@ -12,7 +12,7 @@
 #include "module.h"
 #include "modules/bs_badwords.h"
 
-class CommandCSClone
+class CommandCSClone final
 	: public Command
 {
 	void CopySetting(ChannelInfo *ci, ChannelInfo *target_ci, const Anope::string &setting)
@@ -247,7 +247,7 @@ public:
 	}
 };
 
-class CSClone
+class CSClone final
 	: public Module
 {
 	CommandCSClone commandcsclone;
diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp
index 4f0b3f776..fa613efa7 100644
--- a/modules/commands/cs_drop.cpp
+++ b/modules/commands/cs_drop.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandCSDrop
+class CommandCSDrop final
 	: public Command
 {
 public:
@@ -82,7 +82,7 @@ public:
 	}
 };
 
-class CSDrop
+class CSDrop final
 	: public Module
 {
 	CommandCSDrop commandcsdrop;
diff --git a/modules/commands/cs_enforce.cpp b/modules/commands/cs_enforce.cpp
index dc60e9c5c..825301cdd 100644
--- a/modules/commands/cs_enforce.cpp
+++ b/modules/commands/cs_enforce.cpp
@@ -13,7 +13,7 @@
 
 #include "module.h"
 
-class CommandCSEnforce
+class CommandCSEnforce final
 	: public Command
 {
 private:
@@ -263,7 +263,7 @@ public:
 	}
 };
 
-class CSEnforce
+class CSEnforce final
 	: public Module
 {
 	CommandCSEnforce commandcsenforce;
diff --git a/modules/commands/cs_entrymsg.cpp b/modules/commands/cs_entrymsg.cpp
index 43055d5e5..0b5469661 100644
--- a/modules/commands/cs_entrymsg.cpp
+++ b/modules/commands/cs_entrymsg.cpp
@@ -12,7 +12,7 @@
 #include "module.h"
 #include "modules/cs_entrymsg.h"
 
-struct EntryMsgImpl
+struct EntryMsgImpl final
 	: EntryMsg
 	, Serializable
 {
@@ -41,7 +41,7 @@ struct EntryMsgImpl
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
 };
 
-struct EntryMessageListImpl
+struct EntryMessageListImpl final
 	: EntryMessageList
 {
 	EntryMessageListImpl(Extensible *) { }
@@ -100,7 +100,7 @@ Serializable* EntryMsgImpl::Unserialize(Serializable *obj, Serialize::Data &data
 	return m;
 }
 
-class CommandEntryMessage
+class CommandEntryMessage final
 	: public Command
 {
 private:
@@ -264,7 +264,7 @@ public:
 	}
 };
 
-class CSEntryMessage
+class CSEntryMessage final
 	: public Module
 {
 	CommandEntryMessage commandentrymsg;
diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp
index 795dfa167..5c0027677 100644
--- a/modules/commands/cs_flags.cpp
+++ b/modules/commands/cs_flags.cpp
@@ -13,7 +13,7 @@
 
 static std::map<Anope::string, char> defaultFlags;
 
-class FlagsChanAccess
+class FlagsChanAccess final
 	: public ChanAccess
 {
 public:
@@ -60,7 +60,7 @@ public:
 	}
 };
 
-class FlagsAccessProvider
+class FlagsAccessProvider final
 	: public AccessProvider
 {
 public:
@@ -78,7 +78,7 @@ public:
 };
 FlagsAccessProvider* FlagsAccessProvider::ap;
 
-class CommandCSFlags
+class CommandCSFlags final
 	: public Command
 {
 	void DoModify(CommandSource &source, ChannelInfo *ci, Anope::string mask, const Anope::string &flags, const Anope::string &description)
@@ -478,7 +478,7 @@ public:
 	}
 };
 
-class CSFlags
+class CSFlags final
 	: public Module
 {
 	FlagsAccessProvider accessprovider;
diff --git a/modules/commands/cs_getkey.cpp b/modules/commands/cs_getkey.cpp
index 4cec2f87b..38a782bea 100644
--- a/modules/commands/cs_getkey.cpp
+++ b/modules/commands/cs_getkey.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandCSGetKey
+class CommandCSGetKey final
 	: public Command
 {
 public:
@@ -60,7 +60,7 @@ public:
 	}
 };
 
-class CSGetKey
+class CSGetKey final
 	: public Module
 {
 	CommandCSGetKey commandcsgetkey;
diff --git a/modules/commands/cs_info.cpp b/modules/commands/cs_info.cpp
index 0c5c91091..685538284 100644
--- a/modules/commands/cs_info.cpp
+++ b/modules/commands/cs_info.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandCSInfo
+class CommandCSInfo final
 	: public Command
 {
 public:
@@ -84,7 +84,7 @@ public:
 	}
 };
 
-class CSInfo
+class CSInfo final
 	: public Module
 {
 	CommandCSInfo commandcsinfo;
diff --git a/modules/commands/cs_invite.cpp b/modules/commands/cs_invite.cpp
index 79e588f1e..4ab4b9a83 100644
--- a/modules/commands/cs_invite.cpp
+++ b/modules/commands/cs_invite.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandCSInvite
+class CommandCSInvite final
 	: public Command
 {
 public:
@@ -98,7 +98,7 @@ public:
 	}
 };
 
-class CSInvite
+class CSInvite final
 	: public Module
 {
 	CommandCSInvite commandcsinvite;
diff --git a/modules/commands/cs_kick.cpp b/modules/commands/cs_kick.cpp
index 2756f3a59..27f4dbac9 100644
--- a/modules/commands/cs_kick.cpp
+++ b/modules/commands/cs_kick.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandCSKick
+class CommandCSKick final
 	: public Command
 {
 public:
@@ -134,7 +134,7 @@ public:
 	}
 };
 
-class CSKick
+class CSKick final
 	: public Module
 {
 	CommandCSKick commandcskick;
diff --git a/modules/commands/cs_list.cpp b/modules/commands/cs_list.cpp
index 6c07db258..29add4596 100644
--- a/modules/commands/cs_list.cpp
+++ b/modules/commands/cs_list.cpp
@@ -12,7 +12,7 @@
 #include "module.h"
 #include "modules/cs_mode.h"
 
-class CommandCSList
+class CommandCSList final
 	: public Command
 {
 public:
@@ -171,7 +171,7 @@ public:
 	}
 };
 
-class CommandCSSetPrivate
+class CommandCSSetPrivate final
 	: public Command
 {
 public:
@@ -240,7 +240,7 @@ public:
 	}
 };
 
-class CSList
+class CSList final
 	: public Module
 {
 	CommandCSList commandcslist;
diff --git a/modules/commands/cs_log.cpp b/modules/commands/cs_log.cpp
index ebc64f8c7..847316db6 100644
--- a/modules/commands/cs_log.cpp
+++ b/modules/commands/cs_log.cpp
@@ -12,7 +12,7 @@
 #include "module.h"
 #include "modules/cs_log.h"
 
-struct LogSettingImpl
+struct LogSettingImpl final
 	: LogSetting
 	, Serializable
 {
@@ -79,7 +79,7 @@ struct LogSettingImpl
 	}
 };
 
-struct LogSettingsImpl
+struct LogSettingsImpl final
 	: LogSettings
 {
 	LogSettingsImpl(Extensible *) { }
@@ -100,7 +100,7 @@ struct LogSettingsImpl
 	}
 };
 
-class CommandCSLog
+class CommandCSLog final
 	: public Command
 {
 public:
@@ -285,7 +285,7 @@ public:
 	}
 };
 
-class CSLog
+class CSLog final
 	: public Module
 {
 	ServiceReference<MemoServService> MSService;
@@ -293,7 +293,7 @@ class CSLog
 	ExtensibleItem<LogSettingsImpl> logsettings;
 	Serialize::Type logsetting_type;
 
-	struct LogDefault
+	struct LogDefault final
 	{
 		Anope::string service, command, method;
 	};
diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp
index 1cdec547a..05fb43c33 100644
--- a/modules/commands/cs_mode.cpp
+++ b/modules/commands/cs_mode.cpp
@@ -12,7 +12,7 @@
 #include "module.h"
 #include "modules/cs_mode.h"
 
-struct ModeLockImpl
+struct ModeLockImpl final
 	: ModeLock
 	, Serializable
 {
@@ -35,7 +35,7 @@ struct ModeLockImpl
 	static Serializable* Unserialize(Serializable *obj, Serialize::Data &data);
 };
 
-struct ModeLocksImpl
+struct ModeLocksImpl final
 	: ModeLocks
 {
 	Serialize::Reference<ChannelInfo> ci;
@@ -244,7 +244,7 @@ Serializable* ModeLockImpl::Unserialize(Serializable *obj, Serialize::Data &data
 	return ml;
 }
 
-class CommandCSMode
+class CommandCSMode final
 	: public Command
 {
 	bool CanSet(CommandSource &source, ChannelInfo *ci, ChannelMode *cm, bool self)
@@ -793,7 +793,7 @@ public:
 
 static Anope::map<std::pair<bool, Anope::string> > modes;
 
-class CommandCSModes
+class CommandCSModes final
 	: public Command
 {
 public:
@@ -911,7 +911,7 @@ public:
 	}
 };
 
-class CSMode
+class CSMode final
 	: public Module
 {
 	CommandCSMode commandcsmode;
diff --git a/modules/commands/cs_register.cpp b/modules/commands/cs_register.cpp
index e16413b79..402ae1296 100644
--- a/modules/commands/cs_register.cpp
+++ b/modules/commands/cs_register.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandCSRegister
+class CommandCSRegister final
 	: public Command
 {
 public:
@@ -111,7 +111,7 @@ public:
 };
 
 
-class CSRegister
+class CSRegister final
 	: public Module
 {
 	CommandCSRegister commandcsregister;
diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp
index 378d78105..99f44e9fd 100644
--- a/modules/commands/cs_seen.cpp
+++ b/modules/commands/cs_seen.cpp
@@ -22,7 +22,7 @@ static SeenInfo *FindInfo(const Anope::string &nick);
 typedef Anope::hash_map<SeenInfo *> database_map;
 database_map database;
 
-struct SeenInfo
+struct SeenInfo final
 	: Serializable
 {
 	Anope::string nick;
@@ -110,7 +110,7 @@ static bool ShouldHide(const Anope::string &channel, User *u)
 	return false;
 }
 
-class CommandOSSeen
+class CommandOSSeen final
 	: public Command
 {
 public:
@@ -182,7 +182,7 @@ public:
 	}
 };
 
-class CommandSeen
+class CommandSeen final
 	: public Command
 {
 	void SimpleSeen(CommandSource &source, const std::vector<Anope::string> &params)
@@ -371,7 +371,7 @@ public:
 	}
 };
 
-class CSSeen
+class CSSeen final
 	: public Module
 {
 	Serialize::Type seeninfo_type;
diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp
index ba44f14e2..72ed3421a 100644
--- a/modules/commands/cs_set.cpp
+++ b/modules/commands/cs_set.cpp
@@ -12,7 +12,7 @@
 #include "module.h"
 #include "modules/cs_mode.h"
 
-class CommandCSSet
+class CommandCSSet final
 	: public Command
 {
 public:
@@ -65,7 +65,7 @@ public:
 	}
 };
 
-class CommandCSSetAutoOp
+class CommandCSSetAutoOp final
 	: public Command
 {
 public:
@@ -129,7 +129,7 @@ public:
 	}
 };
 
-class CommandCSSetBanType
+class CommandCSSetBanType final
 	: public Command
 {
 public:
@@ -197,7 +197,7 @@ public:
 	}
 };
 
-class CommandCSSetDescription
+class CommandCSSetDescription final
 	: public Command
 {
 public:
@@ -260,7 +260,7 @@ public:
 	}
 };
 
-class CommandCSSetFounder
+class CommandCSSetFounder final
 	: public Command
 {
 public:
@@ -330,7 +330,7 @@ public:
 	}
 };
 
-class CommandCSSetKeepModes
+class CommandCSSetKeepModes final
 	: public Command
 {
 public:
@@ -396,7 +396,7 @@ public:
 	}
 };
 
-class CommandCSSetPeace
+class CommandCSSetPeace final
 	: public Command
 {
 public:
@@ -469,7 +469,7 @@ inline static Anope::string BotModes()
 	);
 }
 
-class CommandCSSetPersist
+class CommandCSSetPersist final
 	: public Command
 {
 public:
@@ -619,7 +619,7 @@ public:
 	}
 };
 
-class CommandCSSetRestricted
+class CommandCSSetRestricted final
 	: public Command
 {
 public:
@@ -682,7 +682,7 @@ public:
 	}
 };
 
-class CommandCSSetSecure
+class CommandCSSetSecure final
 	: public Command
 {
 public:
@@ -746,7 +746,7 @@ public:
 	}
 };
 
-class CommandCSSetSecureFounder
+class CommandCSSetSecureFounder final
 	: public Command
 {
 public:
@@ -811,7 +811,7 @@ public:
 	}
 };
 
-class CommandCSSetSecureOps
+class CommandCSSetSecureOps final
 	: public Command
 {
 public:
@@ -874,7 +874,7 @@ public:
 	}
 };
 
-class CommandCSSetSignKick
+class CommandCSSetSignKick final
 	: public Command
 {
 public:
@@ -952,7 +952,7 @@ public:
 	}
 };
 
-class CommandCSSetSuccessor
+class CommandCSSetSuccessor final
 	: public Command
 {
 public:
@@ -1047,7 +1047,7 @@ public:
 	}
 };
 
-class CommandCSSetNoexpire
+class CommandCSSetNoexpire final
 	: public Command
 {
 public:
@@ -1106,14 +1106,14 @@ public:
 	}
 };
 
-class CSSet
+class CSSet final
 	: public Module
 {
 	SerializableExtensibleItem<bool> noautoop, peace, securefounder,
 		restricted, secure, secureops, signkick, signkick_level, noexpire,
 		persist;
 
-	struct KeepModes
+	struct KeepModes final
 		: SerializableExtensibleItem<bool>
 	{
 		KeepModes(Module *m, const Anope::string &n) : SerializableExtensibleItem<bool>(m, n) { }
diff --git a/modules/commands/cs_set_misc.cpp b/modules/commands/cs_set_misc.cpp
index 7a8030d57..9a2c8d70e 100644
--- a/modules/commands/cs_set_misc.cpp
+++ b/modules/commands/cs_set_misc.cpp
@@ -31,7 +31,7 @@ static ExtensibleItem<CSMiscData> *GetItem(const Anope::string &name)
 	return it;
 }
 
-struct CSMiscData
+struct CSMiscData final
 	: MiscData
 	, Serializable
 {
@@ -90,7 +90,7 @@ static Anope::string GetAttribute(const Anope::string &command)
 	return command;
 }
 
-class CommandCSSetMisc
+class CommandCSSetMisc final
 	: public Command
 {
 public:
@@ -167,7 +167,7 @@ public:
 	}
 };
 
-class CSSetMisc
+class CSSetMisc final
 	: public Module
 {
 	CommandCSSetMisc commandcssetmisc;
diff --git a/modules/commands/cs_status.cpp b/modules/commands/cs_status.cpp
index 492e30a49..41c3590be 100644
--- a/modules/commands/cs_status.cpp
+++ b/modules/commands/cs_status.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandCSStatus
+class CommandCSStatus final
 	: public Command
 {
 public:
@@ -111,7 +111,7 @@ public:
 	}
 };
 
-class CSStatus
+class CSStatus final
 	: public Module
 {
 	CommandCSStatus commandcsstatus;
diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp
index 6d5322753..28f0debf4 100644
--- a/modules/commands/cs_suspend.cpp
+++ b/modules/commands/cs_suspend.cpp
@@ -12,7 +12,7 @@
 #include "module.h"
 #include "modules/suspend.h"
 
-struct CSSuspendInfo
+struct CSSuspendInfo final
 	: SuspendInfo
 	, Serializable
 {
@@ -52,7 +52,7 @@ struct CSSuspendInfo
 	}
 };
 
-class CommandCSSuspend
+class CommandCSSuspend final
 	: public Command
 {
 public:
@@ -145,7 +145,7 @@ public:
 	}
 };
 
-class CommandCSUnSuspend
+class CommandCSUnSuspend final
 	: public Command
 {
 public:
@@ -197,7 +197,7 @@ public:
 	}
 };
 
-class CSSuspend
+class CSSuspend final
 	: public Module
 {
 	CommandCSSuspend commandcssuspend;
@@ -206,7 +206,7 @@ class CSSuspend
 	Serialize::Type suspend_type;
 	std::vector<Anope::string> show;
 
-	struct trim
+	struct trim final
 	{
 		Anope::string operator()(Anope::string s) const
 		{
diff --git a/modules/commands/cs_sync.cpp b/modules/commands/cs_sync.cpp
index 7a7140944..b76d2cef2 100644
--- a/modules/commands/cs_sync.cpp
+++ b/modules/commands/cs_sync.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandCSSync
+class CommandCSSync final
 	: public Command
 {
 public:
@@ -53,7 +53,7 @@ public:
 	}
 };
 
-class CSSync
+class CSSync final
 	: public Module
 {
 	CommandCSSync commandcssync;
diff --git a/modules/commands/cs_topic.cpp b/modules/commands/cs_topic.cpp
index 582c6a1e7..f774dca65 100644
--- a/modules/commands/cs_topic.cpp
+++ b/modules/commands/cs_topic.cpp
@@ -12,7 +12,7 @@
 #include "module.h"
 #include "modules/cs_mode.h"
 
-class CommandCSSetKeepTopic
+class CommandCSSetKeepTopic final
 	: public Command
 {
 public:
@@ -77,7 +77,7 @@ public:
 	}
 };
 
-class CommandCSTopic
+class CommandCSTopic final
 	: public Command
 {
 	ExtensibleRef<bool> topiclock;
@@ -204,7 +204,7 @@ public:
 	}
 };
 
-class CSTopic
+class CSTopic final
 	: public Module
 {
 	CommandCSTopic commandcstopic;
diff --git a/modules/commands/cs_unban.cpp b/modules/commands/cs_unban.cpp
index 763af5533..c214136eb 100644
--- a/modules/commands/cs_unban.cpp
+++ b/modules/commands/cs_unban.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandCSUnban
+class CommandCSUnban final
 	: public Command
 {
 public:
@@ -116,7 +116,7 @@ public:
 	}
 };
 
-class CSUnban
+class CSUnban final
 	: public Module
 {
 	CommandCSUnban commandcsunban;
diff --git a/modules/commands/cs_updown.cpp b/modules/commands/cs_updown.cpp
index 90bb882e2..24242a0c3 100644
--- a/modules/commands/cs_updown.cpp
+++ b/modules/commands/cs_updown.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandCSUp
+class CommandCSUp final
 	: public Command
 {
 	void SetModes(User *u, Channel *c)
@@ -130,7 +130,7 @@ public:
 	}
 };
 
-class CommandCSDown
+class CommandCSDown final
 	: public Command
 {
 	void RemoveAll(User *u, Channel *c)
@@ -228,7 +228,7 @@ public:
 	}
 };
 
-class CSUpDown
+class CSUpDown final
 	: public Module
 {
 	CommandCSUp commandcsup;
diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp
index 7b0b8fd0c..835768849 100644
--- a/modules/commands/cs_xop.cpp
+++ b/modules/commands/cs_xop.cpp
@@ -17,7 +17,7 @@ namespace
 	std::map<Anope::string, std::vector<Anope::string> > permissions;
 }
 
-class XOPChanAccess
+class XOPChanAccess final
 	: public ChanAccess
 {
 public:
@@ -85,7 +85,7 @@ public:
 	}
 };
 
-class XOPAccessProvider
+class XOPAccessProvider final
 	: public AccessProvider
 {
 public:
@@ -99,7 +99,7 @@ public:
 	}
 };
 
-class CommandCSXOP
+class CommandCSXOP final
 	: public Command
 {
 private:
@@ -294,7 +294,7 @@ private:
 		/* Special case: is it a number/list?  Only do search if it isn't. */
 		if (isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
-			class XOPDelCallback
+			class XOPDelCallback final
 				: public NumberList
 			{
 				CommandSource &source;
@@ -398,7 +398,7 @@ private:
 
 		if (!nick.empty() && nick.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
-			class XOPListCallback
+			class XOPListCallback final
 				: public NumberList
 			{
 				ListFormatter &list;
@@ -600,7 +600,7 @@ public:
 	}
 };
 
-class CSXOP
+class CSXOP final
 	: public Module
 {
 	XOPAccessProvider accessprovider;
diff --git a/modules/commands/gl_global.cpp b/modules/commands/gl_global.cpp
index 3bea27e4d..edfaa21a5 100644
--- a/modules/commands/gl_global.cpp
+++ b/modules/commands/gl_global.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandGLGlobal
+class CommandGLGlobal final
 	: public Command
 {
 	ServiceReference<GlobalService> GService;
@@ -52,7 +52,7 @@ public:
 	}
 };
 
-class GLGlobal
+class GLGlobal final
 	: public Module
 {
 	CommandGLGlobal commandglglobal;
diff --git a/modules/commands/greet.cpp b/modules/commands/greet.cpp
index 81a5e9c6d..1260b3a28 100644
--- a/modules/commands/greet.cpp
+++ b/modules/commands/greet.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandBSSetGreet
+class CommandBSSetGreet final
 	: public Command
 {
 public:
@@ -138,7 +138,7 @@ public:
 	}
 };
 
-class CommandNSSASetGreet
+class CommandNSSASetGreet final
 	: public CommandNSSetGreet
 {
 public:
@@ -165,7 +165,7 @@ public:
 	}
 };
 
-class Greet
+class Greet final
 	: public Module
 {
 	/* channel setting for whether or not greet should be shown */
diff --git a/modules/commands/help.cpp b/modules/commands/help.cpp
index 3d6dc47c3..66c22a589 100644
--- a/modules/commands/help.cpp
+++ b/modules/commands/help.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandHelp
+class CommandHelp final
 	: public Command
 {
 	static const unsigned help_wrap_len = 40;
@@ -183,7 +183,7 @@ public:
 	}
 };
 
-class Help
+class Help final
 	: public Module
 {
 	CommandHelp commandhelp;
diff --git a/modules/commands/hs_del.cpp b/modules/commands/hs_del.cpp
index 81fcf3e68..eb60afc00 100644
--- a/modules/commands/hs_del.cpp
+++ b/modules/commands/hs_del.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandHSDel
+class CommandHSDel final
 	: public Command
 {
 public:
@@ -52,7 +52,7 @@ public:
 	}
 };
 
-class CommandHSDelAll
+class CommandHSDelAll final
 	: public Command
 {
 public:
@@ -98,7 +98,7 @@ public:
 	}
 };
 
-class HSDel
+class HSDel final
 	: public Module
 {
 	CommandHSDel commandhsdel;
diff --git a/modules/commands/hs_group.cpp b/modules/commands/hs_group.cpp
index c05c467c0..9db0bbb00 100644
--- a/modules/commands/hs_group.cpp
+++ b/modules/commands/hs_group.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandHSGroup
+class CommandHSGroup final
 	: public Command
 {
 	bool setting = false;
@@ -76,7 +76,7 @@ public:
 	}
 };
 
-class HSGroup
+class HSGroup final
 	: public Module
 {
 	CommandHSGroup commandhsgroup;
diff --git a/modules/commands/hs_list.cpp b/modules/commands/hs_list.cpp
index bacd4b367..8cda26c38 100644
--- a/modules/commands/hs_list.cpp
+++ b/modules/commands/hs_list.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandHSList
+class CommandHSList final
 	: public Command
 {
 public:
@@ -143,7 +143,7 @@ public:
 	}
 };
 
-class HSList
+class HSList final
 	: public Module
 {
 	CommandHSList commandhslist;
diff --git a/modules/commands/hs_off.cpp b/modules/commands/hs_off.cpp
index cb65c7035..8e4036726 100644
--- a/modules/commands/hs_off.cpp
+++ b/modules/commands/hs_off.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandHSOff
+class CommandHSOff final
 	: public Command
 {
 public:
@@ -54,7 +54,7 @@ public:
 	}
 };
 
-class HSOff
+class HSOff final
 	: public Module
 {
 	CommandHSOff commandhsoff;
diff --git a/modules/commands/hs_on.cpp b/modules/commands/hs_on.cpp
index 7f14e3406..c8c01b7b2 100644
--- a/modules/commands/hs_on.cpp
+++ b/modules/commands/hs_on.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandHSOn
+class CommandHSOn final
 	: public Command
 {
 public:
@@ -60,7 +60,7 @@ public:
 	}
 };
 
-class HSOn
+class HSOn final
 	: public Module
 {
 	CommandHSOn commandhson;
diff --git a/modules/commands/hs_request.cpp b/modules/commands/hs_request.cpp
index 361e4a8f7..25f089647 100644
--- a/modules/commands/hs_request.cpp
+++ b/modules/commands/hs_request.cpp
@@ -20,7 +20,7 @@ static ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ")
 
 static void req_send_memos(Module *me, CommandSource &source, const Anope::string &vIdent, const Anope::string &vHost);
 
-struct HostRequest
+struct HostRequest final
 	: Serializable
 {
 	Anope::string nick;
@@ -64,7 +64,7 @@ struct HostRequest
 	}
 };
 
-class CommandHSRequest
+class CommandHSRequest final
 	: public Command
 {
 	bool isvalidchar(char c)
@@ -187,7 +187,7 @@ public:
 	}
 };
 
-class CommandHSActivate
+class CommandHSActivate final
 	: public Command
 {
 public:
@@ -237,7 +237,7 @@ public:
 	}
 };
 
-class CommandHSReject
+class CommandHSReject final
 	: public Command
 {
 public:
@@ -294,7 +294,7 @@ public:
 	}
 };
 
-class CommandHSWaiting
+class CommandHSWaiting final
 	: public Command
 {
 public:
@@ -353,7 +353,7 @@ public:
 	}
 };
 
-class HSRequest
+class HSRequest final
 	: public Module
 {
 	CommandHSRequest commandhsrequest;
diff --git a/modules/commands/hs_set.cpp b/modules/commands/hs_set.cpp
index 8c2027305..e35f4d3b9 100644
--- a/modules/commands/hs_set.cpp
+++ b/modules/commands/hs_set.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandHSSet
+class CommandHSSet final
 	: public Command
 {
 public:
@@ -105,7 +105,7 @@ public:
 	}
 };
 
-class CommandHSSetAll
+class CommandHSSetAll final
 	: public Command
 {
 	void Sync(const NickAlias *na)
@@ -214,7 +214,7 @@ public:
 	}
 };
 
-class HSSet
+class HSSet final
 	: public Module
 {
 	CommandHSSet commandhsset;
diff --git a/modules/commands/ms_cancel.cpp b/modules/commands/ms_cancel.cpp
index b7b6dee2f..330b55926 100644
--- a/modules/commands/ms_cancel.cpp
+++ b/modules/commands/ms_cancel.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandMSCancel
+class CommandMSCancel final
 	: public Command
 {
 public:
@@ -88,7 +88,7 @@ public:
 	}
 };
 
-class MSCancel
+class MSCancel final
 	: public Module
 {
 	CommandMSCancel commandmscancel;
diff --git a/modules/commands/ms_check.cpp b/modules/commands/ms_check.cpp
index be5e7fc56..d3556379d 100644
--- a/modules/commands/ms_check.cpp
+++ b/modules/commands/ms_check.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandMSCheck
+class CommandMSCheck final
 	: public Command
 {
 public:
@@ -73,7 +73,7 @@ public:
 	}
 };
 
-class MSCheck
+class MSCheck final
 	: public Module
 {
 	CommandMSCheck commandmscheck;
diff --git a/modules/commands/ms_del.cpp b/modules/commands/ms_del.cpp
index 01e882e44..469fdf221 100644
--- a/modules/commands/ms_del.cpp
+++ b/modules/commands/ms_del.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class MemoDelCallback
+class MemoDelCallback final
 	: public NumberList
 {
 	CommandSource &source;
@@ -37,7 +37,7 @@ public:
 	}
 };
 
-class CommandMSDel
+class CommandMSDel final
 	: public Command
 {
 public:
@@ -146,7 +146,7 @@ public:
 	}
 };
 
-class MSDel
+class MSDel final
 	: public Module
 {
 	CommandMSDel commandmsdel;
diff --git a/modules/commands/ms_ignore.cpp b/modules/commands/ms_ignore.cpp
index a1d2d6dc3..c67c1b550 100644
--- a/modules/commands/ms_ignore.cpp
+++ b/modules/commands/ms_ignore.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandMSIgnore
+class CommandMSIgnore final
 	: public Command
 {
 public:
@@ -119,7 +119,7 @@ public:
 	}
 };
 
-class MSIgnore
+class MSIgnore final
 	: public Module
 {
 	CommandMSIgnore commandmsignore;
diff --git a/modules/commands/ms_info.cpp b/modules/commands/ms_info.cpp
index adeb5d082..c76a446cd 100644
--- a/modules/commands/ms_info.cpp
+++ b/modules/commands/ms_info.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandMSInfo
+class CommandMSInfo final
 	: public Command
 {
 public:
@@ -219,7 +219,7 @@ public:
 	}
 };
 
-class MSInfo
+class MSInfo final
 	: public Module
 {
 	CommandMSInfo commandmsinfo;
diff --git a/modules/commands/ms_list.cpp b/modules/commands/ms_list.cpp
index b527939c6..127cfdaaf 100644
--- a/modules/commands/ms_list.cpp
+++ b/modules/commands/ms_list.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandMSList
+class CommandMSList final
 	: public Command
 {
 public:
@@ -66,7 +66,7 @@ public:
 
 			if (!param.empty() && isdigit(param[0]))
 			{
-				class MemoListCallback
+				class MemoListCallback final
 					: public NumberList
 				{
 					ListFormatter &list;
@@ -151,7 +151,7 @@ public:
 	}
 };
 
-class MSList
+class MSList final
 	: public Module
 {
 	CommandMSList commandmslist;
diff --git a/modules/commands/ms_read.cpp b/modules/commands/ms_read.cpp
index 496bf38a7..5e9c8fd83 100644
--- a/modules/commands/ms_read.cpp
+++ b/modules/commands/ms_read.cpp
@@ -47,7 +47,7 @@ static void rsend_notify(CommandSource &source, MemoInfo *mi, Memo *m, const Ano
 	m->receipt = false;
 }
 
-class MemoListCallback
+class MemoListCallback final
 	: public NumberList
 {
 	CommandSource &source;
@@ -105,7 +105,7 @@ public:
 	}
 };
 
-class CommandMSRead
+class CommandMSRead final
 	: public Command
 {
 public:
@@ -211,7 +211,7 @@ public:
 	}
 };
 
-class MSRead
+class MSRead final
 	: public Module
 {
 	CommandMSRead commandmsread;
diff --git a/modules/commands/ms_rsend.cpp b/modules/commands/ms_rsend.cpp
index 092a0ea34..a5de58e56 100644
--- a/modules/commands/ms_rsend.cpp
+++ b/modules/commands/ms_rsend.cpp
@@ -16,7 +16,7 @@ namespace
 	ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ");
 }
 
-class CommandMSRSend
+class CommandMSRSend final
 	: public Command
 {
 public:
@@ -89,7 +89,7 @@ public:
 	}
 };
 
-class MSRSend
+class MSRSend final
 	: public Module
 {
 	CommandMSRSend commandmsrsend;
diff --git a/modules/commands/ms_send.cpp b/modules/commands/ms_send.cpp
index ced13bb6f..1335f1ad4 100644
--- a/modules/commands/ms_send.cpp
+++ b/modules/commands/ms_send.cpp
@@ -16,7 +16,7 @@ namespace
 	ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ");
 }
 
-class CommandMSSend
+class CommandMSSend final
 	: public Command
 {
 public:
@@ -72,7 +72,7 @@ public:
 	}
 };
 
-class MSSend
+class MSSend final
 	: public Module
 {
 	CommandMSSend commandmssend;
diff --git a/modules/commands/ms_sendall.cpp b/modules/commands/ms_sendall.cpp
index a7bdb5d93..c04ff7a3f 100644
--- a/modules/commands/ms_sendall.cpp
+++ b/modules/commands/ms_sendall.cpp
@@ -16,7 +16,7 @@ namespace
 	ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ");
 }
 
-class CommandMSSendAll
+class CommandMSSendAll final
 	: public Command
 {
 public:
@@ -53,7 +53,7 @@ public:
 	}
 };
 
-class MSSendAll
+class MSSendAll final
 	: public Module
 {
 	CommandMSSendAll commandmssendall;
diff --git a/modules/commands/ms_set.cpp b/modules/commands/ms_set.cpp
index bd745a5ef..83b28fb20 100644
--- a/modules/commands/ms_set.cpp
+++ b/modules/commands/ms_set.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandMSSet
+class CommandMSSet final
 	: public Command
 {
 private:
@@ -299,7 +299,7 @@ public:
 	}
 };
 
-class MSSet
+class MSSet final
 	: public Module
 {
 	CommandMSSet commandmsset;
diff --git a/modules/commands/ms_staff.cpp b/modules/commands/ms_staff.cpp
index 0930bbecb..cbd27061d 100644
--- a/modules/commands/ms_staff.cpp
+++ b/modules/commands/ms_staff.cpp
@@ -16,7 +16,7 @@ namespace
 	ServiceReference<MemoServService> memoserv("MemoServService", "MemoServ");
 }
 
-class CommandMSStaff
+class CommandMSStaff final
 	: public Command
 {
 public:
@@ -50,7 +50,7 @@ public:
 	}
 };
 
-class MSStaff
+class MSStaff final
 	: public Module
 {
 	CommandMSStaff commandmsstaff;
diff --git a/modules/commands/ns_access.cpp b/modules/commands/ns_access.cpp
index 0b42436e4..1e0c99ce4 100644
--- a/modules/commands/ns_access.cpp
+++ b/modules/commands/ns_access.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandNSAccess
+class CommandNSAccess final
 	: public Command
 {
 private:
@@ -187,7 +187,7 @@ public:
 	}
 };
 
-class NSAccess
+class NSAccess final
 	: public Module
 {
 	CommandNSAccess commandnsaccess;
diff --git a/modules/commands/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp
index f28b1d0a1..8f4b14112 100644
--- a/modules/commands/ns_ajoin.cpp
+++ b/modules/commands/ns_ajoin.cpp
@@ -13,14 +13,14 @@
 
 struct AJoinEntry;
 
-struct AJoinList
+struct AJoinList final
 	: Serialize::Checker<std::vector<AJoinEntry *> >
 {
 	AJoinList(Extensible *) : Serialize::Checker<std::vector<AJoinEntry *> >("AJoinEntry") { }
 	~AJoinList();
 };
 
-struct AJoinEntry
+struct AJoinEntry final
 	: Serializable
 {
 	Serialize::Reference<NickCore> owner;
@@ -88,7 +88,7 @@ AJoinList::~AJoinList()
 		delete ajoin;
 }
 
-class CommandNSAJoin
+class CommandNSAJoin final
 	: public Command
 {
 	void DoList(CommandSource &source, NickCore *nc)
@@ -300,7 +300,7 @@ public:
 	}
 };
 
-class NSAJoin
+class NSAJoin final
 	: public Module
 {
 	CommandNSAJoin commandnsajoin;
diff --git a/modules/commands/ns_alist.cpp b/modules/commands/ns_alist.cpp
index dc05360a4..e4adfb870 100644
--- a/modules/commands/ns_alist.cpp
+++ b/modules/commands/ns_alist.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandNSAList
+class CommandNSAList final
 	: public Command
 {
 	static bool ChannelSort(ChannelInfo *ci1, ChannelInfo *ci2)
@@ -132,7 +132,7 @@ public:
 	}
 };
 
-class NSAList
+class NSAList final
 	: public Module
 {
 	CommandNSAList commandnsalist;
diff --git a/modules/commands/ns_cert.cpp b/modules/commands/ns_cert.cpp
index 8c874ad81..389b49cf5 100644
--- a/modules/commands/ns_cert.cpp
+++ b/modules/commands/ns_cert.cpp
@@ -14,7 +14,7 @@
 
 static Anope::hash_map<NickCore *> certmap;
 
-struct CertServiceImpl
+struct CertServiceImpl final
 	: CertService
 {
 	CertServiceImpl(Module *o) : CertService(o) { }
@@ -28,7 +28,7 @@ struct CertServiceImpl
 	}
 };
 
-struct NSCertListImpl
+struct NSCertListImpl final
 	: NSCertList
 {
 	Serialize::Reference<NickCore> nc;
@@ -121,7 +121,7 @@ public:
 			nc->Shrink<NSCertList>("certificates");
 	}
 
-	struct ExtensibleItem
+	struct ExtensibleItem final
 		: ::ExtensibleItem<NSCertListImpl>
 	{
 		ExtensibleItem(Module *m, const Anope::string &ename) : ::ExtensibleItem<NSCertListImpl>(m, ename) { }
@@ -163,7 +163,7 @@ public:
 	};
 };
 
-class CommandNSCert
+class CommandNSCert final
 	: public Command
 {
 private:
@@ -342,7 +342,7 @@ public:
 	}
 };
 
-class NSCert
+class NSCert final
 	: public Module
 {
 	CommandNSCert commandnscert;
diff --git a/modules/commands/ns_drop.cpp b/modules/commands/ns_drop.cpp
index d69486e8a..dbdbe09be 100644
--- a/modules/commands/ns_drop.cpp
+++ b/modules/commands/ns_drop.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandNSDrop
+class CommandNSDrop final
 	: public Command
 {
 public:
@@ -72,7 +72,7 @@ public:
 	}
 };
 
-class NSDrop
+class NSDrop final
 	: public Module
 {
 	CommandNSDrop commandnsdrop;
diff --git a/modules/commands/ns_getemail.cpp b/modules/commands/ns_getemail.cpp
index d3c18c0cf..e85fc12d6 100644
--- a/modules/commands/ns_getemail.cpp
+++ b/modules/commands/ns_getemail.cpp
@@ -15,7 +15,7 @@
 
 #include "module.h"
 
-class CommandNSGetEMail
+class CommandNSGetEMail final
 	: public Command
 {
 public:
@@ -59,7 +59,7 @@ public:
 	}
 };
 
-class NSGetEMail
+class NSGetEMail final
 	: public Module
 {
 	CommandNSGetEMail commandnsgetemail;
diff --git a/modules/commands/ns_group.cpp b/modules/commands/ns_group.cpp
index 96a70fdd6..2dfaeb9fc 100644
--- a/modules/commands/ns_group.cpp
+++ b/modules/commands/ns_group.cpp
@@ -12,7 +12,7 @@
 #include "module.h"
 #include "modules/ns_cert.h"
 
-class NSGroupRequest
+class NSGroupRequest final
 	: public IdentifyRequest
 {
 	CommandSource source;
@@ -84,7 +84,7 @@ public:
 	}
 };
 
-class CommandNSGroup
+class CommandNSGroup final
 	: public Command
 {
 public:
@@ -230,7 +230,7 @@ public:
 	}
 };
 
-class CommandNSUngroup
+class CommandNSUngroup final
 	: public Command
 {
 public:
@@ -294,7 +294,7 @@ public:
 	}
 };
 
-class CommandNSGList
+class CommandNSGList final
 	: public Command
 {
 public:
@@ -380,7 +380,7 @@ public:
 	}
 };
 
-class NSGroup
+class NSGroup final
 	: public Module
 {
 	CommandNSGroup commandnsgroup;
diff --git a/modules/commands/ns_identify.cpp b/modules/commands/ns_identify.cpp
index 1f9c49eab..e945c6ece 100644
--- a/modules/commands/ns_identify.cpp
+++ b/modules/commands/ns_identify.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class NSIdentifyRequest
+class NSIdentifyRequest final
 	: public IdentifyRequest
 {
 	CommandSource source;
@@ -58,7 +58,7 @@ public:
 	}
 };
 
-class CommandNSIdentify
+class CommandNSIdentify final
 	: public Command
 {
 public:
@@ -115,7 +115,7 @@ public:
 	}
 };
 
-class NSIdentify
+class NSIdentify final
 	: public Module
 {
 	CommandNSIdentify commandnsidentify;
diff --git a/modules/commands/ns_info.cpp b/modules/commands/ns_info.cpp
index 10bfda6f4..33efbc24f 100644
--- a/modules/commands/ns_info.cpp
+++ b/modules/commands/ns_info.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandNSInfo
+class CommandNSInfo final
 	: public Command
 {
 public:
@@ -234,7 +234,7 @@ public:
 	}
 };
 
-class CommandNSSASetHide
+class CommandNSSASetHide final
 	: public CommandNSSetHide
 {
 public:
@@ -264,7 +264,7 @@ public:
 	}
 };
 
-class NSInfo
+class NSInfo final
 	: public Module
 {
 	CommandNSInfo commandnsinfo;
diff --git a/modules/commands/ns_list.cpp b/modules/commands/ns_list.cpp
index f32cad2f5..a1c28a28d 100644
--- a/modules/commands/ns_list.cpp
+++ b/modules/commands/ns_list.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandNSList
+class CommandNSList final
 	: public Command
 {
 public:
@@ -243,7 +243,7 @@ public:
 	}
 };
 
-class CommandNSSASetPrivate
+class CommandNSSASetPrivate final
 	: public CommandNSSetPrivate
 {
 public:
@@ -273,7 +273,7 @@ public:
 };
 
 
-class NSList
+class NSList final
 	: public Module
 {
 	CommandNSList commandnslist;
diff --git a/modules/commands/ns_logout.cpp b/modules/commands/ns_logout.cpp
index 7a273f08c..8b92f7558 100644
--- a/modules/commands/ns_logout.cpp
+++ b/modules/commands/ns_logout.cpp
@@ -13,7 +13,7 @@
 
 static ServiceReference<NickServService> NickServService("NickServService", "NickServ");
 
-class CommandNSLogout
+class CommandNSLogout final
 	: public Command
 {
 public:
@@ -77,7 +77,7 @@ public:
 	}
 };
 
-class NSLogout
+class NSLogout final
 	: public Module
 {
 	CommandNSLogout commandnslogout;
diff --git a/modules/commands/ns_recover.cpp b/modules/commands/ns_recover.cpp
index 52c58d841..7460dbd33 100644
--- a/modules/commands/ns_recover.cpp
+++ b/modules/commands/ns_recover.cpp
@@ -16,14 +16,14 @@ static ServiceReference<NickServService> nickserv("NickServService", "NickServ")
 
 typedef std::map<Anope::string, ChannelStatus> NSRecoverInfo;
 
-class NSRecoverSvsnick
+class NSRecoverSvsnick final
 {
 public:
 	Reference<User> from;
 	Anope::string to;
 };
 
-class NSRecoverRequest
+class NSRecoverRequest final
 	: public IdentifyRequest
 {
 	CommandSource source;
@@ -142,7 +142,7 @@ public:
 	}
 };
 
-class CommandNSRecover
+class CommandNSRecover final
 	: public Command
 {
 public:
@@ -223,7 +223,7 @@ public:
 	}
 };
 
-class NSRecover
+class NSRecover final
 	: public Module
 {
 	CommandNSRecover commandnsrecover;
diff --git a/modules/commands/ns_register.cpp b/modules/commands/ns_register.cpp
index a597a9c13..d1987a163 100644
--- a/modules/commands/ns_register.cpp
+++ b/modules/commands/ns_register.cpp
@@ -13,7 +13,7 @@
 
 static bool SendRegmail(User *u, const NickAlias *na, BotInfo *bi);
 
-class CommandNSConfirm
+class CommandNSConfirm final
 	: public Command
 {
 public:
@@ -115,7 +115,7 @@ public:
 	}
 };
 
-class CommandNSRegister
+class CommandNSRegister final
 	: public Command
 {
 public:
@@ -311,7 +311,7 @@ public:
 	}
 };
 
-class CommandNSResend
+class CommandNSResend final
 	: public Command
 {
 public:
@@ -369,7 +369,7 @@ public:
 	}
 };
 
-class NSRegister
+class NSRegister final
 	: public Module
 {
 	CommandNSRegister commandnsregister;
diff --git a/modules/commands/ns_resetpass.cpp b/modules/commands/ns_resetpass.cpp
index 73759a251..1120cb84a 100644
--- a/modules/commands/ns_resetpass.cpp
+++ b/modules/commands/ns_resetpass.cpp
@@ -13,7 +13,7 @@
 
 static bool SendResetEmail(User *u, const NickAlias *na, BotInfo *bi);
 
-class CommandNSResetPass
+class CommandNSResetPass final
 	: public Command
 {
 public:
@@ -55,13 +55,13 @@ public:
 	}
 };
 
-struct ResetInfo
+struct ResetInfo final
 {
 	Anope::string code;
 	time_t time;
 };
 
-class NSResetPass
+class NSResetPass final
 	: public Module
 {
 	CommandNSResetPass commandnsresetpass;
diff --git a/modules/commands/ns_set.cpp b/modules/commands/ns_set.cpp
index e6e7486c6..016edde18 100644
--- a/modules/commands/ns_set.cpp
+++ b/modules/commands/ns_set.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandNSSet
+class CommandNSSet final
 	: public Command
 {
 public:
@@ -64,7 +64,7 @@ public:
 	}
 };
 
-class CommandNSSASet
+class CommandNSSASet final
 	: public Command
 {
 public:
@@ -107,7 +107,7 @@ public:
 	}
 };
 
-class CommandNSSetPassword
+class CommandNSSetPassword final
 	: public Command
 {
 public:
@@ -164,7 +164,7 @@ public:
 	}
 };
 
-class CommandNSSASetPassword
+class CommandNSSASetPassword final
 	: public Command
 {
 public:
@@ -299,7 +299,7 @@ public:
 	}
 };
 
-class CommandNSSASetAutoOp
+class CommandNSSASetAutoOp final
 	: public CommandNSSetAutoOp
 {
 public:
@@ -389,7 +389,7 @@ public:
 	}
 };
 
-class CommandNSSASetNeverOp
+class CommandNSSASetNeverOp final
 	: public CommandNSSetNeverOp
 {
 public:
@@ -483,7 +483,7 @@ public:
 	}
 };
 
-class CommandNSSASetDisplay
+class CommandNSSASetDisplay final
 	: public CommandNSSetDisplay
 {
 public:
@@ -632,7 +632,7 @@ public:
 	}
 };
 
-class CommandNSSASetEmail
+class CommandNSSASetEmail final
 	: public CommandNSSetEmail
 {
 public:
@@ -719,7 +719,7 @@ public:
 	}
 };
 
-class CommandNSSASetKeepModes
+class CommandNSSASetKeepModes final
 	: public CommandNSSetKeepModes
 {
 public:
@@ -850,7 +850,7 @@ public:
 	}
 };
 
-class CommandNSSASetKill
+class CommandNSSASetKill final
 	: public CommandNSSetKill
 {
 public:
@@ -964,7 +964,7 @@ public:
 	}
 };
 
-class CommandNSSASetLanguage
+class CommandNSSASetLanguage final
 	: public CommandNSSetLanguage
 {
 public:
@@ -1079,7 +1079,7 @@ public:
 	}
 };
 
-class CommandNSSASetMessage
+class CommandNSSASetMessage final
 	: public CommandNSSetMessage
 {
 public:
@@ -1172,7 +1172,7 @@ public:
 	}
 };
 
-class CommandNSSASetSecure
+class CommandNSSASetSecure final
 	: public CommandNSSetSecure
 {
 public:
@@ -1202,7 +1202,7 @@ public:
 	}
 };
 
-class CommandNSSASetNoexpire
+class CommandNSSASetNoexpire final
 	: public Command
 {
 public:
@@ -1255,7 +1255,7 @@ public:
 	}
 };
 
-class NSSet
+class NSSet final
 	: public Module
 {
 	CommandNSSet commandnsset;
@@ -1296,7 +1296,7 @@ class NSSet
 	SerializableExtensibleItem<bool> autoop, neverop, killprotect, kill_quick, kill_immed,
 		message, secure, noexpire;
 
-	struct KeepModes
+	struct KeepModes final
 		: SerializableExtensibleItem<bool>
 	{
 		KeepModes(Module *m, const Anope::string &n) : SerializableExtensibleItem<bool>(m, n) { }
diff --git a/modules/commands/ns_set_misc.cpp b/modules/commands/ns_set_misc.cpp
index e6e7d8cd9..4fcf10a1b 100644
--- a/modules/commands/ns_set_misc.cpp
+++ b/modules/commands/ns_set_misc.cpp
@@ -31,7 +31,7 @@ static ExtensibleItem<NSMiscData> *GetItem(const Anope::string &name)
 	return it;
 }
 
-struct NSMiscData
+struct NSMiscData final
 	: MiscData
 	, Serializable
 {
@@ -164,7 +164,7 @@ public:
 	}
 };
 
-class CommandNSSASetMisc
+class CommandNSSASetMisc final
 	: public CommandNSSetMisc
 {
 public:
@@ -180,7 +180,7 @@ public:
 	}
 };
 
-class NSSetMisc
+class NSSetMisc final
 	: public Module
 {
 	CommandNSSetMisc commandnssetmisc;
diff --git a/modules/commands/ns_status.cpp b/modules/commands/ns_status.cpp
index 94a073e22..7b4154ce6 100644
--- a/modules/commands/ns_status.cpp
+++ b/modules/commands/ns_status.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandNSStatus
+class CommandNSStatus final
 	: public Command
 {
 public:
@@ -73,7 +73,7 @@ public:
 	}
 };
 
-class NSStatus
+class NSStatus final
 	: public Module
 {
 	CommandNSStatus commandnsstatus;
diff --git a/modules/commands/ns_suspend.cpp b/modules/commands/ns_suspend.cpp
index c5cc2f2e5..97c69aae4 100644
--- a/modules/commands/ns_suspend.cpp
+++ b/modules/commands/ns_suspend.cpp
@@ -14,7 +14,7 @@
 
 static ServiceReference<NickServService> nickserv("NickServService", "NickServ");
 
-struct NSSuspendInfo
+struct NSSuspendInfo final
 	: SuspendInfo
 	, Serializable
 {
@@ -54,7 +54,7 @@ struct NSSuspendInfo
 	}
 };
 
-class CommandNSSuspend
+class CommandNSSuspend final
 	: public Command
 {
 public:
@@ -153,7 +153,7 @@ public:
 	}
 };
 
-class CommandNSUnSuspend
+class CommandNSUnSuspend final
 	: public Command
 {
 public:
@@ -203,7 +203,7 @@ public:
 	}
 };
 
-class NSSuspend
+class NSSuspend final
 	: public Module
 {
 	CommandNSSuspend commandnssuspend;
@@ -212,7 +212,7 @@ class NSSuspend
 	Serialize::Type suspend_type;
 	std::vector<Anope::string> show;
 
-	struct trim
+	struct trim final
 	{
 		Anope::string operator()(Anope::string s) const
 		{
diff --git a/modules/commands/ns_update.cpp b/modules/commands/ns_update.cpp
index 209d5991c..6980a4207 100644
--- a/modules/commands/ns_update.cpp
+++ b/modules/commands/ns_update.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandNSUpdate
+class CommandNSUpdate final
 	: public Command
 {
 public:
@@ -48,7 +48,7 @@ public:
 	}
 };
 
-class NSUpdate
+class NSUpdate final
 	: public Module
 {
 	CommandNSUpdate commandnsupdate;
diff --git a/modules/commands/os_akill.cpp b/modules/commands/os_akill.cpp
index b97bfbe5d..3f5e9c7d2 100644
--- a/modules/commands/os_akill.cpp
+++ b/modules/commands/os_akill.cpp
@@ -13,7 +13,7 @@
 
 static ServiceReference<XLineManager> akills("XLineManager", "xlinemanager/sgline");
 
-class AkillDelCallback
+class AkillDelCallback final
 	: public NumberList
 {
 	CommandSource &source;
@@ -56,7 +56,7 @@ public:
 	}
 };
 
-class CommandOSAKill
+class CommandOSAKill final
 	: public Command
 {
 private:
@@ -264,7 +264,7 @@ private:
 
 		if (!mask.empty() && isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
-			class ListCallback
+			class ListCallback final
 				: public NumberList
 			{
 				CommandSource &source;
@@ -471,7 +471,7 @@ public:
 	}
 };
 
-class OSAKill
+class OSAKill final
 	: public Module
 {
 	CommandOSAKill commandosakill;
diff --git a/modules/commands/os_chankill.cpp b/modules/commands/os_chankill.cpp
index 54966e23b..311e8f3d1 100644
--- a/modules/commands/os_chankill.cpp
+++ b/modules/commands/os_chankill.cpp
@@ -13,7 +13,7 @@
 
 static ServiceReference<XLineManager> akills("XLineManager", "xlinemanager/sgline");
 
-class CommandOSChanKill
+class CommandOSChanKill final
 	: public Command
 {
 public:
@@ -103,7 +103,7 @@ public:
 	}
 };
 
-class OSChanKill
+class OSChanKill final
 	: public Module
 {
 	CommandOSChanKill commandoschankill;
diff --git a/modules/commands/os_config.cpp b/modules/commands/os_config.cpp
index 9895fc744..2a9ede9e7 100644
--- a/modules/commands/os_config.cpp
+++ b/modules/commands/os_config.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSConfig
+class CommandOSConfig final
 	: public Command
 {
 public:
@@ -133,7 +133,7 @@ public:
 	}
 };
 
-class OSConfig
+class OSConfig final
 	: public Module
 {
 	CommandOSConfig commandosconfig;
diff --git a/modules/commands/os_defcon.cpp b/modules/commands/os_defcon.cpp
index 5ef148faa..5664f5ffb 100644
--- a/modules/commands/os_defcon.cpp
+++ b/modules/commands/os_defcon.cpp
@@ -28,7 +28,7 @@ enum DefconLevel
 
 bool DefConModesSet = false;
 
-struct DefconConfig
+struct DefconConfig final
 {
 	std::vector<std::bitset<32> > DefCon;
 	std::set<Anope::string> DefConModesOn, DefConModesOff;
@@ -105,7 +105,7 @@ static ServiceReference<GlobalService> GlobalService("GlobalService", "Global");
 
 static Timer *timeout;
 
-class DefConTimeout
+class DefConTimeout final
 	: public Timer
 {
 	int level;
@@ -145,7 +145,7 @@ public:
 	}
 };
 
-class CommandOSDefcon
+class CommandOSDefcon final
 	: public Command
 {
 	void SendLevels(CommandSource &source)
@@ -246,7 +246,7 @@ public:
 	}
 };
 
-class OSDefcon
+class OSDefcon final
 	: public Module
 {
 	ServiceReference<SessionService> session_service;
diff --git a/modules/commands/os_dns.cpp b/modules/commands/os_dns.cpp
index 003d22305..79f4bf43e 100644
--- a/modules/commands/os_dns.cpp
+++ b/modules/commands/os_dns.cpp
@@ -19,7 +19,7 @@ static Serialize::Checker<std::vector<DNSServer *> > dns_servers("DNSServer");
 
 static std::map<Anope::string, std::list<time_t> > server_quit_times;
 
-struct DNSZone
+struct DNSZone final
 	: Serializable
 {
 	Anope::string name;
@@ -87,7 +87,7 @@ struct DNSZone
 	}
 };
 
-class DNSServer
+class DNSServer final
 	: public Serializable
 {
 	Anope::string server_name;
@@ -206,7 +206,7 @@ public:
 	}
 };
 
-class CommandOSDNS
+class CommandOSDNS final
 	: public Command
 {
 	void DisplayPoolState(CommandSource &source)
@@ -719,7 +719,7 @@ public:
 	}
 };
 
-class ModuleDNS
+class ModuleDNS final
 	: public Module
 {
 	Serialize::Type zone_type, dns_type;
diff --git a/modules/commands/os_forbid.cpp b/modules/commands/os_forbid.cpp
index fb18a8e5d..a06f51bb0 100644
--- a/modules/commands/os_forbid.cpp
+++ b/modules/commands/os_forbid.cpp
@@ -14,7 +14,7 @@
 
 static ServiceReference<NickServService> nickserv("NickServService", "NickServ");
 
-struct ForbidDataImpl
+struct ForbidDataImpl final
 	: ForbidData
 	, Serializable
 {
@@ -61,7 +61,7 @@ Serializable* ForbidDataImpl::Unserialize(Serializable *obj, Serialize::Data &da
 	return fb;
 }
 
-class MyForbidService
+class MyForbidService final
 	: public ForbidService
 {
 	Serialize::Checker<std::vector<ForbidData *>[FT_SIZE - 1]> forbid_data;
@@ -149,7 +149,7 @@ public:
 	}
 };
 
-class CommandOSForbid
+class CommandOSForbid final
 	: public Command
 {
 	ServiceReference<ForbidService> fs;
@@ -434,7 +434,7 @@ public:
 	}
 };
 
-class OSForbid
+class OSForbid final
 	: public Module
 {
 	MyForbidService forbidService;
diff --git a/modules/commands/os_ignore.cpp b/modules/commands/os_ignore.cpp
index 006980299..013d874b0 100644
--- a/modules/commands/os_ignore.cpp
+++ b/modules/commands/os_ignore.cpp
@@ -12,7 +12,7 @@
 #include "module.h"
 #include "modules/os_ignore.h"
 
-struct IgnoreDataImpl
+struct IgnoreDataImpl final
 	: IgnoreData
 	, Serializable
 {
@@ -59,7 +59,7 @@ Serializable* IgnoreDataImpl::Unserialize(Serializable *obj, Serialize::Data &da
 }
 
 
-class OSIgnoreService
+class OSIgnoreService final
 	: public IgnoreService
 {
 	Serialize::Checker<std::vector<IgnoreData *> > ignores;
@@ -157,7 +157,7 @@ public:
 	}
 };
 
-class CommandOSIgnore
+class CommandOSIgnore final
 	: public Command
 {
 private:
@@ -395,7 +395,7 @@ public:
 	}
 };
 
-class OSIgnore
+class OSIgnore final
 	: public Module
 {
 	Serialize::Type ignoredata_type;
diff --git a/modules/commands/os_info.cpp b/modules/commands/os_info.cpp
index c5036e04a..2e293c8f7 100644
--- a/modules/commands/os_info.cpp
+++ b/modules/commands/os_info.cpp
@@ -8,7 +8,7 @@
 
 #include "module.h"
 
-struct OperInfo
+struct OperInfo final
 	: Serializable
 {
 	Anope::string target;
@@ -33,7 +33,7 @@ struct OperInfo
 	static Serializable *Unserialize(Serializable *obj, Serialize::Data &data);
 };
 
-struct OperInfos
+struct OperInfos final
 	: Serialize::Checker<std::vector<OperInfo *> >
 {
 	OperInfos(Extensible *) : Serialize::Checker<std::vector<OperInfo *> >("OperInfo") { }
@@ -95,7 +95,7 @@ Serializable *OperInfo::Unserialize(Serializable *obj, Serialize::Data &data)
 	return o;
 }
 
-class CommandOSInfo
+class CommandOSInfo final
 	: public Command
 {
 public:
@@ -248,7 +248,7 @@ public:
 	}
 };
 
-class OSInfo
+class OSInfo final
 	: public Module
 {
 	CommandOSInfo commandosinfo;
diff --git a/modules/commands/os_jupe.cpp b/modules/commands/os_jupe.cpp
index 2bec69d05..5410b6905 100644
--- a/modules/commands/os_jupe.cpp
+++ b/modules/commands/os_jupe.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSJupe
+class CommandOSJupe final
 	: public Command
 {
 public:
@@ -66,7 +66,7 @@ public:
 	}
 };
 
-class OSJupe
+class OSJupe final
 	: public Module
 {
 	CommandOSJupe commandosjupe;
diff --git a/modules/commands/os_kick.cpp b/modules/commands/os_kick.cpp
index 14261e048..222756aa3 100644
--- a/modules/commands/os_kick.cpp
+++ b/modules/commands/os_kick.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSKick
+class CommandOSKick final
 	: public Command
 {
 public:
@@ -70,7 +70,7 @@ public:
 	}
 };
 
-class OSKick
+class OSKick final
 	: public Module
 {
 	CommandOSKick commandoskick;
diff --git a/modules/commands/os_kill.cpp b/modules/commands/os_kill.cpp
index 40c640826..6d57387a1 100644
--- a/modules/commands/os_kill.cpp
+++ b/modules/commands/os_kill.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSKill
+class CommandOSKill final
 	: public Command
 {
 public:
@@ -53,7 +53,7 @@ public:
 	}
 };
 
-class OSKill
+class OSKill final
 	: public Module
 {
 	CommandOSKill commandoskill;
diff --git a/modules/commands/os_list.cpp b/modules/commands/os_list.cpp
index 514b9f523..a6969dc24 100644
--- a/modules/commands/os_list.cpp
+++ b/modules/commands/os_list.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSChanList
+class CommandOSChanList final
 	: public Command
 {
 public:
@@ -129,7 +129,7 @@ public:
 	}
 };
 
-class CommandOSUserList
+class CommandOSUserList final
 	: public Command
 {
 public:
@@ -272,7 +272,7 @@ public:
 	}
 };
 
-class OSList
+class OSList final
 	: public Module
 {
 	CommandOSChanList commandoschanlist;
diff --git a/modules/commands/os_login.cpp b/modules/commands/os_login.cpp
index 7cd24dc90..942c14b80 100644
--- a/modules/commands/os_login.cpp
+++ b/modules/commands/os_login.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSLogin
+class CommandOSLogin final
 	: public Command
 {
 public:
@@ -62,7 +62,7 @@ public:
 	}
 };
 
-class CommandOSLogout
+class CommandOSLogout final
 	: public Command
 {
 public:
@@ -105,7 +105,7 @@ public:
 	}
 };
 
-class OSLogin
+class OSLogin final
 	: public Module
 {
 	CommandOSLogin commandoslogin;
diff --git a/modules/commands/os_logsearch.cpp b/modules/commands/os_logsearch.cpp
index 79fc597b5..145e12b53 100644
--- a/modules/commands/os_logsearch.cpp
+++ b/modules/commands/os_logsearch.cpp
@@ -13,7 +13,7 @@
 
 static unsigned int HARDMAX = 65536;
 
-class CommandOSLogSearch
+class CommandOSLogSearch final
 	: public Command
 {
 	static inline Anope::string CreateLogName(const Anope::string &file, time_t t = Anope::CurTime)
@@ -172,7 +172,7 @@ public:
 	}
 };
 
-class OSLogSearch
+class OSLogSearch final
 	: public Module
 {
 	CommandOSLogSearch commandoslogsearch;
diff --git a/modules/commands/os_mode.cpp b/modules/commands/os_mode.cpp
index 7140f5246..964234dac 100644
--- a/modules/commands/os_mode.cpp
+++ b/modules/commands/os_mode.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSMode
+class CommandOSMode final
 	: public Command
 {
 public:
@@ -136,7 +136,7 @@ public:
 	}
 };
 
-class CommandOSUMode
+class CommandOSUMode final
 	: public Command
 {
 public:
@@ -175,7 +175,7 @@ public:
 	}
 };
 
-class OSMode
+class OSMode final
 	: public Module
 {
 	CommandOSMode commandosmode;
diff --git a/modules/commands/os_modinfo.cpp b/modules/commands/os_modinfo.cpp
index 802154945..66b8788af 100644
--- a/modules/commands/os_modinfo.cpp
+++ b/modules/commands/os_modinfo.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSModInfo
+class CommandOSModInfo final
 	: public Command
 {
 public:
@@ -69,7 +69,7 @@ public:
 	}
 };
 
-class CommandOSModList
+class CommandOSModList final
 	: public Command
 {
 public:
@@ -194,7 +194,7 @@ public:
 	}
 };
 
-class OSModInfo
+class OSModInfo final
 	: public Module
 {
 	CommandOSModInfo commandosmodinfo;
diff --git a/modules/commands/os_module.cpp b/modules/commands/os_module.cpp
index f8839af74..346640f50 100644
--- a/modules/commands/os_module.cpp
+++ b/modules/commands/os_module.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSModLoad
+class CommandOSModLoad final
 	: public Command
 {
 public:
@@ -49,7 +49,7 @@ public:
 	}
 };
 
-class CommandOSModReLoad
+class CommandOSModReLoad final
 	: public Command
 {
 public:
@@ -122,7 +122,7 @@ public:
 	}
 };
 
-class CommandOSModUnLoad
+class CommandOSModUnLoad final
 	: public Command
 {
 public:
@@ -173,7 +173,7 @@ public:
 	}
 };
 
-class OSModule
+class OSModule final
 	: public Module
 {
 	CommandOSModLoad commandosmodload;
diff --git a/modules/commands/os_news.cpp b/modules/commands/os_news.cpp
index e0c48de59..66f4a5026 100644
--- a/modules/commands/os_news.cpp
+++ b/modules/commands/os_news.cpp
@@ -64,7 +64,7 @@ struct NewsMessages msgarray[] = {
 	 }
 };
 
-struct MyNewsItem
+struct MyNewsItem final
 	: NewsItem
 {
 	void Serialize(Serialize::Data &data) const override
@@ -99,7 +99,7 @@ struct MyNewsItem
 	}
 };
 
-class MyNewsService
+class MyNewsService final
 	: public NewsService
 {
 	std::vector<NewsItem *> newsItems[3];
@@ -299,7 +299,7 @@ public:
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override = 0;
 };
 
-class CommandOSLogonNews
+class CommandOSLogonNews final
 	: public NewsBase
 {
 public:
@@ -327,7 +327,7 @@ public:
 	}
 };
 
-class CommandOSOperNews
+class CommandOSOperNews final
 	: public NewsBase
 {
 public:
@@ -355,7 +355,7 @@ public:
 	}
 };
 
-class CommandOSRandomNews
+class CommandOSRandomNews final
 	: public NewsBase
 {
 public:
@@ -382,7 +382,7 @@ public:
 
 static unsigned cur_rand_news = 0;
 
-class OSNews
+class OSNews final
 	: public Module
 {
 	MyNewsService newsservice;
diff --git a/modules/commands/os_noop.cpp b/modules/commands/os_noop.cpp
index 0d11e0606..d4049abd5 100644
--- a/modules/commands/os_noop.cpp
+++ b/modules/commands/os_noop.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSNOOP
+class CommandOSNOOP final
 	: public Command
 {
 public:
@@ -72,7 +72,7 @@ public:
 	}
 };
 
-class OSNOOP
+class OSNOOP final
 	: public Module
 {
 	CommandOSNOOP commandosnoop;
diff --git a/modules/commands/os_oper.cpp b/modules/commands/os_oper.cpp
index c493b8c82..7f18da9ac 100644
--- a/modules/commands/os_oper.cpp
+++ b/modules/commands/os_oper.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-struct MyOper
+struct MyOper final
 	: Oper
 	, Serializable
 {
@@ -48,7 +48,7 @@ struct MyOper
 	}
 };
 
-class CommandOSOper
+class CommandOSOper final
 	: public Command
 {
 	bool HasPrivs(CommandSource &source, OperType *ot) const
@@ -255,7 +255,7 @@ public:
 	}
 };
 
-class OSOper
+class OSOper final
 	: public Module
 {
 	Serialize::Type myoper_type;
diff --git a/modules/commands/os_reload.cpp b/modules/commands/os_reload.cpp
index 1a87babf1..b66e9704c 100644
--- a/modules/commands/os_reload.cpp
+++ b/modules/commands/os_reload.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSReload
+class CommandOSReload final
 	: public Command
 {
 public:
@@ -53,7 +53,7 @@ public:
 	}
 };
 
-class OSReload
+class OSReload final
 	: public Module
 {
 	CommandOSReload commandosreload;
diff --git a/modules/commands/os_session.cpp b/modules/commands/os_session.cpp
index 8b746bb6d..213721b1a 100644
--- a/modules/commands/os_session.cpp
+++ b/modules/commands/os_session.cpp
@@ -35,7 +35,7 @@ namespace
 	unsigned ipv6_cidr;
 }
 
-class MySessionService
+class MySessionService final
 	: public SessionService
 {
 	SessionMap Sessions;
@@ -127,7 +127,7 @@ public:
 	}
 };
 
-class ExceptionDelCallback
+class ExceptionDelCallback final
 	: public NumberList
 {
 protected:
@@ -170,7 +170,7 @@ public:
 	}
 };
 
-class CommandOSSession
+class CommandOSSession final
 	: public Command
 {
 private:
@@ -284,7 +284,7 @@ public:
 	}
 };
 
-class CommandOSException
+class CommandOSException final
 	: public Command
 {
 private:
@@ -435,7 +435,7 @@ private:
 
 		if (!mask.empty() && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
-			class ExceptionListCallback
+			class ExceptionListCallback final
 				: public NumberList
 			{
 				CommandSource &source;
@@ -582,7 +582,7 @@ public:
 	}
 };
 
-class OSSession
+class OSSession final
 	: public Module
 {
 	Serialize::Type exception_type;
diff --git a/modules/commands/os_set.cpp b/modules/commands/os_set.cpp
index df5301c71..db803a6a2 100644
--- a/modules/commands/os_set.cpp
+++ b/modules/commands/os_set.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSSet
+class CommandOSSet final
 	: public Command
 {
 private:
@@ -254,7 +254,7 @@ public:
 	}
 };
 
-class OSSet
+class OSSet final
 	: public Module
 {
 	CommandOSSet commandosset;
diff --git a/modules/commands/os_shutdown.cpp b/modules/commands/os_shutdown.cpp
index 4db78d11d..585bbcd50 100644
--- a/modules/commands/os_shutdown.cpp
+++ b/modules/commands/os_shutdown.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSQuit
+class CommandOSQuit final
 	: public Command
 {
 public:
@@ -40,7 +40,7 @@ public:
 	}
 };
 
-class CommandOSRestart
+class CommandOSRestart final
 	: public Command
 {
 public:
@@ -67,7 +67,7 @@ public:
 	}
 };
 
-class CommandOSShutdown
+class CommandOSShutdown final
 	: public Command
 {
 public:
@@ -94,7 +94,7 @@ public:
 	}
 };
 
-class OSShutdown
+class OSShutdown final
 	: public Module
 {
 	CommandOSQuit commandosquit;
diff --git a/modules/commands/os_stats.cpp b/modules/commands/os_stats.cpp
index de00b22f8..82c62ce6e 100644
--- a/modules/commands/os_stats.cpp
+++ b/modules/commands/os_stats.cpp
@@ -12,7 +12,7 @@
 #include "module.h"
 #include "modules/os_session.h"
 
-struct Stats
+struct Stats final
 	: Serializable
 {
 	static Stats *me;
@@ -59,7 +59,7 @@ static int stats_count_servers(Server *s)
 	return count;
 }
 
-class CommandOSStats
+class CommandOSStats final
 	: public Command
 {
 	ServiceReference<XLineManager> akills, snlines, sqlines;
@@ -257,7 +257,7 @@ public:
 	}
 };
 
-class OSStats
+class OSStats final
 	: public Module
 {
 	CommandOSStats commandosstats;
diff --git a/modules/commands/os_svs.cpp b/modules/commands/os_svs.cpp
index 4125453e2..3a1ba29b8 100644
--- a/modules/commands/os_svs.cpp
+++ b/modules/commands/os_svs.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSSVSNick
+class CommandOSSVSNick final
 	: public Command
 {
 public:
@@ -71,7 +71,7 @@ public:
 	}
 };
 
-class CommandOSSVSJoin
+class CommandOSSVSJoin final
 	: public Command
 {
 public:
@@ -116,7 +116,7 @@ public:
 	}
 };
 
-class CommandOSSVSPart
+class CommandOSSVSPart final
 	: public Command
 {
 public:
@@ -165,7 +165,7 @@ public:
 	}
 };
 
-class OSSVS
+class OSSVS final
 	: public Module
 {
 	CommandOSSVSNick commandossvsnick;
diff --git a/modules/commands/os_sxline.cpp b/modules/commands/os_sxline.cpp
index 015d52660..3acaa5c35 100644
--- a/modules/commands/os_sxline.cpp
+++ b/modules/commands/os_sxline.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class SXLineDelCallback
+class SXLineDelCallback final
 	: public NumberList
 {
 	XLineManager *xlm;
@@ -120,7 +120,7 @@ private:
 
 		if (!mask.empty() && isdigit(mask[0]) && mask.find_first_not_of("1234567890,-") == Anope::string::npos)
 		{
-			class SXLineListCallback
+			class SXLineListCallback final
 				: public NumberList
 			{
 				XLineManager *xlm;
@@ -259,7 +259,7 @@ public:
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) override = 0;
 };
 
-class CommandOSSNLine
+class CommandOSSNLine final
 	: public CommandOSSXLineBase
 {
 	XLineManager *xlm() override
@@ -484,7 +484,7 @@ public:
 	}
 };
 
-class CommandOSSQLine
+class CommandOSSQLine final
 	: public CommandOSSXLineBase
 {
 	XLineManager *xlm() override
@@ -715,7 +715,7 @@ public:
 	}
 };
 
-class OSSXLine
+class OSSXLine final
 	: public Module
 {
 	CommandOSSNLine commandossnline;
diff --git a/modules/commands/os_update.cpp b/modules/commands/os_update.cpp
index aafde628f..b43c5f3cd 100644
--- a/modules/commands/os_update.cpp
+++ b/modules/commands/os_update.cpp
@@ -11,7 +11,7 @@
 
 #include "module.h"
 
-class CommandOSUpdate
+class CommandOSUpdate final
 	: public Command
 {
 public:
@@ -38,7 +38,7 @@ public:
 	}
 };
 
-class OSUpdate
+class OSUpdate final
 	: public Module
 {
 	CommandOSUpdate commandosupdate;