Improve the layout of types that inherit from another type.

8 files changed, 276 insertions, 138 deletions

diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index 802069f96..278fc6545 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -11,7 +11,8 @@
 
 #include "module.h"
 
-class ChannelModeFlood : public ChannelModeParam
+class ChannelModeFlood
+	: public ChannelModeParam
 {
 public:
 	ChannelModeFlood(char modeChar, bool minusNoArg) : ChannelModeParam("FLOOD", modeChar, minusNoArg) { }
@@ -30,7 +31,8 @@ public:
 	}
 };
 
-class BahamutIRCdProto : public IRCDProto
+class BahamutIRCdProto
+	: public IRCDProto
 {
 public:
 	BahamutIRCdProto(Module *creator) : IRCDProto(creator, "Bahamut 1.8.x")
@@ -290,7 +292,8 @@ public:
 	}
 };
 
-struct IRCDMessageBurst : IRCDMessage
+struct IRCDMessageBurst
+	: IRCDMessage
 {
 	IRCDMessageBurst(Module *creator) : IRCDMessage(creator, "BURST", 0) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -308,7 +311,8 @@ struct IRCDMessageBurst : IRCDMessage
 	}
 };
 
-struct IRCDMessageMode : IRCDMessage
+struct IRCDMessageMode
+	: IRCDMessage
 {
 	IRCDMessageMode(Module *creator, const Anope::string &sname) : IRCDMessage(creator, sname, 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -359,7 +363,8 @@ struct IRCDMessageMode : IRCDMessage
  **	  parv[0] = new nickname
  **	  parv[1] = hopcount
  */
-struct IRCDMessageNick : IRCDMessage
+struct IRCDMessageNick
+	: IRCDMessage
 {
 	IRCDMessageNick(Module *creator) : IRCDMessage(creator, "NICK", 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -392,7 +397,8 @@ struct IRCDMessageNick : IRCDMessage
 	}
 };
 
-struct IRCDMessageServer : IRCDMessage
+struct IRCDMessageServer
+	: IRCDMessage
 {
 	IRCDMessageServer(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -403,7 +409,8 @@ struct IRCDMessageServer : IRCDMessage
 	}
 };
 
-struct IRCDMessageSJoin : IRCDMessage
+struct IRCDMessageSJoin
+	: IRCDMessage
 {
 	IRCDMessageSJoin(Module *creator) : IRCDMessage(creator, "SJOIN", 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -459,7 +466,8 @@ struct IRCDMessageSJoin : IRCDMessage
 	}
 };
 
-struct IRCDMessageTopic : IRCDMessage
+struct IRCDMessageTopic
+	: IRCDMessage
 {
 	IRCDMessageTopic(Module *creator) : IRCDMessage(creator, "TOPIC", 4) { }
 
@@ -471,7 +479,8 @@ struct IRCDMessageTopic : IRCDMessage
 	}
 };
 
-class ProtoBahamut : public Module
+class ProtoBahamut
+	: public Module
 {
 	BahamutIRCdProto ircd_proto;
 
diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index f99e8de80..fb9bfa692 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -15,7 +15,8 @@
 static Anope::string UplinkSID;
 static bool UseSVSAccount = false;  // Temporary backwards compatibility hack until old proto is deprecated
 
-class HybridProto : public IRCDProto
+class HybridProto
+	: public IRCDProto
 {
 	void SendSVSKillInternal(const MessageSource &source, User *u, const Anope::string &buf) override
 	{
@@ -317,7 +318,8 @@ public:
 	}
 };
 
-struct IRCDMessageBMask : IRCDMessage
+struct IRCDMessageBMask
+	: IRCDMessage
 {
 	IRCDMessageBMask(Module *creator) : IRCDMessage(creator, "BMASK", 4) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -339,7 +341,8 @@ struct IRCDMessageBMask : IRCDMessage
 	}
 };
 
-struct IRCDMessageCapab : Message::Capab
+struct IRCDMessageCapab
+	: Message::Capab
 {
 	IRCDMessageCapab(Module *creator) : Message::Capab(creator, "CAPAB") { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -379,7 +382,8 @@ struct IRCDMessageCertFP: IRCDMessage
 	}
 };
 
-struct IRCDMessageEOB : IRCDMessage
+struct IRCDMessageEOB
+	: IRCDMessage
 {
 	IRCDMessageEOB(Module *creator) : IRCDMessage(creator, "EOB", 0) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -389,7 +393,8 @@ struct IRCDMessageEOB : IRCDMessage
 	}
 };
 
-struct IRCDMessageJoin : Message::Join
+struct IRCDMessageJoin
+	: Message::Join
 {
 	IRCDMessageJoin(Module *creator) : Message::Join(creator, "JOIN") { }
 
@@ -405,7 +410,8 @@ struct IRCDMessageJoin : Message::Join
 	}
 };
 
-struct IRCDMessageMetadata : IRCDMessage
+struct IRCDMessageMetadata
+	: IRCDMessage
 {
 	IRCDMessageMetadata(Module *creator) : IRCDMessage(creator, "METADATA", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -431,7 +437,8 @@ struct IRCDMessageMetadata : IRCDMessage
 	}
 };
 
-struct IRCDMessageMLock : IRCDMessage
+struct IRCDMessageMLock
+	: IRCDMessage
 {
 	IRCDMessageMLock(Module *creator) : IRCDMessage(creator, "MLOCK", 4) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -456,7 +463,8 @@ struct IRCDMessageMLock : IRCDMessage
 	}
 };
 
-struct IRCDMessageNick : IRCDMessage
+struct IRCDMessageNick
+	: IRCDMessage
 {
 	IRCDMessageNick(Module *creator) : IRCDMessage(creator, "NICK", 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
@@ -468,7 +476,8 @@ struct IRCDMessageNick : IRCDMessage
 	}
 };
 
-struct IRCDMessagePass : IRCDMessage
+struct IRCDMessagePass
+	: IRCDMessage
 {
 	IRCDMessagePass(Module *creator) : IRCDMessage(creator, "PASS", 1) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -481,7 +490,8 @@ struct IRCDMessagePass : IRCDMessage
 	}
 };
 
-struct IRCDMessagePong : IRCDMessage
+struct IRCDMessagePong
+	: IRCDMessage
 {
 	IRCDMessagePong(Module *creator) : IRCDMessage(creator, "PONG", 0) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -491,7 +501,8 @@ struct IRCDMessagePong : IRCDMessage
 	}
 };
 
-struct IRCDMessageServer : IRCDMessage
+struct IRCDMessageServer
+	: IRCDMessage
 {
 	IRCDMessageServer(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -515,7 +526,8 @@ struct IRCDMessageServer : IRCDMessage
 	}
 };
 
-struct IRCDMessageSID : IRCDMessage
+struct IRCDMessageSID
+	: IRCDMessage
 {
 	IRCDMessageSID(Module *creator) : IRCDMessage(creator, "SID", 5) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -530,7 +542,8 @@ struct IRCDMessageSID : IRCDMessage
 	}
 };
 
-struct IRCDMessageSJoin : IRCDMessage
+struct IRCDMessageSJoin
+	: IRCDMessage
 {
 	IRCDMessageSJoin(Module *creator) : IRCDMessage(creator, "SJOIN", 4) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -577,7 +590,8 @@ struct IRCDMessageSJoin : IRCDMessage
 	}
 };
 
-struct IRCDMessageSVSMode : IRCDMessage
+struct IRCDMessageSVSMode
+	: IRCDMessage
 {
 	IRCDMessageSVSMode(Module *creator) : IRCDMessage(creator, "SVSMODE", 3) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -597,7 +611,8 @@ struct IRCDMessageSVSMode : IRCDMessage
 	}
 };
 
-struct IRCDMessageTBurst : IRCDMessage
+struct IRCDMessageTBurst
+	: IRCDMessage
 {
 	IRCDMessageTBurst(Module *creator) : IRCDMessage(creator, "TBURST", 5) { }
 
@@ -615,7 +630,8 @@ struct IRCDMessageTBurst : IRCDMessage
 	}
 };
 
-struct IRCDMessageTMode : IRCDMessage
+struct IRCDMessageTMode
+	: IRCDMessage
 {
 	IRCDMessageTMode(Module *creator) : IRCDMessage(creator, "TMODE", 3) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -642,7 +658,8 @@ struct IRCDMessageTMode : IRCDMessage
 	}
 };
 
-struct IRCDMessageUID : IRCDMessage
+struct IRCDMessageUID
+	: IRCDMessage
 {
 	IRCDMessageUID(Module *creator) : IRCDMessage(creator, "UID", 11) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -662,7 +679,8 @@ struct IRCDMessageUID : IRCDMessage
 	}
 };
 
-class ProtoHybrid : public Module
+class ProtoHybrid
+	: public Module
 {
 	HybridProto ircd_proto;
 
diff --git a/modules/protocol/inspircd.cpp b/modules/protocol/inspircd.cpp
index 9691aa367..7de36d956 100644
--- a/modules/protocol/inspircd.cpp
+++ b/modules/protocol/inspircd.cpp
@@ -44,7 +44,8 @@ static void ParseModule(const Anope::string &module, Anope::string &modname, Ano
 	Log(LOG_DEBUG) << "Parsed module: " << "name=" << modname << " data=" << moddata;
 }
 
-class InspIRCdProto : public IRCDProto
+class InspIRCdProto
+	: public IRCDProto
 {
 private:
 	void SendChgIdentInternal(const Anope::string &nick, const Anope::string &vIdent)
@@ -536,7 +537,8 @@ public:
 	}
 };
 
-class InspIRCdAutoOpMode : public ChannelModeList
+class InspIRCdAutoOpMode
+	: public ChannelModeList
 {
 public:
 	InspIRCdAutoOpMode(char mode) : ChannelModeList("AUTOOP", mode)
@@ -551,7 +553,8 @@ public:
 	}
 };
 
-class InspIRCdExtBan : public ChannelModeVirtual<ChannelModeList>
+class InspIRCdExtBan
+	: public ChannelModeVirtual<ChannelModeList>
 {
 	char ext;
 
@@ -579,7 +582,8 @@ public:
 
 namespace InspIRCdExtban
 {
-	class EntryMatcher : public InspIRCdExtBan
+	class EntryMatcher
+		: public InspIRCdExtBan
 	{
 	public:
 		EntryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
@@ -595,7 +599,8 @@ namespace InspIRCdExtban
 		}
 	};
 
-	class ChannelMatcher : public InspIRCdExtBan
+	class ChannelMatcher
+		: public InspIRCdExtBan
 	{
 	public:
 		ChannelMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
@@ -631,7 +636,8 @@ namespace InspIRCdExtban
 		}
 	};
 
-	class AccountMatcher : public InspIRCdExtBan
+	class AccountMatcher
+		: public InspIRCdExtBan
 	{
 	public:
 		AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
@@ -647,7 +653,8 @@ namespace InspIRCdExtban
 		}
 	};
 
-	class RealnameMatcher : public InspIRCdExtBan
+	class RealnameMatcher
+		: public InspIRCdExtBan
 	{
 	public:
 		RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
@@ -662,7 +669,8 @@ namespace InspIRCdExtban
 		}
 	};
 
-	class ServerMatcher : public InspIRCdExtBan
+	class ServerMatcher
+		: public InspIRCdExtBan
 	{
 	public:
 		ServerMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
@@ -677,7 +685,8 @@ namespace InspIRCdExtban
 		}
 	};
 
-	class FingerprintMatcher : public InspIRCdExtBan
+	class FingerprintMatcher
+		: public InspIRCdExtBan
 	{
 	public:
 		FingerprintMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
@@ -692,7 +701,8 @@ namespace InspIRCdExtban
 		}
 	};
 
-	class UnidentifiedMatcher : public InspIRCdExtBan
+	class UnidentifiedMatcher
+		: public InspIRCdExtBan
 	{
 	public:
 		UnidentifiedMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : InspIRCdExtBan(mname, mbase, c)
@@ -708,7 +718,8 @@ namespace InspIRCdExtban
 	};
 }
 
-class ColonDelimitedParamMode : public ChannelModeParam
+class ColonDelimitedParamMode
+	: public ChannelModeParam
 {
 public:
 	ColonDelimitedParamMode(const Anope::string &modename, char modeChar) : ChannelModeParam(modename, modeChar, true) { }
@@ -757,7 +768,8 @@ public:
 	}
 };
 
-class SimpleNumberParamMode : public ChannelModeParam
+class SimpleNumberParamMode
+	: public ChannelModeParam
 {
 public:
 	SimpleNumberParamMode(const Anope::string &modename, char modeChar) : ChannelModeParam(modename, modeChar, true) { }
@@ -782,7 +794,8 @@ public:
 	}
 };
 
-class ChannelModeFlood : public ColonDelimitedParamMode
+class ChannelModeFlood
+	: public ColonDelimitedParamMode
 {
 public:
 	ChannelModeFlood(char modeChar) : ColonDelimitedParamMode("FLOOD", modeChar) { }
@@ -796,7 +809,8 @@ public:
 	}
 };
 
-class ChannelModeHistory : public ColonDelimitedParamMode
+class ChannelModeHistory
+	: public ColonDelimitedParamMode
 {
 public:
 	ChannelModeHistory(char modeChar) : ColonDelimitedParamMode("HISTORY", modeChar) { }
@@ -807,7 +821,8 @@ public:
 	}
 };
 
-class ChannelModeRedirect : public ChannelModeParam
+class ChannelModeRedirect
+	: public ChannelModeParam
 {
 public:
 	ChannelModeRedirect(char modeChar) : ChannelModeParam("REDIRECT", modeChar, true) { }
@@ -819,7 +834,8 @@ public:
 	}
 };
 
-struct IRCDMessageAway : Message::Away
+struct IRCDMessageAway
+	: Message::Away
 {
 	IRCDMessageAway(Module *creator) : Message::Away(creator, "AWAY") { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
@@ -833,7 +849,8 @@ struct IRCDMessageAway : Message::Away
 	}
 };
 
-struct IRCDMessageCapab : Message::Capab
+struct IRCDMessageCapab
+	: Message::Capab
 {
 	struct ModeInfo
 	{
@@ -1225,7 +1242,8 @@ struct IRCDMessageCapab : Message::Capab
 	}
 };
 
-struct IRCDMessageEncap : IRCDMessage
+struct IRCDMessageEncap
+	: IRCDMessage
 {
 	IRCDMessageEncap(Module *creator) : IRCDMessage(creator, "ENCAP", 4) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -1275,7 +1293,8 @@ struct IRCDMessageEncap : IRCDMessage
 	}
 };
 
-struct IRCDMessageFHost : IRCDMessage
+struct IRCDMessageFHost
+	: IRCDMessage
 {
 	IRCDMessageFHost(Module *creator) : IRCDMessage(creator, "FHOST", 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
@@ -1288,7 +1307,8 @@ struct IRCDMessageFHost : IRCDMessage
 	}
 };
 
-struct IRCDMessageFIdent : IRCDMessage
+struct IRCDMessageFIdent
+	: IRCDMessage
 {
 	IRCDMessageFIdent(Module *creator) : IRCDMessage(creator, "FIDENT", 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
@@ -1298,7 +1318,8 @@ struct IRCDMessageFIdent : IRCDMessage
 	}
 };
 
-struct IRCDMessageKick : IRCDMessage
+struct IRCDMessageKick
+	: IRCDMessage
 {
 	IRCDMessageKick(Module *creator) : IRCDMessage(creator, "KICK", 3) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -1315,7 +1336,8 @@ struct IRCDMessageKick : IRCDMessage
 	}
 };
 
-struct IRCDMessageSave : IRCDMessage
+struct IRCDMessageSave
+	: IRCDMessage
 {
 	time_t last_collide = 0;
 
@@ -1357,7 +1379,8 @@ struct IRCDMessageSave : IRCDMessage
 	}
 };
 
-class IRCDMessageMetadata : IRCDMessage
+class IRCDMessageMetadata
+	: IRCDMessage
 {
 	const bool &do_topiclock;
 	const bool &do_mlock;
@@ -1508,7 +1531,8 @@ public:
 	}
 };
 
-struct IRCDMessageEndburst : IRCDMessage
+struct IRCDMessageEndburst
+	: IRCDMessage
 {
 	IRCDMessageEndburst(Module *creator) : IRCDMessage(creator, "ENDBURST", 0) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -1522,7 +1546,8 @@ struct IRCDMessageEndburst : IRCDMessage
 	}
 };
 
-struct IRCDMessageFJoin : IRCDMessage
+struct IRCDMessageFJoin
+	: IRCDMessage
 {
 	IRCDMessageFJoin(Module *creator) : IRCDMessage(creator, "FJOIN", 2) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -1578,7 +1603,8 @@ struct IRCDMessageFJoin : IRCDMessage
 	}
 };
 
-struct IRCDMessageFMode : IRCDMessage
+struct IRCDMessageFMode
+	: IRCDMessage
 {
 	IRCDMessageFMode(Module *creator) : IRCDMessage(creator, "FMODE", 3) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -1607,7 +1633,8 @@ struct IRCDMessageFMode : IRCDMessage
 	}
 };
 
-struct IRCDMessageFTopic : IRCDMessage
+struct IRCDMessageFTopic
+	: IRCDMessage
 {
 	IRCDMessageFTopic(Module *creator) : IRCDMessage(creator, "FTOPIC", 4) { SetFlag(IRCDMESSAGE_SOFT_LIMIT);  }
 
@@ -1625,7 +1652,8 @@ struct IRCDMessageFTopic : IRCDMessage
 	}
 };
 
-struct IRCDMessageIdle : IRCDMessage
+struct IRCDMessageIdle
+	: IRCDMessage
 {
 	IRCDMessageIdle(Module *creator) : IRCDMessage(creator, "IDLE", 1) { }
 
@@ -1643,7 +1671,8 @@ struct IRCDMessageIdle : IRCDMessage
 	}
 };
 
-struct IRCDMessageIJoin : IRCDMessage
+struct IRCDMessageIJoin
+	: IRCDMessage
 {
 	IRCDMessageIJoin(Module *creator) : IRCDMessage(creator, "IJOIN", 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -1679,7 +1708,8 @@ struct IRCDMessageIJoin : IRCDMessage
 	}
 };
 
-struct IRCDMessageMode : IRCDMessage
+struct IRCDMessageMode
+	: IRCDMessage
 {
 	IRCDMessageMode(Module *creator) : IRCDMessage(creator, "MODE", 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -1709,7 +1739,8 @@ struct IRCDMessageMode : IRCDMessage
 	}
 };
 
-struct IRCDMessageNick : IRCDMessage
+struct IRCDMessageNick
+	: IRCDMessage
 {
 	IRCDMessageNick(Module *creator) : IRCDMessage(creator, "NICK", 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
@@ -1719,7 +1750,8 @@ struct IRCDMessageNick : IRCDMessage
 	}
 };
 
-struct IRCDMessageOperType : IRCDMessage
+struct IRCDMessageOperType
+	: IRCDMessage
 {
 	IRCDMessageOperType(Module *creator) : IRCDMessage(creator, "OPERTYPE", 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
@@ -1733,7 +1765,8 @@ struct IRCDMessageOperType : IRCDMessage
 	}
 };
 
-struct IRCDMessagePing : IRCDMessage
+struct IRCDMessagePing
+	: IRCDMessage
 {
 	IRCDMessagePing(Module *creator) : IRCDMessage(creator, "PING", 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -1744,7 +1777,8 @@ struct IRCDMessagePing : IRCDMessage
 	}
 };
 
-struct IRCDMessageRSQuit : IRCDMessage
+struct IRCDMessageRSQuit
+	: IRCDMessage
 {
 	IRCDMessageRSQuit(Module *creator) : IRCDMessage(creator, "RSQUIT", 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -1760,7 +1794,8 @@ struct IRCDMessageRSQuit : IRCDMessage
 	}
 };
 
-struct IRCDMessageServer : IRCDMessage
+struct IRCDMessageServer
+	: IRCDMessage
 {
 	IRCDMessageServer(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -1793,7 +1828,8 @@ struct IRCDMessageServer : IRCDMessage
 	}
 };
 
-struct IRCDMessageSQuit : Message::SQuit
+struct IRCDMessageSQuit
+	: Message::SQuit
 {
 	IRCDMessageSQuit(Module *creator) : Message::SQuit(creator) { }
 
@@ -1815,7 +1851,8 @@ struct IRCDMessageSQuit : Message::SQuit
 	}
 };
 
-struct IRCDMessageTime : IRCDMessage
+struct IRCDMessageTime
+	: IRCDMessage
 {
 	IRCDMessageTime(Module *creator) : IRCDMessage(creator, "TIME", 2) { }
 
@@ -1825,7 +1862,8 @@ struct IRCDMessageTime : IRCDMessage
 	}
 };
 
-struct IRCDMessageUID : IRCDMessage
+struct IRCDMessageUID
+	: IRCDMessage
 {
 	IRCDMessageUID(Module *creator) : IRCDMessage(creator, "UID", 8) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -1873,7 +1911,8 @@ struct IRCDMessageUID : IRCDMessage
 	}
 };
 
-class ProtoInspIRCd : public Module
+class ProtoInspIRCd
+	: public Module
 {
 	InspIRCdProto ircd_proto;
 	ExtensibleItem<bool> ssl;
diff --git a/modules/protocol/ngircd.cpp b/modules/protocol/ngircd.cpp
index bb280db46..587185e42 100644
--- a/modules/protocol/ngircd.cpp
+++ b/modules/protocol/ngircd.cpp
@@ -11,7 +11,8 @@
 
 #include "module.h"
 
-class ngIRCdProto : public IRCDProto
+class ngIRCdProto
+	: public IRCDProto
 {
 	void SendSVSKillInternal(const MessageSource &source, User *user, const Anope::string &buf) override
 	{
@@ -146,7 +147,8 @@ public:
 	}
 };
 
-struct IRCDMessage005 : IRCDMessage
+struct IRCDMessage005
+	: IRCDMessage
 {
 	IRCDMessage005(Module *creator) : IRCDMessage(creator, "005", 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -180,7 +182,8 @@ struct IRCDMessage005 : IRCDMessage
 	}
 };
 
-struct IRCDMessage376 : IRCDMessage
+struct IRCDMessage376
+	: IRCDMessage
 {
 	IRCDMessage376(Module *creator) : IRCDMessage(creator, "376", 2) { }
 
@@ -197,7 +200,8 @@ struct IRCDMessage376 : IRCDMessage
 	}
 };
 
-struct IRCDMessageChaninfo : IRCDMessage
+struct IRCDMessageChaninfo
+	: IRCDMessage
 {
 	IRCDMessageChaninfo(Module *creator) : IRCDMessage(creator, "CHANINFO", 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -250,7 +254,8 @@ struct IRCDMessageChaninfo : IRCDMessage
 	}
 };
 
-struct IRCDMessageJoin : Message::Join
+struct IRCDMessageJoin
+	: Message::Join
 {
 	IRCDMessageJoin(Module *creator) : Message::Join(creator, "JOIN") { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
@@ -290,7 +295,8 @@ struct IRCDMessageJoin : Message::Join
 	}
 };
 
-struct IRCDMessageMetadata : IRCDMessage
+struct IRCDMessageMetadata
+	: IRCDMessage
 {
 	IRCDMessageMetadata(Module *creator) : IRCDMessage(creator, "METADATA", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -349,7 +355,8 @@ struct IRCDMessageMetadata : IRCDMessage
 	}
 };
 
-struct IRCDMessageMode : IRCDMessage
+struct IRCDMessageMode
+	: IRCDMessage
 {
 	IRCDMessageMode(Module *creator) : IRCDMessage(creator, "MODE", 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -385,7 +392,8 @@ struct IRCDMessageMode : IRCDMessage
 	}
 };
 
-struct IRCDMessageNick : IRCDMessage
+struct IRCDMessageNick
+	: IRCDMessage
 {
 	IRCDMessageNick(Module *creator) : IRCDMessage(creator, "NICK", 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -437,7 +445,8 @@ struct IRCDMessageNick : IRCDMessage
 	}
 };
 
-struct IRCDMessageNJoin : IRCDMessage
+struct IRCDMessageNJoin
+	: IRCDMessage
 {
 	IRCDMessageNJoin(Module *creator) : IRCDMessage(creator, "NJOIN",2) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); };
 
@@ -483,7 +492,8 @@ struct IRCDMessageNJoin : IRCDMessage
 	}
 };
 
-struct IRCDMessagePong : IRCDMessage
+struct IRCDMessagePong
+	: IRCDMessage
 {
 	IRCDMessagePong(Module *creator) : IRCDMessage(creator, "PONG", 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -499,7 +509,8 @@ struct IRCDMessagePong : IRCDMessage
 	}
 };
 
-struct IRCDMessageServer : IRCDMessage
+struct IRCDMessageServer
+	: IRCDMessage
 {
 	IRCDMessageServer(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -550,7 +561,8 @@ struct IRCDMessageServer : IRCDMessage
 	}
 };
 
-struct IRCDMessageTopic : IRCDMessage
+struct IRCDMessageTopic
+	: IRCDMessage
 {
 	IRCDMessageTopic(Module *creator) : IRCDMessage(creator, "TOPIC", 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -569,7 +581,8 @@ struct IRCDMessageTopic : IRCDMessage
 
 
 
-class ProtongIRCd : public Module
+class ProtongIRCd
+	: public Module
 {
 	ngIRCdProto ircd_proto;
 
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp
index 8eedc2445..eb98f8f9c 100644
--- a/modules/protocol/plexus.cpp
+++ b/modules/protocol/plexus.cpp
@@ -16,7 +16,8 @@ static Anope::string UplinkSID;
 
 static ServiceReference<IRCDProto> hybrid("IRCDProto", "hybrid");
 
-class PlexusProto : public IRCDProto
+class PlexusProto
+	: public IRCDProto
 {
 public:
 	PlexusProto(Module *creator) : IRCDProto(creator, "hybrid-7.2.3+plexus-3.0.1")
@@ -187,7 +188,8 @@ public:
 	}
 };
 
-struct IRCDMessageEncap : IRCDMessage
+struct IRCDMessageEncap
+	: IRCDMessage
 {
 	IRCDMessageEncap(Module *creator) : IRCDMessage(creator, "ENCAP", 4) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -243,7 +245,8 @@ struct IRCDMessageEncap : IRCDMessage
 	}
 };
 
-struct IRCDMessagePass : IRCDMessage
+struct IRCDMessagePass
+	: IRCDMessage
 {
 	IRCDMessagePass(Module *creator) : IRCDMessage(creator, "PASS", 4) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -253,7 +256,8 @@ struct IRCDMessagePass : IRCDMessage
 	}
 };
 
-struct IRCDMessageServer : IRCDMessage
+struct IRCDMessageServer
+	: IRCDMessage
 {
 	IRCDMessageServer(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -269,7 +273,8 @@ struct IRCDMessageServer : IRCDMessage
 	}
 };
 
-struct IRCDMessageUID : IRCDMessage
+struct IRCDMessageUID
+	: IRCDMessage
 {
 	IRCDMessageUID(Module *creator) : IRCDMessage(creator, "UID", 11) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -318,7 +323,8 @@ struct IRCDMessageUID : IRCDMessage
 	}
 };
 
-class ProtoPlexus : public Module
+class ProtoPlexus
+	: public Module
 {
 	Module *m_hybrid;
 
diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp
index c7f4c0dad..9ba815c4d 100644
--- a/modules/protocol/ratbox.cpp
+++ b/modules/protocol/ratbox.cpp
@@ -15,7 +15,8 @@ static Anope::string UplinkSID;
 
 static ServiceReference<IRCDProto> hybrid("IRCDProto", "hybrid");
 
-class RatboxProto : public IRCDProto
+class RatboxProto
+	: public IRCDProto
 {
 	BotInfo *FindIntroduced()
 	{
@@ -140,7 +141,8 @@ public:
 	}
 };
 
-struct IRCDMessageEncap : IRCDMessage
+struct IRCDMessageEncap
+	: IRCDMessage
 {
 	IRCDMessageEncap(Module *creator) : IRCDMessage(creator, "ENCAP", 3) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
@@ -165,7 +167,8 @@ struct IRCDMessageEncap : IRCDMessage
 	}
 };
 
-struct IRCDMessageJoin : Message::Join
+struct IRCDMessageJoin
+	: Message::Join
 {
 	IRCDMessageJoin(Module *creator) : Message::Join(creator, "JOIN") { }
 
@@ -184,7 +187,8 @@ struct IRCDMessageJoin : Message::Join
 	}
 };
 
-struct IRCDMessagePass : IRCDMessage
+struct IRCDMessagePass
+	: IRCDMessage
 {
 	IRCDMessagePass(Module *creator) : IRCDMessage(creator, "PASS", 4) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -194,7 +198,8 @@ struct IRCDMessagePass : IRCDMessage
 	}
 };
 
-struct IRCDMessageServer : IRCDMessage
+struct IRCDMessageServer
+	: IRCDMessage
 {
 	IRCDMessageServer(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -209,7 +214,8 @@ struct IRCDMessageServer : IRCDMessage
 	}
 };
 
-struct IRCDMessageTBurst : IRCDMessage
+struct IRCDMessageTBurst
+	: IRCDMessage
 {
 	IRCDMessageTBurst(Module *creator) : IRCDMessage(creator, "TB", 3) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -234,7 +240,8 @@ struct IRCDMessageTBurst : IRCDMessage
 	}
 };
 
-struct IRCDMessageUID : IRCDMessage
+struct IRCDMessageUID
+	: IRCDMessage
 {
 	IRCDMessageUID(Module *creator) : IRCDMessage(creator, "UID", 9) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -246,7 +253,8 @@ struct IRCDMessageUID : IRCDMessage
 	}
 };
 
-class ProtoRatbox : public Module
+class ProtoRatbox
+	: public Module
 {
 	Module *m_hybrid;
 
diff --git a/modules/protocol/solanum.cpp b/modules/protocol/solanum.cpp
index 56e87336c..763173342 100644
--- a/modules/protocol/solanum.cpp
+++ b/modules/protocol/solanum.cpp
@@ -17,7 +17,8 @@ static Anope::string UplinkSID;
 
 static ServiceReference<IRCDProto> ratbox("IRCDProto", "ratbox");
 
-class ChannelModeLargeBan : public ChannelMode
+class ChannelModeLargeBan
+	: public ChannelMode
 {
 public:
 	ChannelModeLargeBan(const Anope::string &mname, char modeChar) : ChannelMode(mname, modeChar) { }
@@ -29,7 +30,8 @@ public:
 };
 
 
-class SolanumProto : public IRCDProto
+class SolanumProto
+	: public IRCDProto
 {
 public:
 
@@ -170,7 +172,8 @@ public:
 };
 
 
-struct IRCDMessageEncap : IRCDMessage
+struct IRCDMessageEncap
+	: IRCDMessage
 {
 	IRCDMessageEncap(Module *creator) : IRCDMessage(creator, "ENCAP", 3)
 	{
@@ -226,7 +229,8 @@ struct IRCDMessageEncap : IRCDMessage
 	}
 };
 
-struct IRCDMessageEUID : IRCDMessage
+struct IRCDMessageEUID
+	: IRCDMessage
 {
 	IRCDMessageEUID(Module *creator) : IRCDMessage(creator, "EUID", 11) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -254,7 +258,8 @@ struct IRCDMessageEUID : IRCDMessage
 };
 
 // we can't use this function from ratbox because we set a local variable here
-struct IRCDMessageServer : IRCDMessage
+struct IRCDMessageServer
+	: IRCDMessage
 {
 	IRCDMessageServer(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -270,7 +275,8 @@ struct IRCDMessageServer : IRCDMessage
 };
 
 // we can't use this function from ratbox because we set a local variable here
-struct IRCDMessagePass : IRCDMessage
+struct IRCDMessagePass
+	: IRCDMessage
 {
 	IRCDMessagePass(Module *creator) : IRCDMessage(creator, "PASS", 4) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -281,7 +287,8 @@ struct IRCDMessagePass : IRCDMessage
 	}
 };
 
-struct IRCDMessageNotice : Message::Notice
+struct IRCDMessageNotice
+	: Message::Notice
 {
 	IRCDMessageNotice(Module *creator) : Message::Notice(creator) { }
 
@@ -294,7 +301,8 @@ struct IRCDMessageNotice : Message::Notice
 	}
 };
 
-struct IRCDMessagePrivmsg : Message::Privmsg
+struct IRCDMessagePrivmsg
+	: Message::Privmsg
 {
 	IRCDMessagePrivmsg(Module *creator) : Message::Privmsg(creator) { }
 
@@ -307,7 +315,8 @@ struct IRCDMessagePrivmsg : Message::Privmsg
 	}
 };
 
-class ProtoSolanum : public Module
+class ProtoSolanum
+	: public Module
 {
 	Module *m_ratbox;
 
diff --git a/modules/protocol/unrealircd.cpp b/modules/protocol/unrealircd.cpp
index 30591761e..0cf472e21 100644
--- a/modules/protocol/unrealircd.cpp
+++ b/modules/protocol/unrealircd.cpp
@@ -16,7 +16,8 @@
 typedef Anope::map<Anope::string> ModData;
 static Anope::string UplinkSID;
 
-class UnrealIRCdProto : public IRCDProto
+class UnrealIRCdProto
+	: public IRCDProto
 {
 public:
 	PrimitiveExtensibleItem<ModData> ClientModData;
@@ -432,7 +433,8 @@ private:
 	}
 };
 
-class UnrealExtBan : public ChannelModeVirtual<ChannelModeList>
+class UnrealExtBan
+	: public ChannelModeVirtual<ChannelModeList>
 {
 	char ext;
 
@@ -460,7 +462,8 @@ public:
 
 namespace UnrealExtban
 {
-	class ChannelMatcher : public UnrealExtBan
+	class ChannelMatcher
+		: public UnrealExtBan
 	{
 	public:
 		ChannelMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
@@ -495,7 +498,8 @@ namespace UnrealExtban
 		}
 	};
 
-	class EntryMatcher : public UnrealExtBan
+	class EntryMatcher
+		: public UnrealExtBan
 	{
 	public:
 		EntryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
@@ -511,7 +515,8 @@ namespace UnrealExtban
 		}
 	};
 
-	class RealnameMatcher : public UnrealExtBan
+	class RealnameMatcher
+		: public UnrealExtBan
 	{
 	public:
 		RealnameMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
@@ -527,7 +532,8 @@ namespace UnrealExtban
 		}
 	};
 
-	class RegisteredMatcher : public UnrealExtBan
+	class RegisteredMatcher
+		: public UnrealExtBan
 	{
 	public:
 		RegisteredMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
@@ -541,7 +547,8 @@ namespace UnrealExtban
 		}
 	};
 
-	class AccountMatcher : public UnrealExtBan
+	class AccountMatcher
+		: public UnrealExtBan
 	{
 	public:
 		AccountMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
@@ -560,7 +567,8 @@ namespace UnrealExtban
 		}
 	};
 
-	class FingerprintMatcher : public UnrealExtBan
+	class FingerprintMatcher
+		: public UnrealExtBan
 	{
 	public:
 		FingerprintMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
@@ -575,7 +583,8 @@ namespace UnrealExtban
 		}
 	};
 
-	class OperclassMatcher : public UnrealExtBan
+	class OperclassMatcher
+		: public UnrealExtBan
 	{
 	public:
 	 	OperclassMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
@@ -591,7 +600,8 @@ namespace UnrealExtban
 		}
 	};
 
-	class TimedBanMatcher : public UnrealExtBan
+	class TimedBanMatcher
+		: public UnrealExtBan
 	{
 	public:
 	 	TimedBanMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
@@ -608,7 +618,8 @@ namespace UnrealExtban
 		}
 	};
 
-	class CountryMatcher : public UnrealExtBan
+	class CountryMatcher
+		: public UnrealExtBan
 	{
 	public:
 	 	CountryMatcher(const Anope::string &mname, const Anope::string &mbase, char c) : UnrealExtBan(mname, mbase, c)
@@ -635,7 +646,8 @@ namespace UnrealExtban
 	};
 }
 
-class ChannelModeFlood : public ChannelModeParam
+class ChannelModeFlood
+	: public ChannelModeParam
 {
 public:
 	ChannelModeFlood(char modeChar, bool minusNoArg) : ChannelModeParam("FLOOD", modeChar, minusNoArg) { }
@@ -686,7 +698,8 @@ public:
 	}
 };
 
-class ChannelModeHistory : public ChannelModeParam /* stolen from inspircd3's ColonDelimitedParamMode */
+class ChannelModeHistory
+	: public ChannelModeParam
 {
 public:
 	ChannelModeHistory(char modeChar) : ChannelModeParam("HISTORY", modeChar, true) { }
@@ -725,7 +738,8 @@ public:
 	}
 };
 
-class ChannelModeUnrealSSL : public ChannelMode
+class ChannelModeUnrealSSL
+	: public ChannelMode
 {
 public:
 	ChannelModeUnrealSSL(const Anope::string &n, char c) : ChannelMode(n, c)
@@ -738,7 +752,8 @@ public:
 	}
 };
 
-struct IRCDMessageCapab : Message::Capab
+struct IRCDMessageCapab
+	: Message::Capab
 {
 	IRCDMessageCapab(Module *creator) : Message::Capab(creator, "PROTOCTL") { }
 
@@ -1021,7 +1036,8 @@ struct IRCDMessageCapab : Message::Capab
 	}
 };
 
-struct IRCDMessageChgHost : IRCDMessage
+struct IRCDMessageChgHost
+	: IRCDMessage
 {
 	IRCDMessageChgHost(Module *creator) : IRCDMessage(creator, "CHGHOST", 2) { }
 
@@ -1033,7 +1049,8 @@ struct IRCDMessageChgHost : IRCDMessage
 	}
 };
 
-struct IRCDMessageChgIdent : IRCDMessage
+struct IRCDMessageChgIdent
+	: IRCDMessage
 {
 	IRCDMessageChgIdent(Module *creator) : IRCDMessage(creator, "CHGIDENT", 2) { }
 
@@ -1045,7 +1062,8 @@ struct IRCDMessageChgIdent : IRCDMessage
 	}
 };
 
-struct IRCDMessageChgName : IRCDMessage
+struct IRCDMessageChgName
+	: IRCDMessage
 {
 	IRCDMessageChgName(Module *creator) : IRCDMessage(creator, "CHGNAME", 2) { }
 
@@ -1057,7 +1075,8 @@ struct IRCDMessageChgName : IRCDMessage
 	}
 };
 
-struct IRCDMessageMD : IRCDMessage
+struct IRCDMessageMD
+	: IRCDMessage
 {
 	PrimitiveExtensibleItem<ModData> &ClientModData;
 	PrimitiveExtensibleItem<ModData> &ChannelModData;
@@ -1123,7 +1142,8 @@ struct IRCDMessageMD : IRCDMessage
 	}
 };
 
-struct IRCDMessageMode : IRCDMessage
+struct IRCDMessageMode
+	: IRCDMessage
 {
 	IRCDMessageMode(Module *creator, const Anope::string &mname) : IRCDMessage(creator, mname, 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -1168,7 +1188,8 @@ struct IRCDMessageMode : IRCDMessage
  *  argv[6] = free(**)
  *  argv[7] = ircnet
  */
-struct IRCDMessageNetInfo : IRCDMessage
+struct IRCDMessageNetInfo
+	: IRCDMessage
 {
 	IRCDMessageNetInfo(Module *creator) : IRCDMessage(creator, "NETINFO", 8) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -1178,7 +1199,8 @@ struct IRCDMessageNetInfo : IRCDMessage
 	}
 };
 
-struct IRCDMessageNick : IRCDMessage
+struct IRCDMessageNick
+	: IRCDMessage
 {
 	IRCDMessageNick(Module *creator) : IRCDMessage(creator, "NICK", 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -1264,7 +1286,8 @@ struct IRCDMessageNick : IRCDMessage
  * with their server "not syncing". We now send a PING immediately when receiving a new server
  * and then finish sync once we get a pong back from that server.
  */
-struct IRCDMessagePong : IRCDMessage
+struct IRCDMessagePong
+	: IRCDMessage
 {
 	IRCDMessagePong(Module *creator) : IRCDMessage(creator, "PONG", 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -1275,7 +1298,8 @@ struct IRCDMessagePong : IRCDMessage
 	}
 };
 
-struct IRCDMessageSASL : IRCDMessage
+struct IRCDMessageSASL
+	: IRCDMessage
 {
 	IRCDMessageSASL(Module *creator) : IRCDMessage(creator, "SASL", 4) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -1295,7 +1319,8 @@ struct IRCDMessageSASL : IRCDMessage
 	}
 };
 
-struct IRCDMessageSDesc : IRCDMessage
+struct IRCDMessageSDesc
+	: IRCDMessage
 {
 	IRCDMessageSDesc(Module *creator) : IRCDMessage(creator, "SDESC", 1) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -1305,7 +1330,8 @@ struct IRCDMessageSDesc : IRCDMessage
 	}
 };
 
-struct IRCDMessageSetHost : IRCDMessage
+struct IRCDMessageSetHost
+	: IRCDMessage
 {
 	IRCDMessageSetHost(Module *creator) : IRCDMessage(creator, "SETHOST", 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
@@ -1321,7 +1347,8 @@ struct IRCDMessageSetHost : IRCDMessage
 	}
 };
 
-struct IRCDMessageSetIdent : IRCDMessage
+struct IRCDMessageSetIdent
+	: IRCDMessage
 {
 	IRCDMessageSetIdent(Module *creator) : IRCDMessage(creator, "SETIDENT", 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
@@ -1332,7 +1359,8 @@ struct IRCDMessageSetIdent : IRCDMessage
 	}
 };
 
-struct IRCDMessageSetName : IRCDMessage
+struct IRCDMessageSetName
+	: IRCDMessage
 {
 	IRCDMessageSetName(Module *creator) : IRCDMessage(creator, "SETNAME", 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
@@ -1343,7 +1371,8 @@ struct IRCDMessageSetName : IRCDMessage
 	}
 };
 
-struct IRCDMessageServer : IRCDMessage
+struct IRCDMessageServer
+	: IRCDMessage
 {
 	IRCDMessageServer(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -1365,7 +1394,8 @@ struct IRCDMessageServer : IRCDMessage
 	}
 };
 
-struct IRCDMessageSID : IRCDMessage
+struct IRCDMessageSID
+	: IRCDMessage
 {
 	IRCDMessageSID(Module *creator) : IRCDMessage(creator, "SID", 4) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -1392,7 +1422,8 @@ static char UnrealSjoinPrefixToModeChar(char sjoin_prefix)
 	}
 }
 
-struct IRCDMessageSJoin : IRCDMessage
+struct IRCDMessageSJoin
+	: IRCDMessage
 {
 	IRCDMessageSJoin(Module *creator) : IRCDMessage(creator, "SJOIN", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
@@ -1485,7 +1516,8 @@ struct IRCDMessageSJoin : IRCDMessage
 	}
 };
 
-class IRCDMessageSVSLogin : IRCDMessage
+class IRCDMessageSVSLogin
+	: IRCDMessage
 {
 public:
 	IRCDMessageSVSLogin(Module *creator) : IRCDMessage(creator, "SVSLOGIN", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
@@ -1514,7 +1546,8 @@ public:
 	}
 };
 
-struct IRCDMessageTopic : IRCDMessage
+struct IRCDMessageTopic
+	: IRCDMessage
 {
 	IRCDMessageTopic(Module *creator) : IRCDMessage(creator, "TOPIC", 4) { }
 
@@ -1547,7 +1580,8 @@ struct IRCDMessageTopic : IRCDMessage
  *      parv[10] = ip
  *      parv[11] = info
  */
-struct IRCDMessageUID : IRCDMessage
+struct IRCDMessageUID
+	: IRCDMessage
 {
 	IRCDMessageUID(Module *creator) : IRCDMessage(creator, "UID", 12) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
@@ -1616,7 +1650,8 @@ struct IRCDMessageUID : IRCDMessage
 	}
 };
 
-struct IRCDMessageUmode2 : IRCDMessage
+struct IRCDMessageUmode2
+	: IRCDMessage
 {
 	IRCDMessageUmode2(Module *creator) : IRCDMessage(creator, "UMODE2", 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
@@ -1626,7 +1661,8 @@ struct IRCDMessageUmode2 : IRCDMessage
 	}
 };
 
-class ProtoUnreal : public Module
+class ProtoUnreal
+	: public Module
 {
 	UnrealIRCdProto ircd_proto;