5 files changed, 19 insertions, 9 deletions
diff --git a/include/modules/ctctags.h b/include/modules/ctctags.h
index ad45d12b1..7946c1243 100644
--- a/include/modules/ctctags.h
+++ b/include/modules/ctctags.h
@@ -20,14 +20,25 @@
 #pragma once
 
 #include "event.h"
+#include "modules/cap.h"
 
 namespace CTCTags
 {
+	class CapReference;
 	class EventListener;
 	class TagMessage;
 	class TagMessageDetails;
 }
 
+class CTCTags::CapReference : public Cap::Reference
+{
+ public:
+	CapReference(Module* mod)
+		: Cap::Reference(mod, "message-tags")
+	{
+	}
+};
+
 class CTCTags::TagMessage : public ClientProtocol::Message
 {
 private:
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 91623a1fb..355ea44d4 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -24,7 +24,7 @@
 
 
 #include "inspircd.h"
-#include "modules/cap.h"
+#include "modules/ctctags.h"
 #include "modules/whois.h"
 
 enum
@@ -37,13 +37,13 @@ class BotTag : public ClientProtocol::MessageTagProvider
 {
  private:
 	SimpleUserModeHandler& botmode;
-	Cap::Reference ctctagcap;
+	CTCTags::CapReference ctctagcap;
 
  public:
 	BotTag(Module* mod, SimpleUserModeHandler& bm)
 		: ClientProtocol::MessageTagProvider(mod)
 		, botmode(bm)
-		, ctctagcap(mod, "message-tags")
+		, ctctagcap(mod)
 	{
 	}
 
diff --git a/src/modules/m_ircv3_msgid.cpp b/src/modules/m_ircv3_msgid.cpp
index 8b56ba6c7..c2bf3bd33 100644
--- a/src/modules/m_ircv3_msgid.cpp
+++ b/src/modules/m_ircv3_msgid.cpp
@@ -18,18 +18,17 @@
 
 
 #include "inspircd.h"
-#include "modules/cap.h"
 #include "modules/ctctags.h"
 
 class MsgIdTag : public ClientProtocol::MessageTagProvider
 {
  private:
-	Cap::Reference ctctagcap;
+	CTCTags::CapReference ctctagcap;
 
  public:
 	MsgIdTag(Module* mod)
 		: ClientProtocol::MessageTagProvider(mod)
-		, ctctagcap(mod, "message-tags")
+		, ctctagcap(mod)
 	{
 	}
 
diff --git a/src/modules/m_spanningtree/tags.cpp b/src/modules/m_spanningtree/tags.cpp
index feaa34bca..7ae26d45b 100644
--- a/src/modules/m_spanningtree/tags.cpp
+++ b/src/modules/m_spanningtree/tags.cpp
@@ -21,7 +21,7 @@
 
 ServiceTag::ServiceTag(Module* mod)
 	: ClientProtocol::MessageTagProvider(mod)
-	, ctctagcap(mod, "message-tags")
+	, ctctagcap(mod)
 {
 }
 
diff --git a/src/modules/m_spanningtree/tags.h b/src/modules/m_spanningtree/tags.h
index d8d863a45..a52ee6ef8 100644
--- a/src/modules/m_spanningtree/tags.h
+++ b/src/modules/m_spanningtree/tags.h
@@ -19,12 +19,12 @@
 
 #pragma once
 
-#include "modules/cap.h"
+#include "modules/ctctags.h"
 
 class ServiceTag : public ClientProtocol::MessageTagProvider
 {
  private:
-	Cap::Reference ctctagcap;
+	CTCTags::CapReference ctctagcap;
 
  public:
 	ServiceTag(Module* mod);