Move numeric helper classes to their own header.

38 files changed, 43 insertions, 5 deletions

diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp
index 768bef894..e9bd3d45e 100644
--- a/src/modules/m_anticaps.cpp
+++ b/src/modules/m_anticaps.cpp
@@ -22,6 +22,7 @@
 
 #include "inspircd.h"
 #include "modules/exemption.h"
+#include "numerichelper.h"
 
 enum AntiCapsMethod
 {
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 82e5b09e1..fd00c5a0a 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -30,6 +30,7 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 #include "modules/extban.h"
+#include "numerichelper.h"
 
 class ModuleBlockColor final
 	: public Module
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 951d6d81a..60cfba367 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -30,6 +30,7 @@
 #include "modules/callerid.h"
 #include "modules/ctctags.h"
 #include "modules/isupport.h"
+#include "numerichelper.h"
 
 enum
 {
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index 22ae38beb..d0dcfa1e1 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -27,6 +27,7 @@
 #include "inspircd.h"
 #include "listmode.h"
 #include "modules/exemption.h"
+#include "numerichelper.h"
 
 enum
 {
diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 5a1cf0c58..91c30a307 100644
--- a/src/modules/m_chanhistory.cpp
+++ b/src/modules/m_chanhistory.cpp
@@ -24,9 +24,10 @@
 
 
 #include "inspircd.h"
-#include "modules/ircv3_servertime.h"
 #include "modules/ircv3_batch.h"
+#include "modules/ircv3_servertime.h"
 #include "modules/server.h"
+#include "numerichelper.h"
 
 typedef insp::flat_map<std::string, std::string> HistoryTagMap;
 
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 41d3ea520..25b4dbc9e 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -24,6 +24,7 @@
 
 
 #include "inspircd.h"
+#include "numerichelper.h"
 
 class CommandChghost final
 	: public Command
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 3a4f4c888..5fe6daf46 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -27,6 +27,7 @@
 
 
 #include "inspircd.h"
+#include "numerichelper.h"
 
 class CommandChgident final
 	: public Command
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index e8975e5b3..f9a311233 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -25,6 +25,7 @@
 
 
 #include "inspircd.h"
+#include "numerichelper.h"
 
 class CommandChgname final
 	: public Command
diff --git a/src/modules/m_commonchans.cpp b/src/modules/m_commonchans.cpp
index 0cad620fc..03abae1cd 100644
--- a/src/modules/m_commonchans.cpp
+++ b/src/modules/m_commonchans.cpp
@@ -23,6 +23,7 @@
 
 #include "inspircd.h"
 #include "modules/ctctags.h"
+#include "numerichelper.h"
 
 class ModuleCommonChans final
 	: public Module
diff --git a/src/modules/m_cycle.cpp b/src/modules/m_cycle.cpp
index 83b867c0e..47966ccce 100644
--- a/src/modules/m_cycle.cpp
+++ b/src/modules/m_cycle.cpp
@@ -27,6 +27,7 @@
 
 
 #include "inspircd.h"
+#include "numerichelper.h"
 
 class CommandCycle final
 	: public SplitCommand
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 31032d81b..5838febd0 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -30,6 +30,7 @@
 
 
 #include "inspircd.h"
+#include "numerichelper.h"
 
 enum
 {
diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index 93b5c5c81..fec5c982b 100644
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -24,6 +24,7 @@
 #include "inspircd.h"
 #include "modules/ctctags.h"
 #include "modules/exemption.h"
+#include "numerichelper.h"
 
 class DelayMsgMode final
 	: public ParamMode<DelayMsgMode, IntExtItem>
diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp
index 9c366f1f3..eaa768308 100644
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -24,6 +24,7 @@
 #include "inspircd.h"
 #include "listmode.h"
 #include "modules/exemption.h"
+#include "numerichelper.h"
 
 enum
 {
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index cfb623557..544ef99d8 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -33,12 +33,13 @@
 
 
 #include "inspircd.h"
-#include "xline.h"
+#include "modules/account.h"
 #include "modules/regex.h"
 #include "modules/server.h"
 #include "modules/shun.h"
 #include "modules/stats.h"
-#include "modules/account.h"
+#include "numerichelper.h"
+#include "xline.h"
 
 #include <fstream>
 
diff --git a/src/modules/m_hidelist.cpp b/src/modules/m_hidelist.cpp
index 27903e8eb..890301112 100644
--- a/src/modules/m_hidelist.cpp
+++ b/src/modules/m_hidelist.cpp
@@ -20,6 +20,7 @@
 
 
 #include "inspircd.h"
+#include "numerichelper.h"
 
 class ListWatcher final
 	: public ModeWatcher
diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp
index afa5341dc..02f98a69d 100644
--- a/src/modules/m_ircv3_ctctags.cpp
+++ b/src/modules/m_ircv3_ctctags.cpp
@@ -22,6 +22,7 @@
 #include "modules/cap.h"
 #include "modules/ctctags.h"
 #include "modules/isupport.h"
+#include "numerichelper.h"
 
 class CommandTagMsg final
 	: public Command
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 52e37edf0..24ccc0be2 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -25,6 +25,7 @@
 
 #include "inspircd.h"
 #include "modules/server.h"
+#include "numerichelper.h"
 
 // The number of seconds the channel will be closed for.
 static unsigned int duration;
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index db4f6ddbf..65ea91a34 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -28,6 +28,7 @@
 
 #include "inspircd.h"
 #include "modules/invite.h"
+#include "numerichelper.h"
 
 class KickRejoinData final
 {
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index a24019cd8..2bedbd69d 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -27,6 +27,7 @@
 
 #include "inspircd.h"
 #include "modules/invite.h"
+#include "numerichelper.h"
 
 enum
 {
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index a0fe5a5c1..18eb477c6 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -27,6 +27,7 @@
 #include "inspircd.h"
 #include "modules/ctctags.h"
 #include "modules/exemption.h"
+#include "numerichelper.h"
 
 /** Holds flood settings and state for mode +f
  */
diff --git a/src/modules/m_muteban.cpp b/src/modules/m_muteban.cpp
index aea04ad83..787cd533b 100644
--- a/src/modules/m_muteban.cpp
+++ b/src/modules/m_muteban.cpp
@@ -25,6 +25,7 @@
 #include "inspircd.h"
 #include "modules/ctctags.h"
 #include "modules/extban.h"
+#include "numerichelper.h"
 
 class ModuleQuietBan final
 	: public Module
diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 6cdc9c814..ae57c22b2 100644
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -23,6 +23,7 @@
 
 
 #include "inspircd.h"
+#include "numerichelper.h"
 
 enum
 {
diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index 2fb68503d..e2970e073 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -24,6 +24,7 @@
 
 #include "inspircd.h"
 #include "modules/exemption.h"
+#include "numerichelper.h"
 
 // The number of seconds nickname changing will be blocked for.
 static unsigned int duration;
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 1a77c3ff3..e9c43c7d8 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -29,6 +29,7 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 #include "modules/extban.h"
+#include "numerichelper.h"
 
 class ModuleNoCTCP final
 	: public Module
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index f814fcad9..adbbd9fca 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -28,6 +28,7 @@
 #include "inspircd.h"
 #include "modules/exemption.h"
 #include "modules/extban.h"
+#include "numerichelper.h"
 
 class ModuleNoNotice final
 	: public Module
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 00f5823d7..2d61de8c1 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -27,6 +27,7 @@
 
 
 #include "inspircd.h"
+#include "numerichelper.h"
 
 /** Handle channel mode +L
  */
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 0ffaa007a..584a29dbc 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -30,6 +30,7 @@
 
 #include "inspircd.h"
 #include "modules/isupport.h"
+#include "numerichelper.h"
 
 class CommandRemove final
 	: public Command
diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp
index d48849d4f..c668a9368 100644
--- a/src/modules/m_repeat.cpp
+++ b/src/modules/m_repeat.cpp
@@ -27,6 +27,7 @@
 
 #include "inspircd.h"
 #include "modules/exemption.h"
+#include "numerichelper.h"
 
 class ChannelSettings final
 {
diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index ad52b8b51..073ab6a80 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -25,6 +25,7 @@
 
 #include "inspircd.h"
 #include "modules/ctctags.h"
+#include "numerichelper.h"
 
 class ModuleRestrictMsg final
 	: public Module
diff --git a/src/modules/m_rmode.cpp b/src/modules/m_rmode.cpp
index 4e8e1bc66..b084eab54 100644
--- a/src/modules/m_rmode.cpp
+++ b/src/modules/m_rmode.cpp
@@ -22,6 +22,7 @@
 
 #include "inspircd.h"
 #include "listmode.h"
+#include "numerichelper.h"
 
 class CommandRMode final
 	: public Command
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 3e312c835..417c0226b 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -25,6 +25,7 @@
 
 
 #include "inspircd.h"
+#include "numerichelper.h"
 
 class CommandSamode final
 	: public Command
diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index 4a066e171..233524c01 100644
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -25,6 +25,7 @@
 
 
 #include "inspircd.h"
+#include "numerichelper.h"
 
 class CommandSATopic final
 	: public Command
diff --git a/src/modules/m_spanningtree/override_whois.cpp b/src/modules/m_spanningtree/override_whois.cpp
index 2044462f2..594f291e2 100644
--- a/src/modules/m_spanningtree/override_whois.cpp
+++ b/src/modules/m_spanningtree/override_whois.cpp
@@ -23,6 +23,7 @@
 
 #include "inspircd.h"
 #include "modules/whois.h"
+#include "numerichelper.h"
 
 #include "main.h"
 #include "commandbuilder.h"
diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 3bacc1402..4ee937496 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -29,8 +29,9 @@
 #include "inspircd.h"
 #include "modules/ssl.h"
 #include "modules/webirc.h"
-#include "modules/whois.h"
 #include "modules/who.h"
+#include "modules/whois.h"
+#include "numerichelper.h"
 
 class SSLCertExt final
 	: public ExtensionItem
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index dcb1999b6..c80d55409 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -27,9 +27,10 @@
 
 
 #include "inspircd.h"
-#include "modules/extban.h"
 #include "modules/ctctags.h"
+#include "modules/extban.h"
 #include "modules/ssl.h"
+#include "numerichelper.h"
 
 enum
 {
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index fd2e8c681..89d5f2d76 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -26,6 +26,7 @@
 
 #include "inspircd.h"
 #include "modules/whois.h"
+#include "numerichelper.h"
 
 class CommandSwhois final
 	: public Command
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 432d1d09a..3fe06a0b9 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -32,6 +32,7 @@
 
 #include "inspircd.h"
 #include "listmode.h"
+#include "numerichelper.h"
 
 // Holds a timed ban
 class TimedBan final
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 28cad8222..27bbd0592 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -26,6 +26,7 @@
 
 #include "inspircd.h"
 #include "modules/invite.h"
+#include "numerichelper.h"
 
 enum
 {