Add ExtensibleType argument to ExtensionItem to identify item types

41 files changed, 57 insertions, 52 deletions

diff --git a/src/base.cpp b/src/base.cpp
index a3bdb95bd..e0581402d 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -97,7 +97,8 @@ ServiceProvider::~ServiceProvider()
 {
 }
 
-ExtensionItem::ExtensionItem(const std::string& Key, Module* mod) : ServiceProvider(mod, Key, SERVICE_METADATA)
+ExtensionItem::ExtensionItem(ExtensibleType type, const std::string& Key, Module* mod)
+	: ServiceProvider(mod, Key, SERVICE_METADATA), type_id(type)
 {
 }
 
@@ -184,11 +185,11 @@ void Extensible::doUnhookExtensions(const std::vector<reference<ExtensionItem> >
 
 static struct DummyExtensionItem : LocalExtItem
 {
-	DummyExtensionItem() : LocalExtItem("", NULL) {}
+	DummyExtensionItem() : LocalExtItem(EXTENSIBLE_NONE, "", NULL) {}
 	void free(void*) {}
 } dummy;
 
-Extensible::Extensible(ExtType Type) : type_id(Type)
+Extensible::Extensible(ExtensibleType Type) : type_id(Type)
 {
 	extensions[&dummy] = NULL;
 }
@@ -210,7 +211,8 @@ Extensible::~Extensible()
 			"Extensible destructor called without cull @%p", (void*)this);
 }
 
-LocalExtItem::LocalExtItem(const std::string& Key, Module* mod) : ExtensionItem(Key, mod)
+LocalExtItem::LocalExtItem(ExtensibleType type, const std::string& Key, Module* mod)
+	: ExtensionItem(type, Key, mod)
 {
 }
 
@@ -227,8 +229,8 @@ void LocalExtItem::unserialize(SerializeFormat format, Extensible* container, co
 {
 }
 
-LocalStringExt::LocalStringExt(const std::string& Key, Module* Owner)
-	: SimpleExtItem<std::string>(Key, Owner) { }
+LocalStringExt::LocalStringExt(ExtensibleType type, const std::string& Key, Module* Owner)
+	: SimpleExtItem<std::string>(type, Key, Owner) { }
 
 LocalStringExt::~LocalStringExt()
 {
@@ -241,7 +243,8 @@ std::string LocalStringExt::serialize(SerializeFormat format, const Extensible*
 	return "";
 }
 
-LocalIntExt::LocalIntExt(const std::string& Key, Module* mod) : LocalExtItem(Key, mod)
+LocalIntExt::LocalIntExt(ExtensibleType type, const std::string& Key, Module* mod)
+	: LocalExtItem(type, Key, mod)
 {
 }
 
@@ -273,7 +276,8 @@ void LocalIntExt::free(void*)
 {
 }
 
-StringExtItem::StringExtItem(const std::string& Key, Module* mod) : ExtensionItem(Key, mod)
+StringExtItem::StringExtItem(ExtensibleType type, const std::string& Key, Module* mod)
+	: ExtensionItem(type, Key, mod)
 {
 }
 
diff --git a/src/channels.cpp b/src/channels.cpp
index 89350177a..ffa69ffe0 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -16,7 +16,7 @@
 #include "mode.h"
 
 Channel::Channel(const std::string &cname, time_t ts)
-	: Extensible(Extensible::CHANNEL), name(cname), age(ts)
+	: Extensible(EXTENSIBLE_CHANNEL), name(cname), age(ts)
 {
 	if (!age)
 		throw CoreException("Cannot create channel with zero timestamp");
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 83d254fb1..de984265c 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -290,10 +290,10 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	  * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods
 	  * themselves within the class.
 	  */
-	 NICKForced("NICKForced", NULL),
-	 RedirectJoin("RedirectJoin", NULL),
-	 ForcedClass("ForcedClass", NULL),
-	 OperQuit("OperQuit", NULL),
+	 NICKForced(EXTENSIBLE_USER, "NICKForced", NULL),
+	 RedirectJoin(EXTENSIBLE_USER, "RedirectJoin", NULL),
+	 ForcedClass(EXTENSIBLE_USER, "ForcedClass", NULL),
+	 OperQuit(EXTENSIBLE_USER, "OperQuit", NULL),
 	 GenRandom(&HandleGenRandom),
 	 IsChannel(&HandleIsChannel),
 	 IsNick(&HandleIsNick),
diff --git a/src/modules/extra/m_geoip.cpp b/src/modules/extra/m_geoip.cpp
index c46908470..c3d941c42 100644
--- a/src/modules/extra/m_geoip.cpp
+++ b/src/modules/extra/m_geoip.cpp
@@ -25,7 +25,7 @@ class ModuleGeoIP : public Module
 	GeoIP* gi;
 
  public:
-	ModuleGeoIP() : ext("geoip_cc", this)
+	ModuleGeoIP() : ext(EXTENSIBLE_USER, "geoip_cc", this)
 	{
 		gi = GeoIP_new(GEOIP_STANDARD);
 	}
diff --git a/src/modules/extra/m_ldapauth.cpp b/src/modules/extra/m_ldapauth.cpp
index a36e75db3..23c5a5d82 100644
--- a/src/modules/extra/m_ldapauth.cpp
+++ b/src/modules/extra/m_ldapauth.cpp
@@ -47,7 +47,7 @@ class ModuleLDAPAuth : public Module
 	dynamic_reference<AccountProvider> acctprov;
 
 public:
-	ModuleLDAPAuth() : ldapAuthed("ldapauth", this), acctprov("account")
+	ModuleLDAPAuth() : ldapAuthed(EXTENSIBLE_USER, "ldapauth", this), acctprov("account")
 	{
 		conn = NULL;
 	}
diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 8b53d8f79..618567650 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -39,7 +39,7 @@ class BanRedirect : public ModeWatcher
  public:
 	SimpleExtItem<BanRedirectList> extItem;
 	BanRedirect(Module* parent) : ModeWatcher(parent, 'b', MODETYPE_CHANNEL),
-		extItem("banredirect", parent)
+		extItem(EXTENSIBLE_CHANNEL, "banredirect", parent)
 	{
 	}
 
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index e7c07810c..770a19a3c 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -45,7 +45,7 @@ class ModuleBlockAmsg : public Module
 	SimpleExtItem<BlockedMessage> blockamsg;
 
  public:
-	ModuleBlockAmsg() : blockamsg("blockamsg", this)
+	ModuleBlockAmsg() : blockamsg(EXTENSIBLE_USER, "blockamsg", this)
 	{
 	}
 
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index e276e6891..9f0bc3114 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -73,7 +73,7 @@ class callerid_data
 struct CallerIDExtInfo : public ExtensionItem
 {
 	CallerIDExtInfo(Module* parent)
-		: ExtensionItem("callerid_data", parent)
+		: ExtensionItem(EXTENSIBLE_USER, "callerid_data", parent)
 	{
 	}
 
diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index be35f3d22..af6e94601 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -37,7 +37,7 @@ class CommandCAP : public Command
  public:
 	LocalIntExt reghold;
 	CommandCAP (Module* mod) : Command(mod, "CAP", 1),
-		reghold("CAP_REGHOLD", mod)
+		reghold(EXTENSIBLE_USER, "CAP_REGHOLD", mod)
 	{
 		works_before_reg = true;
 	}
diff --git a/src/modules/m_cap.h b/src/modules/m_cap.h
index d2d094c85..f0af0ca11 100644
--- a/src/modules/m_cap.h
+++ b/src/modules/m_cap.h
@@ -33,7 +33,7 @@ class GenericCap
  public:
 	LocalIntExt ext;
 	const std::string cap;
-	GenericCap(Module* parent, const std::string &Cap) : ext("cap_" + Cap, parent), cap(Cap)
+	GenericCap(Module* parent, const std::string &Cap) : ext(EXTENSIBLE_USER, "cap_" + Cap, parent), cap(Cap)
 	{
 		ServerInstance->Extensions.Register(&ext);
 	}
diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 4b46bfb0b..bbd025b57 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -27,7 +27,7 @@ struct CGIData {
 class CGIExtItem : public SimpleExtItem<CGIData>
 {
  public:
-	CGIExtItem(Module* parent) : SimpleExtItem<CGIData>("cgiirc", parent) {}
+	CGIExtItem(Module* parent) : SimpleExtItem<CGIData>(EXTENSIBLE_USER, "cgiirc", parent) {}
 	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const
 	{
 		CGIData* d = static_cast<CGIData*>(item);
@@ -180,7 +180,7 @@ class ModuleCgiIRC : public Module
 	CommandWebirc cmd;
 	LocalIntExt waiting;
 public:
-	ModuleCgiIRC() : cmd(this), waiting("cgiirc-delay", this)
+	ModuleCgiIRC() : cmd(this), waiting(EXTENSIBLE_USER, "cgiirc-delay", this)
 	{
 	}
 
diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 54c3a461b..6fedab024 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -35,7 +35,7 @@ class HistoryMode : public ModeHandler
 	SimpleExtItem<HistoryList> ext;
 	int maxlines;
 	HistoryMode(Module* Creator) : ModeHandler(Creator, "history", 'H', PARAM_SETONLY, MODETYPE_CHANNEL),
-		ext("history", Creator) { fixed_letter = false; }
+		ext(EXTENSIBLE_CHANNEL, "history", Creator) { fixed_letter = false; }
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
diff --git a/src/modules/m_chanregister.cpp b/src/modules/m_chanregister.cpp
index 584f01eb4..20aba4a7e 100644
--- a/src/modules/m_chanregister.cpp
+++ b/src/modules/m_chanregister.cpp
@@ -21,7 +21,7 @@
 class ChanExpiryExtItem : public ExtensionItem
 {
 	public:
-	ChanExpiryExtItem (Module *owner) : ExtensionItem ("last_activity", owner)
+	ChanExpiryExtItem (Module *owner) : ExtensionItem (EXTENSIBLE_CHANNEL, "last_activity", owner)
 	{
 
 	}
diff --git a/src/modules/m_cloaking_12.cpp b/src/modules/m_cloaking_12.cpp
index a6fa97cc7..ba09f7ef6 100644
--- a/src/modules/m_cloaking_12.cpp
+++ b/src/modules/m_cloaking_12.cpp
@@ -40,7 +40,7 @@ class CloakUser : public ModeHandler
 
 	CloakUser(Module* source)
 		: ModeHandler(source, "cloak_12", 'x', PARAM_NONE, MODETYPE_USER),
-		ext("cloaked_host", source), debounce_ts(0), debounce_count(0)
+		ext(EXTENSIBLE_USER, "cloaked_host", source), debounce_ts(0), debounce_count(0)
 	{
 	}
 
diff --git a/src/modules/m_cloaking_20.cpp b/src/modules/m_cloaking_20.cpp
index 9f33df4b8..50959cf40 100644
--- a/src/modules/m_cloaking_20.cpp
+++ b/src/modules/m_cloaking_20.cpp
@@ -43,7 +43,7 @@ class CloakUser : public ModeHandler
 
 	CloakUser(Module* source)
 		: ModeHandler(source, "cloak", 'x', PARAM_NONE, MODETYPE_USER),
-		ext("cloaked_host", source), debounce_ts(0), debounce_count(0)
+		ext(EXTENSIBLE_USER, "cloaked_host", source), debounce_ts(0), debounce_count(0)
 	{
 	}
 
diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index e213abb5c..838715b41 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -23,7 +23,7 @@ class ModuleWaitPong : public Module
 
  public:
 	ModuleWaitPong()
-	 : ext("waitpong_pingstr", this)
+	 : ext(EXTENSIBLE_USER, "waitpong_pingstr", this)
 	{
 	}
 
diff --git a/src/modules/m_customtitle.cpp b/src/modules/m_customtitle.cpp
index 56fa84470..3ebcf17e6 100644
--- a/src/modules/m_customtitle.cpp
+++ b/src/modules/m_customtitle.cpp
@@ -22,7 +22,7 @@ class CommandTitle : public Command
  public:
 	StringExtItem ctitle;
 	CommandTitle(Module* Creator) : Command(Creator,"TITLE", 2),
-		ctitle("ctitle", Creator)
+		ctitle(EXTENSIBLE_USER, "ctitle", Creator)
 	{
 		syntax = "<user> <password>";
 		TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 17b2acaf2..6138b792a 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -244,7 +244,7 @@ class ModuleDCCAllow : public Module
 
 	void init()
 	{
-		ext = new SimpleExtItem<dccallowlist>("dccallow", this);
+		ext = new SimpleExtItem<dccallowlist>(EXTENSIBLE_USER, "dccallow", this);
 		ServerInstance->Extensions.Register(ext);
 		ServerInstance->AddCommand(&cmd);
 		ReadFileConf();
diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 8a9ca1707..1a3dc95e4 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -33,7 +33,7 @@ class ModuleDelayJoin : public Module
 	DelayJoinMode djm;
  public:
 	LocalIntExt unjoined;
-	ModuleDelayJoin() : djm(this), unjoined("delayjoin", this) {}
+	ModuleDelayJoin() : djm(this), unjoined(EXTENSIBLE_MEMBERSHIP, "delayjoin", this) {}
 
 	void init()
 	{
diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index 53aff79b6..fbc0d85ad 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -23,7 +23,7 @@ class DelayMsgMode : public ModeHandler
  public:
 	LocalIntExt jointime;
 	DelayMsgMode(Module* Parent) : ModeHandler(Parent, "delaymsg", 'd', PARAM_SETONLY, MODETYPE_CHANNEL)
-		, jointime("delaymsg", Parent)
+		, jointime(EXTENSIBLE_MEMBERSHIP, "delaymsg", Parent)
 	{
 		levelrequired = OP_VALUE;
 		fixed_letter = false;
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 75b34f544..638335d43 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -226,7 +226,7 @@ class ModuleDNSBL : public Module
 		return DNSBLConfEntry::I_UNKNOWN;
 	}
  public:
-	ModuleDNSBL() : nameExt("dnsbl_match", this), countExt("dnsbl_pending", this) { }
+	ModuleDNSBL() : nameExt(EXTENSIBLE_USER, "dnsbl_match", this), countExt(EXTENSIBLE_USER, "dnsbl_pending", this) { }
 
 	void init()
 	{
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index ec37fb936..60741a166 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -266,7 +266,7 @@ class ModuleIdent : public Module
 	int RequestTimeout;
 	SimpleExtItem<IdentRequestSocket> ext;
  public:
-	ModuleIdent() : ext("ident_socket", this) {}
+	ModuleIdent() : ext(EXTENSIBLE_USER, "ident_socket", this) {}
 
 	void init()
 	{
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index c672eba98..a406cfe09 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -86,7 +86,7 @@ class JoinFlood : public ModeHandler
  public:
 	SimpleExtItem<joinfloodsettings> ext;
 	JoinFlood(Module* Creator) : ModeHandler(Creator, "joinflood", 'j', PARAM_SETONLY, MODETYPE_CHANNEL),
-		ext("joinflood", Creator) { fixed_letter = false; }
+		ext(EXTENSIBLE_CHANNEL, "joinflood", Creator) { fixed_letter = false; }
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 8b0df9732..c62cd76d9 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -23,7 +23,7 @@ class KickRejoin : public ParamChannelModeHandler
 {
  public:
 	SimpleExtItem<delaylist> ext;
-	KickRejoin(Module* Creator) : ParamChannelModeHandler(Creator, "kicknorejoin", 'J'), ext("norejoinusers", Creator)
+	KickRejoin(Module* Creator) : ParamChannelModeHandler(Creator, "kicknorejoin", 'J'), ext(EXTENSIBLE_CHANNEL, "norejoinusers", Creator)
 	{
 		fixed_letter = false;
 	}
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 48e070b9d..fc30bccfe 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -76,7 +76,7 @@ class MsgFlood : public ModeHandler
  public:
 	SimpleExtItem<floodsettings> ext;
 	MsgFlood(Module* Creator) : ModeHandler(Creator, "flood", 'f', PARAM_SETONLY, MODETYPE_CHANNEL),
-		ext("messageflood", Creator) { fixed_letter = false; }
+		ext(EXTENSIBLE_CHANNEL, "messageflood", Creator) { fixed_letter = false; }
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index a1859bf5c..060759137 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -90,7 +90,7 @@ class NickFlood : public ModeHandler
  public:
 	SimpleExtItem<nickfloodsettings> ext;
 	NickFlood(Module* Creator) : ModeHandler(Creator, "nickflood", 'F', PARAM_SETONLY, MODETYPE_CHANNEL),
-		ext("nickflood", Creator) { fixed_letter = false; }
+		ext(EXTENSIBLE_CHANNEL, "nickflood", Creator) { fixed_letter = false; }
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index cc4d0a70a..aa94c0de5 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -142,7 +142,7 @@ class ModuleNickLock : public Module
 	CommandNickunlock cmd2;
  public:
 	ModuleNickLock()
-		: locked("nick_locked", this), cmd1(this, locked), cmd2(this, locked)
+		: locked(EXTENSIBLE_USER, "nick_locked", this), cmd1(this, locked), cmd2(this, locked)
 	{}
 
 	void init()
diff --git a/src/modules/m_opflags.cpp b/src/modules/m_opflags.cpp
index 4cfc40245..27f43b3c4 100644
--- a/src/modules/m_opflags.cpp
+++ b/src/modules/m_opflags.cpp
@@ -18,7 +18,7 @@ class OpFlagProviderImpl : public OpFlagProvider
 {
  public:
 	LocalStringExt ext;
-	OpFlagProviderImpl(Module* parent) : OpFlagProvider(parent, "opflags"), ext("flaglist", parent)
+	OpFlagProviderImpl(Module* parent) : OpFlagProvider(parent, "opflags"), ext(EXTENSIBLE_MEMBERSHIP, "flaglist", parent)
 	{
 	}
 
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 7d1835874..10821c0f6 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -21,7 +21,7 @@ class OverrideMode : public ModeHandler
 	int OverrideTimeout;
 	LocalIntExt timeout;
 	OverrideMode(Module* Creator) : ModeHandler(Creator, "override", 'O', PARAM_NONE, MODETYPE_USER),
-		timeout("override_timeout", Creator)
+		timeout(EXTENSIBLE_USER, "override_timeout", Creator)
 	{
 		oper = true;
 	}
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index af373ff73..33d340bb1 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -167,7 +167,7 @@ class ModuleSASL : public Module
 	CommandSASL sasl;
  public:
 	ModuleSASL()
-		: authExt("sasl_auth", this), cap(this, "sasl"), auth(this), sasl(this)
+		: authExt(EXTENSIBLE_USER, "sasl_auth", this), cap(this, "sasl"), auth(this), sasl(this)
 	{
 		sasl_ext = &authExt;
 	}
diff --git a/src/modules/m_serverbots.cpp b/src/modules/m_serverbots.cpp
index 943bb217d..01179b1d1 100644
--- a/src/modules/m_serverbots.cpp
+++ b/src/modules/m_serverbots.cpp
@@ -198,7 +198,7 @@ class ModuleServerBots : public Module
 	int botID;
 
  public:
-	ModuleServerBots() : dataExt("serverbot", this) {}
+	ModuleServerBots() : dataExt(EXTENSIBLE_USER, "serverbot", this) {}
 
 	void init()
 	{
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 9075ddaad..489b705ff 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -35,7 +35,7 @@ struct AccountItem
 class ServicesExtItem : public SimpleExtItem<AccountItem>
 {
  public:
-	ServicesExtItem(Module* owner) : SimpleExtItem<AccountItem>("accountname", owner) {}
+	ServicesExtItem(Module* owner) : SimpleExtItem<AccountItem>(EXTENSIBLE_USER, "accountname", owner) {}
 
 	std::string serialize(SerializeFormat format, const Extensible* container, void* itemv) const
 	{
diff --git a/src/modules/m_servvhost.cpp b/src/modules/m_servvhost.cpp
index d29c0de7f..8c08b1f6f 100644
--- a/src/modules/m_servvhost.cpp
+++ b/src/modules/m_servvhost.cpp
@@ -19,7 +19,7 @@ class ModuleServVHost : public Module
 {
  public:
 	StringExtItem cli_name, srv_name;
-	ModuleServVHost() : cli_name("usercmd_host", this), srv_name("usercmd_server", this) {}
+	ModuleServVHost() : cli_name(EXTENSIBLE_USER, "usercmd_host", this), srv_name(EXTENSIBLE_USER, "usercmd_server", this) {}
 
 	void init()
 	{
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index 3fa73c0f1..0f56fc830 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -98,7 +98,7 @@ class CommandSilence : public Command
  public:
 	SimpleExtItem<silencelist> ext;
 	CommandSilence(Module* Creator, unsigned int &max) : Command(Creator, "SILENCE", 0),
-		maxsilence(max), ext("silence_list", Creator)
+		maxsilence(max), ext(EXTENSIBLE_USER, "silence_list", Creator)
 	{
 		syntax = "{[+|-]<mask> <p|c|i|n|t|a|x>}";
 		TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
diff --git a/src/modules/m_sql_channels.cpp b/src/modules/m_sql_channels.cpp
index c1a5ee4c3..9a6d23b09 100644
--- a/src/modules/m_sql_channels.cpp
+++ b/src/modules/m_sql_channels.cpp
@@ -98,7 +98,7 @@ class ChanSQLDB : public Module
 	LocalIntExt InDB;
 
  public:
-	ChanSQLDB() : sqldb("SQL"), InDB("in_sql_chans", this)
+	ChanSQLDB() : sqldb("SQL"), InDB(EXTENSIBLE_CHANNEL, "in_sql_chans", this)
 	{
 	}
 	Version GetVersion()
diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp
index 755270f53..ddd708197 100644
--- a/src/modules/m_sqlauth.cpp
+++ b/src/modules/m_sqlauth.cpp
@@ -94,7 +94,7 @@ class ModuleSQLAuth : public Module
 	bool verbose;
 
  public:
-	ModuleSQLAuth() : pendingExt("sqlauth-wait", this), SQL("SQL")
+	ModuleSQLAuth() : pendingExt(EXTENSIBLE_USER, "sqlauth-wait", this), SQL("SQL")
 	{
 	}
 
diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 3d38c27ab..ae3b4e783 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -18,7 +18,7 @@
 
 class SSLCertExt : public ExtensionItem {
  public:
-	SSLCertExt(Module* parent) : ExtensionItem("ssl_cert", parent) {}
+	SSLCertExt(Module* parent) : ExtensionItem(EXTENSIBLE_USER, "ssl_cert", parent) {}
 	ssl_cert* get(const Extensible* item) const
 	{
 		return static_cast<ssl_cert*>(get_raw(item));
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index f98be51e6..2a4c9aec2 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -21,7 +21,7 @@ class CommandSwhois : public Command
 {
  public:
 	StringExtItem swhois;
-	CommandSwhois(Module* Creator) : Command(Creator,"SWHOIS", 2,2), swhois("swhois", Creator)
+	CommandSwhois(Module* Creator) : Command(Creator,"SWHOIS", 2,2), swhois(EXTENSIBLE_USER, "swhois", Creator)
 	{
 		flags_needed = 'o'; syntax = "<nick> :<swhois>";
 		ServerInstance->Extensions.Register(&swhois);
diff --git a/src/modules/m_timedmodes.cpp b/src/modules/m_timedmodes.cpp
index 90cf289d5..aba1fa002 100644
--- a/src/modules/m_timedmodes.cpp
+++ b/src/modules/m_timedmodes.cpp
@@ -68,7 +68,7 @@ class CommandTmode : public Command
 	TimedMode* current;
 	irc::modestacker toannounce;
 	limitlist chanlimits;
-	CommandTmode(Module* Creator) : Command(Creator,"TMODE", 1), tmodes("tmodes", Creator)
+	CommandTmode(Module* Creator) : Command(Creator,"TMODE", 1), tmodes(EXTENSIBLE_CHANNEL, "tmodes", Creator)
 	{
 		syntax = "<channel> [<duration> <modes> {<mode-parameters>}]"; // NB: This is the syntax for clients to use.  The s2s syntax is different: <channel> <expiry> <modes to set/unset upon expiry> {<mode-parameters>}
 		ServerInstance->Extensions.Register(&tmodes);
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 8d0043a71..c12feaf44 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -251,7 +251,8 @@ class CommandWatch : public Command
 		return CMD_SUCCESS;
 	}
 
-	CommandWatch(Module* parent, unsigned int &maxwatch) : Command(parent,"WATCH", 0), MAX_WATCH(maxwatch), ext("watchlist", parent)
+	CommandWatch(Module* parent, unsigned int &maxwatch)
+		: Command(parent,"WATCH", 0), MAX_WATCH(maxwatch), ext(EXTENSIBLE_USER, "watchlist", parent)
 	{
 		syntax = "[C|L|S]|[+|-<nick>]";
 		TRANSLATE2(TR_TEXT, TR_END); /* we watch for a nick. not a UID. */
diff --git a/src/users.cpp b/src/users.cpp
index 91ae9f129..79b0b5dc7 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -185,7 +185,7 @@ const char* User::FormatModes(bool showparameters)
 }
 
 User::User(const std::string &uid, const std::string& sid, int type)
-	: Extensible(Extensible::USER), age(ServerInstance->Time()), signon(0),
+	: Extensible(EXTENSIBLE_USER), age(ServerInstance->Time()), signon(0),
 	idle_lastmsg(0), nick(uid), uuid(uid), server(sid), registered(0),
 	dns_done(0), quietquit(0), quitting(0), exempt(0), lastping(0),
 	usertype(type), frozen(0)