Just to mess with om's head, remove helperfuncs.h from everywhere

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4900 e03df62e-2008-0410-955e-edbf42e46eb7

82 files changed, 82 insertions, 82 deletions

diff --git a/src/modules/extra/m_filter_pcre.cpp b/src/modules/extra/m_filter_pcre.cpp
index 819d77843..d435600b4 100644
--- a/src/modules/extra/m_filter_pcre.cpp
+++ b/src/modules/extra/m_filter_pcre.cpp
@@ -24,7 +24,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 class FilterPCREException : public ModuleException
diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index d43203ac4..db68e17cd 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -23,7 +23,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include "m_sqlv2.h"
 
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index a60fcb5f6..c4bf1da99 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -25,7 +25,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include "configreader.h"
 
diff --git a/src/modules/extra/m_sqlauth.cpp b/src/modules/extra/m_sqlauth.cpp
index 12bad82fc..acdd5da51 100644
--- a/src/modules/extra/m_sqlauth.cpp
+++ b/src/modules/extra/m_sqlauth.cpp
@@ -21,7 +21,7 @@
 #include "channels.h"
 #include "modules.h"
 #include "inspircd.h"
-#include "helperfuncs.h"
+
 #include "m_sqlv2.h"
 #include "m_sqlutils.h"
 
diff --git a/src/modules/extra/m_sqloper.cpp b/src/modules/extra/m_sqloper.cpp
index 4ae07b3de..22535e163 100644
--- a/src/modules/extra/m_sqloper.cpp
+++ b/src/modules/extra/m_sqloper.cpp
@@ -21,7 +21,7 @@
 #include "modules.h"
 #include "inspircd.h"
 #include "configreader.h"
-#include "helperfuncs.h"
+
 #include "m_sqlv2.h"
 #include "m_sqlutils.h"
 #include "commands/cmd_oper.h"
diff --git a/src/modules/extra/m_sqlutils.cpp b/src/modules/extra/m_sqlutils.cpp
index 8cddacd42..700f69e7d 100644
--- a/src/modules/extra/m_sqlutils.cpp
+++ b/src/modules/extra/m_sqlutils.cpp
@@ -23,7 +23,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include "configreader.h"
 
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index b33213c14..fdde010dc 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -8,7 +8,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "socket.h"
 #include "hashcomp.h"
 #include "inspircd.h"
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index a1cb6c4c4..280796b4b 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -9,7 +9,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "socket.h"
 #include "hashcomp.h"
 #include "inspircd.h"
diff --git a/src/modules/extra/m_testclient.cpp b/src/modules/extra/m_testclient.cpp
index e9696ed95..cff09ba41 100644
--- a/src/modules/extra/m_testclient.cpp
+++ b/src/modules/extra/m_testclient.cpp
@@ -3,7 +3,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include "configreader.h"
 #include "m_sqlv2.h"
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 5eb7c9908..09cf15947 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -19,7 +19,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "commands.h"
 #include "inspircd.h"
 #include <vector>
diff --git a/src/modules/m_antibear.cpp b/src/modules/m_antibear.cpp
index 7a8437935..557d2ca0c 100644
--- a/src/modules/m_antibear.cpp
+++ b/src/modules/m_antibear.cpp
@@ -19,7 +19,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 
 /* $ModDesc: Sends a numeric on connect which cripples a common type of trojan/spambot */
 
diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index cc3bf0730..82939231f 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -5,7 +5,7 @@
 #include "channels.h"
 #include "modules.h"
 #include "mode.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include "u_listmode.h"
 
diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 59c03e1e3..7dc2f2f2f 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -23,7 +23,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "inspircd.h"
 
diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 1e9095a83..b105e1dc5 100644
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -18,7 +18,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include "mode.h"
 
diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 04d9d1e54..978c72e52 100644
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index eabe8a0b4..0cde92bec 100644
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "configreader.h"
 #include "inspircd.h"
 
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 19d6e8502..a774968bb 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -22,7 +22,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "commands.h"
 #include "configreader.h"
diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index e68886a34..a1aba037d 100644
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 typedef std::map<irc::string,irc::string> censor_t;
diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 32ac5726f..496162877 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -23,7 +23,7 @@
 #include <arpa/inet.h>
 #include "users.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "dns.h"
 #include "inspircd.h"
 
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index c835da180..693b1788d 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -22,7 +22,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "u_listmode.h"
 #include "inspircd.h"
diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 13a9957cb..981f14f2e 100644
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include "commands.h"
 
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 54abe0940..b3a9dbb1f 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "modules.h"
 #include "commands.h"
 #include "inspircd.h"
-#include "helperfuncs.h"
+
 #include "wildcard.h"
 
 /* $ModDesc: Provides the /check command to retrieve information on a user, channel, or IP address */
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index d3c3dc84f..fdb438c91 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the CHGHOST command */
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 5bc70e3d7..e5b19bfca 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -1,7 +1,7 @@
 #include <string>
 #include "users.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the CHGIDENT command */
diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index e04563218..937577c5e 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -4,7 +4,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */
diff --git a/src/modules/m_connflood.cpp b/src/modules/m_connflood.cpp
index ffa2fba83..6a0ee948a 100644
--- a/src/modules/m_connflood.cpp
+++ b/src/modules/m_connflood.cpp
@@ -20,7 +20,7 @@ using namespace std;
 
 #include "users.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Connection throttle */
diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index 67a7aaca6..04d0a3033 100644
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -18,7 +18,7 @@
 #include "channels.h"
 #include "modules.h"
 #include "hashcomp.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Implements config tags which allow blocking of joins to channels */
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index a1511c3f2..775130f35 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -25,7 +25,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: An enhanced version of the unreal m_filter.so used by chatspike.net */
diff --git a/src/modules/m_foobar.cpp b/src/modules/m_foobar.cpp
index a5b0553b0..13c3477de 100644
--- a/src/modules/m_foobar.cpp
+++ b/src/modules/m_foobar.cpp
@@ -19,7 +19,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: A dummy module for testing */
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 842b03a27..dfd518cf2 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -23,7 +23,7 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "inspircd.h"
-#include "helperfuncs.h"
+
 
 class cmd_gloadmodule : public command_t
 {
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 46b82b234..2bce7097d 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -19,7 +19,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 // Global Vars
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 19367e1fe..feddae001 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "inspsocket.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include "httpd.h"
 
diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 677beed22..29b9b190d 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -22,7 +22,7 @@ using namespace std;
 #include "configreader.h"
 #include "modules.h"
 #include "inspsocket.h"
-#include "helperfuncs.h"
+
 #include "httpd.h"
 #include "inspircd.h"
 
diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 0f2748b0a..ba582555d 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -5,7 +5,7 @@
 #include "channels.h"
 #include "modules.h"
 #include "mode.h"
-#include "helperfuncs.h"
+
 #include "u_listmode.h"
 
 /* $ModDesc: Provides support for the +I channel mode */
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index e4d528159..7f12d5cce 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "configreader.h"
 #include "inspircd.h"
 
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 86f53fae7..35aecc894 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -5,7 +5,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp
index 25286f4c5..092ce999f 100644
--- a/src/modules/m_knock.cpp
+++ b/src/modules/m_knock.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "configreader.h"
 #include "inspircd.h"
 
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index ce10daed2..5a4f03340 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +f (message flood protection) */
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 16f6aafa6..1a7e8c5a7 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "inspircd.h"
 
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index 666143a04..885f2dd54 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -20,7 +20,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index b2878830e..9e4d37ff1 100644
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -20,7 +20,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +V */
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index 1606ca026..abf4f8034 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -20,7 +20,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +Q */
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index d8f974c9f..9d2a3d9eb 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "configreader.h"
 #include "inspircd.h"
diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 1c0948f12..c6de6dbdf 100644
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -20,7 +20,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +T */
diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index def8452b4..2bb1299c9 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -20,7 +20,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp
index 45c5e3959..67512815d 100644
--- a/src/modules/m_operjoin.cpp
+++ b/src/modules/m_operjoin.cpp
@@ -5,7 +5,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Forces opers to join the specified channel(s) on oper-up */
diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index ba0235f6a..ab4fee21f 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -4,7 +4,7 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include <string>
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Gives each oper type a 'level', cannot kill opers 'above' your level. */
diff --git a/src/modules/m_operlog.cpp b/src/modules/m_operlog.cpp
index 088410baa..cf5b80a38 100644
--- a/src/modules/m_operlog.cpp
+++ b/src/modules/m_operlog.cpp
@@ -19,7 +19,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include <vector>
 
diff --git a/src/modules/m_opermd5.cpp b/src/modules/m_opermd5.cpp
index 3cfb74961..9ac896e81 100644
--- a/src/modules/m_opermd5.cpp
+++ b/src/modules/m_opermd5.cpp
@@ -26,7 +26,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* The four core functions - F1 is optimized somewhat */
diff --git a/src/modules/m_opermotd.cpp b/src/modules/m_opermotd.cpp
index f0457904a..5d50d4192 100644
--- a/src/modules/m_opermotd.cpp
+++ b/src/modules/m_opermotd.cpp
@@ -6,7 +6,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Shows a message to opers after oper-up, adds /opermotd */
diff --git a/src/modules/m_opersha256.cpp b/src/modules/m_opersha256.cpp
index 6ab8f6d16..92579cdaf 100644
--- a/src/modules/m_opersha256.cpp
+++ b/src/modules/m_opersha256.cpp
@@ -44,7 +44,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index c65a992e7..e13481ab1 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "configreader.h"
 #include "inspircd.h"
 
diff --git a/src/modules/m_park.cpp b/src/modules/m_park.cpp
index e27a47d04..c1c8a055b 100644
--- a/src/modules/m_park.cpp
+++ b/src/modules/m_park.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include <vector>
 #include "users.h"
 #include "channels.h"
-#include "helperfuncs.h"
+
 #include "modules.h"
 #include "inspircd.h"
 
diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index 035b39a0c..0bb0be1db 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -19,7 +19,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 
diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 4f9aa0c2a..e51d1f20f 100644
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -20,7 +20,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +L (limit redirection) */
diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 8e26f6ead..1ee4742a3 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -6,7 +6,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "configreader.h"
 #include "commands.h"
 #include "inspircd.h"
diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp
index 50d83617c..1b7d4104a 100644
--- a/src/modules/m_restrictchans.cpp
+++ b/src/modules/m_restrictchans.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Only opers may create new channels if this module is loaded */
diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 4b9a838b7..8e10e2457 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -22,7 +22,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */
diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 89e72f652..1f7f2742f 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -19,7 +19,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include <vector>
 #include "configreader.h"
 #include "inspircd.h"
diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index 3dfbc7efe..01a335f80 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style SAJOIN command */
diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 3120783cf..98178c46a 100644
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style SAPART command */
diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 92049497f..14eb2aecf 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -19,7 +19,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include <vector>
 #include "inspircd.h"
 
diff --git a/src/modules/m_services.cpp b/src/modules/m_services.cpp
index 21ab31f6b..0a7e3adff 100644
--- a/src/modules/m_services.cpp
+++ b/src/modules/m_services.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include <string>
-#include "helperfuncs.h"
+
 #include "commands.h"
 #include "hashcomp.h"
 #include "inspircd.h"
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index d3a16fa05..5ddbbb979 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include <string>
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "inspircd.h"
 
diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 75d758f38..b7496a4ba 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETHOST command */
diff --git a/src/modules/m_setident.cpp b/src/modules/m_setident.cpp
index e9795cc7e..94ab3ff51 100644
--- a/src/modules/m_setident.cpp
+++ b/src/modules/m_setident.cpp
@@ -1,6 +1,6 @@
 #include "users.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETIDENT command */
diff --git a/src/modules/m_setidle.cpp b/src/modules/m_setidle.cpp
index 8bc790fca..f6584aef6 100644
--- a/src/modules/m_setidle.cpp
+++ b/src/modules/m_setidle.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Allows opers to set their idle time */
diff --git a/src/modules/m_setname.cpp b/src/modules/m_setname.cpp
index e088b7963..25269d1c4 100644
--- a/src/modules/m_setname.cpp
+++ b/src/modules/m_setname.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the SETNAME command */
diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 728b07fc5..0719a93f8 100644
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -6,7 +6,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp
index e39c0a7ea..d3a5ca44a 100644
--- a/src/modules/m_silence.cpp
+++ b/src/modules/m_silence.cpp
@@ -22,7 +22,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "inspircd.h"
 
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 8aa3e2b65..b3cc874bd 100644
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -32,7 +32,7 @@ using namespace std;
 #include "commands/cmd_whois.h"
 #include "commands/cmd_stats.h"
 #include "socket.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include "wildcard.h"
 #include "inspstring.h"
diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index df52b4fee..55b3a650c 100644
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -34,7 +34,7 @@ using namespace std;
 #include "modules.h"
 #include "commands.h"
 #include "socket.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include "inspstring.h"
 #include "hashcomp.h"
diff --git a/src/modules/m_ssl_dummy.cpp b/src/modules/m_ssl_dummy.cpp
index 284d1d6cb..4b3390c8d 100644
--- a/src/modules/m_ssl_dummy.cpp
+++ b/src/modules/m_ssl_dummy.cpp
@@ -17,7 +17,7 @@
 
 #include "users.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 
 /* $ModDesc: Makes remote /whoises to SSL servers work on a non-ssl server */
 
diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index 55cfd7a16..9cc3f2872 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -1,7 +1,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +z */
diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 46e577779..293b5ee13 100644
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel +S mode (strip ansi colour) */
diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index f885a6145..e98f87ffb 100644
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -17,7 +17,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */
diff --git a/src/modules/m_testcommand.cpp b/src/modules/m_testcommand.cpp
index 61effc3de..a615f9cb5 100644
--- a/src/modules/m_testcommand.cpp
+++ b/src/modules/m_testcommand.cpp
@@ -20,7 +20,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "dns.h"
 #include "inspircd.h"
 
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index ac993e0a9..faeb3e6ba 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -23,7 +23,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "configreader.h"
 #include "inspircd.h"
diff --git a/src/modules/m_tline.cpp b/src/modules/m_tline.cpp
index 37574ea02..2616448e6 100644
--- a/src/modules/m_tline.cpp
+++ b/src/modules/m_tline.cpp
@@ -20,7 +20,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "wildcard.h"
 #include "inspircd.h"
 #include "dns.h"
diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index 3af5a7e6f..044907b69 100644
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -22,7 +22,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "configreader.h"
 #include "inspircd.h"
 
diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 7389038ea..9fea5837b 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for USERIP command */
diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 521ddde56..d01bc045a 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -22,7 +22,7 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "inspircd.h"