diff --git a/extensions/m_adminwall.c b/extensions/m_adminwall.c
index eecf8b5..b37734b 100644
--- a/extensions/m_adminwall.c
+++ b/extensions/m_adminwall.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "send.h"
 #include "s_user.h"
diff --git a/extensions/m_findforwards.c b/extensions/m_findforwards.c
index 79bdeea..e33ea17 100644
--- a/extensions/m_findforwards.c
+++ b/extensions/m_findforwards.c
@@ -23,7 +23,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"
diff --git a/extensions/m_identify.c b/extensions/m_identify.c
index 76533c2..c3f1100 100644
--- a/extensions/m_identify.c
+++ b/extensions/m_identify.c
@@ -35,7 +35,7 @@
 #include "client.h"
 #include "common.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_conf.h"
 #include "logger.h"
diff --git a/extensions/m_mkpasswd.c b/extensions/m_mkpasswd.c
index 804ae21..242b066 100644
--- a/extensions/m_mkpasswd.c
+++ b/extensions/m_mkpasswd.c
@@ -14,7 +14,7 @@
 #include "client.h"
 #include "common.h"		/* FALSE bleah */
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_newconf.h"
 #include "s_conf.h"
diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index 53ed832..96efcad 100644
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -30,7 +30,7 @@
 #include "s_newconf.h" 
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h" 
 #include "msg.h"
 #include "parse.h"
diff --git a/extensions/m_okick.c b/extensions/m_okick.c
index 156a046..add1648 100644
--- a/extensions/m_okick.c
+++ b/extensions/m_okick.c
@@ -26,7 +26,7 @@
 #include "stdinc.h"
 #include "channel.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
diff --git a/extensions/m_olist.c b/extensions/m_olist.c
index cccb011..4484ae5 100644
--- a/extensions/m_olist.c
+++ b/extensions/m_olist.c
@@ -35,7 +35,7 @@
 #include "s_serv.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"
diff --git a/extensions/m_omode.c b/extensions/m_omode.c
index cb2b0d3..f1407ff 100644
--- a/extensions/m_omode.c
+++ b/extensions/m_omode.c
@@ -29,7 +29,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"
diff --git a/extensions/m_opme.c b/extensions/m_opme.c
index f75f165..e23d6c7 100644
--- a/extensions/m_opme.c
+++ b/extensions/m_opme.c
@@ -27,7 +27,7 @@
 #include "s_serv.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"
diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index bec61e9..8d2f239 100644
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -42,7 +42,7 @@
 
 #include "stdinc.h"
 #include "client.h"		/* client struct */
-#include "irc_string.h"
+#include "match.h"
 #include "hostmask.h"
 #include "send.h"		/* sendto_one */
 #include "numeric.h"		/* ERR_xxx */
diff --git a/include/client.h b/include/client.h
index 130f192..1b934e7 100644
--- a/include/client.h
+++ b/include/client.h
@@ -38,7 +38,7 @@
 #include "channel.h"
 #include "res.h"
 #include "snomask.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 
 /* other structs */
diff --git a/include/irc_string.h b/include/irc_string.h
index 6354845..d529fc8 100644
--- a/include/irc_string.h
+++ b/include/irc_string.h
@@ -27,122 +27,10 @@
 #ifndef INCLUDED_irc_string_h
 #define INCLUDED_irc_string_h
 
-#include "setup.h"
-#include "ircd_defs.h"
-
-/*
- * match - compare name with mask, mask may contain * and ? as wildcards
- * match - returns 1 on successful match, 0 otherwise
- *
- * mask_match - compare one mask to another
- * match_esc - compare with support for escaping chars
- * match_cidr - compares u!h@addr with u!h@addr/cidr
- * match_ips - compares addr with addr/cidr in ascii form
- */
-extern int match(const char *mask, const char *name);
-extern int mask_match(const char *oldmask, const char *newmask);
-extern int match_esc(const char *mask, const char *name);
-extern int match_cidr(const char *mask, const char *name);
-extern int match_ips(const char *mask, const char *name);
-
-/*
- * comp_with_mask - compares to IP address
- */
-int comp_with_mask(void *addr, void *dest, u_int mask);
-int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, u_int mask);
-
-/*
- * collapse - collapse a string in place, converts multiple adjacent *'s 
- * into a single *.
- * collapse - modifies the contents of pattern 
- *
- * collapse_esc() - collapse with support for escaping chars
- */
-extern char *collapse(char *pattern);
-extern char *collapse_esc(char *pattern);
-
-/*
- * irccmp - case insensitive comparison of s1 and s2
- */
-extern int irccmp(const char *s1, const char *s2);
-/*
- * ircncmp - counted case insensitive comparison of s1 and s2
- */
-extern int ircncmp(const char *s1, const char *s2, int n);
-/*
-** canonize - reduce a string of duplicate list entries to contain
-** only the unique items.
-*/
-#ifdef NO_DUPE_MULTI_MESSAGES
-extern char *canonize(char *);
-#endif
-
 /*
  * strip_colour - remove colour codes from a string
  * -asuffield (?)
  */
 char *strip_colour(char *string);
 
-#define EmptyString(x) ((x) == NULL || *(x) == '\0')
-#define CheckEmpty(x) EmptyString(x) ? "" : x
-
-/*
- * character macros
- */
-extern const unsigned char ToLowerTab[];
-#define ToLower(c) (ToLowerTab[(unsigned char)(c)])
-
-extern const unsigned char ToUpperTab[];
-#define ToUpper(c) (ToUpperTab[(unsigned char)(c)])
-
-extern const unsigned int CharAttrs[];
-
-#define PRINT_C   0x001
-#define CNTRL_C   0x002
-#define ALPHA_C   0x004
-#define PUNCT_C   0x008
-#define DIGIT_C   0x010
-#define SPACE_C   0x020
-#define NICK_C    0x040
-#define CHAN_C    0x080
-#define KWILD_C   0x100
-#define CHANPFX_C 0x200
-#define USER_C    0x400
-#define HOST_C    0x800
-#define NONEOS_C 0x1000
-#define SERV_C   0x2000
-#define EOL_C    0x4000
-#define MWILD_C  0x8000
-#define LET_C   0x10000 /* an actual letter */
-#define FCHAN_C 0x20000 /* a 'fake' channel char */
-
-#define IsHostChar(c)   (CharAttrs[(unsigned char)(c)] & HOST_C)
-#define IsUserChar(c)   (CharAttrs[(unsigned char)(c)] & USER_C)
-#define IsChanPrefix(c) (CharAttrs[(unsigned char)(c)] & CHANPFX_C)
-#define IsChanChar(c)   (CharAttrs[(unsigned char)(c)] & CHAN_C)
-#define IsFakeChanChar(c)	(CharAttrs[(unsigned char)(c)] & FCHAN_C)
-#define IsKWildChar(c)  (CharAttrs[(unsigned char)(c)] & KWILD_C)
-#define IsMWildChar(c)  (CharAttrs[(unsigned char)(c)] & MWILD_C)
-#define IsNickChar(c)   (CharAttrs[(unsigned char)(c)] & NICK_C)
-#define IsServChar(c)   (CharAttrs[(unsigned char)(c)] & (NICK_C | SERV_C))
-#define IsIdChar(c)	(CharAttrs[(unsigned char)(c)] & (DIGIT_C | LET_C))
-#define IsLetter(c)	(CharAttrs[(unsigned char)(c)] & LET_C)
-#define IsCntrl(c)      (CharAttrs[(unsigned char)(c)] & CNTRL_C)
-#define IsAlpha(c)      (CharAttrs[(unsigned char)(c)] & ALPHA_C)
-#define IsSpace(c)      (CharAttrs[(unsigned char)(c)] & SPACE_C)
-#define IsLower(c)      (IsAlpha((c)) && ((unsigned char)(c) > 0x5f))
-#define IsUpper(c)      (IsAlpha((c)) && ((unsigned char)(c) < 0x60))
-#define IsDigit(c)      (CharAttrs[(unsigned char)(c)] & DIGIT_C)
-#define IsXDigit(c) (IsDigit(c) || ('a' <= (c) && (c) <= 'f') || \
-        ('A' <= (c) && (c) <= 'F'))
-#define IsAlNum(c) (CharAttrs[(unsigned char)(c)] & (DIGIT_C | ALPHA_C))
-#define IsPrint(c) (CharAttrs[(unsigned char)(c)] & PRINT_C)
-#define IsAscii(c) ((unsigned char)(c) < 0x80)
-#define IsGraph(c) (IsPrint((c)) && ((unsigned char)(c) != 0x32))
-#define IsPunct(c) (!(CharAttrs[(unsigned char)(c)] & \
-                                           (CNTRL_C | ALPHA_C | DIGIT_C)))
-
-#define IsNonEOS(c) (CharAttrs[(unsigned char)(c)] & NONEOS_C)
-#define IsEol(c) (CharAttrs[(unsigned char)(c)] & EOL_C)
-
 #endif /* INCLUDED_irc_string_h */
diff --git a/include/match.h b/include/match.h
new file mode 100644
index 0000000..da6f781
--- /dev/null
+++ b/include/match.h
@@ -0,0 +1,142 @@
+/*
+ *  ircd-ratbox: A slightly useful ircd.
+ *  irc_string.h: A header for the ircd string functions.
+ *
+ *  Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
+ *  Copyright (C) 1996-2002 Hybrid Development Team
+ *  Copyright (C) 2002-2004 ircd-ratbox development team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *  USA
+ *
+ *  $Id: irc_string.h 3538 2007-07-26 14:21:57Z jilles $
+ */
+
+#ifndef INCLUDED_match_h
+#define INCLUDED_match_h
+
+#include "setup.h"
+#include "ircd_defs.h"
+
+/*
+ * match - compare name with mask, mask may contain * and ? as wildcards
+ * match - returns 1 on successful match, 0 otherwise
+ *
+ * mask_match - compare one mask to another
+ * match_esc - compare with support for escaping chars
+ * match_cidr - compares u!h@addr with u!h@addr/cidr
+ * match_ips - compares addr with addr/cidr in ascii form
+ */
+extern int match(const char *mask, const char *name);
+extern int mask_match(const char *oldmask, const char *newmask);
+extern int match_esc(const char *mask, const char *name);
+extern int match_cidr(const char *mask, const char *name);
+extern int match_ips(const char *mask, const char *name);
+
+/*
+ * comp_with_mask - compares to IP address
+ */
+int comp_with_mask(void *addr, void *dest, u_int mask);
+int comp_with_mask_sock(struct sockaddr *addr, struct sockaddr *dest, u_int mask);
+
+/*
+ * collapse - collapse a string in place, converts multiple adjacent *'s 
+ * into a single *.
+ * collapse - modifies the contents of pattern 
+ *
+ * collapse_esc() - collapse with support for escaping chars
+ */
+extern char *collapse(char *pattern);
+extern char *collapse_esc(char *pattern);
+
+/*
+ * irccmp - case insensitive comparison of s1 and s2
+ */
+extern int irccmp(const char *s1, const char *s2);
+/*
+ * ircncmp - counted case insensitive comparison of s1 and s2
+ */
+extern int ircncmp(const char *s1, const char *s2, int n);
+/*
+** canonize - reduce a string of duplicate list entries to contain
+** only the unique items.
+*/
+#ifdef NO_DUPE_MULTI_MESSAGES
+extern char *canonize(char *);
+#endif
+
+#define EmptyString(x) ((x) == NULL || *(x) == '\0')
+#define CheckEmpty(x) EmptyString(x) ? "" : x
+
+/*
+ * character macros
+ */
+extern const unsigned char ToLowerTab[];
+#define ToLower(c) (ToLowerTab[(unsigned char)(c)])
+
+extern const unsigned char ToUpperTab[];
+#define ToUpper(c) (ToUpperTab[(unsigned char)(c)])
+
+extern const unsigned int CharAttrs[];
+
+#define PRINT_C   0x001
+#define CNTRL_C   0x002
+#define ALPHA_C   0x004
+#define PUNCT_C   0x008
+#define DIGIT_C   0x010
+#define SPACE_C   0x020
+#define NICK_C    0x040
+#define CHAN_C    0x080
+#define KWILD_C   0x100
+#define CHANPFX_C 0x200
+#define USER_C    0x400
+#define HOST_C    0x800
+#define NONEOS_C 0x1000
+#define SERV_C   0x2000
+#define EOL_C    0x4000
+#define MWILD_C  0x8000
+#define LET_C   0x10000 /* an actual letter */
+#define FCHAN_C 0x20000 /* a 'fake' channel char */
+
+#define IsHostChar(c)   (CharAttrs[(unsigned char)(c)] & HOST_C)
+#define IsUserChar(c)   (CharAttrs[(unsigned char)(c)] & USER_C)
+#define IsChanPrefix(c) (CharAttrs[(unsigned char)(c)] & CHANPFX_C)
+#define IsChanChar(c)   (CharAttrs[(unsigned char)(c)] & CHAN_C)
+#define IsFakeChanChar(c)	(CharAttrs[(unsigned char)(c)] & FCHAN_C)
+#define IsKWildChar(c)  (CharAttrs[(unsigned char)(c)] & KWILD_C)
+#define IsMWildChar(c)  (CharAttrs[(unsigned char)(c)] & MWILD_C)
+#define IsNickChar(c)   (CharAttrs[(unsigned char)(c)] & NICK_C)
+#define IsServChar(c)   (CharAttrs[(unsigned char)(c)] & (NICK_C | SERV_C))
+#define IsIdChar(c)	(CharAttrs[(unsigned char)(c)] & (DIGIT_C | LET_C))
+#define IsLetter(c)	(CharAttrs[(unsigned char)(c)] & LET_C)
+#define IsCntrl(c)      (CharAttrs[(unsigned char)(c)] & CNTRL_C)
+#define IsAlpha(c)      (CharAttrs[(unsigned char)(c)] & ALPHA_C)
+#define IsSpace(c)      (CharAttrs[(unsigned char)(c)] & SPACE_C)
+#define IsLower(c)      (IsAlpha((c)) && ((unsigned char)(c) > 0x5f))
+#define IsUpper(c)      (IsAlpha((c)) && ((unsigned char)(c) < 0x60))
+#define IsDigit(c)      (CharAttrs[(unsigned char)(c)] & DIGIT_C)
+#define IsXDigit(c) (IsDigit(c) || ('a' <= (c) && (c) <= 'f') || \
+        ('A' <= (c) && (c) <= 'F'))
+#define IsAlNum(c) (CharAttrs[(unsigned char)(c)] & (DIGIT_C | ALPHA_C))
+#define IsPrint(c) (CharAttrs[(unsigned char)(c)] & PRINT_C)
+#define IsAscii(c) ((unsigned char)(c) < 0x80)
+#define IsGraph(c) (IsPrint((c)) && ((unsigned char)(c) != 0x32))
+#define IsPunct(c) (!(CharAttrs[(unsigned char)(c)] & \
+                                           (CNTRL_C | ALPHA_C | DIGIT_C)))
+
+#define IsNonEOS(c) (CharAttrs[(unsigned char)(c)] & NONEOS_C)
+#define IsEol(c) (CharAttrs[(unsigned char)(c)] & EOL_C)
+
+#endif /* INCLUDED_match_h */
diff --git a/include/res.h b/include/res.h
index 84d70e5..1b70094 100644
--- a/include/res.h
+++ b/include/res.h
@@ -10,7 +10,7 @@
 #include "ircd_defs.h"
 #include "common.h"
 #include "reslib.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 
 /* Maximum number of nameservers in /etc/resolv.conf we care about 
diff --git a/modules/core/m_die.c b/modules/core/m_die.c
index 0ef2903..e8aa279 100644
--- a/modules/core/m_die.c
+++ b/modules/core/m_die.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "logger.h"
 #include "s_conf.h"
diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 48c8752..3b43683 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c
index edec515..a7d5e2a 100644
--- a/modules/core/m_kick.c
+++ b/modules/core/m_kick.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "channel.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index 5fb4b4c..ad286d5 100644
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -34,7 +34,7 @@
 #include "s_conf.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index f559719..b934b3e 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -35,7 +35,7 @@
 #include "parse.h"
 #include "modules.h"
 #include "channel.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "class.h"
 #include "msg.h"
@@ -43,6 +43,7 @@
 #include "send.h"
 #include "s_newconf.h"
 #include "s_stats.h"
+#include "irc_string.h"
 
 static int m_message(int, const char *, struct Client *, struct Client *, int, const char **);
 static int m_privmsg(struct Client *, struct Client *, int, const char **);
diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index 32b9127..1653b09 100644
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -28,7 +28,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"
diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index dd827b8..352de58 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
diff --git a/modules/core/m_part.c b/modules/core/m_part.c
index 9e72ebc..9b48020 100644
--- a/modules/core/m_part.c
+++ b/modules/core/m_part.c
@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
@@ -39,6 +39,7 @@
 #include "modules.h"
 #include "s_conf.h"
 #include "packet.h"
+#include "irc_string.h"
 
 static int m_part(struct Client *, struct Client *, int, const char **);
 
diff --git a/modules/core/m_quit.c b/modules/core/m_quit.c
index 014d472..346c49f 100644
--- a/modules/core/m_quit.c
+++ b/modules/core/m_quit.c
@@ -34,6 +34,7 @@
 #include "parse.h"
 #include "modules.h"
 #include "s_conf.h"
+#include "irc_string.h"
 
 static int m_quit(struct Client *, struct Client *, int, const char **);
 static int ms_quit(struct Client *, struct Client *, int, const char **);
diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index 0c90e62..f483509 100644
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -28,7 +28,7 @@
 #include "client.h"		/* client struct */
 #include "common.h"		/* TRUE bleah */
 #include "hash.h"		/* add_to_client_hash */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"		/* me */
 #include "numeric.h"		/* ERR_xxx */
 #include "s_conf.h"		/* struct ConfItem */
diff --git a/modules/core/m_squit.c b/modules/core/m_squit.c
index 67e939e..9a2c2b7 100644
--- a/modules/core/m_squit.c
+++ b/modules/core/m_squit.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"		/* FALSE bleah */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
diff --git a/modules/m_away.c b/modules/m_away.c
index 6b35008..cd4c89b 100644
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
diff --git a/modules/m_cap.c b/modules/m_cap.c
index 998d8f0..9fa94d3 100644
--- a/modules/m_cap.c
+++ b/modules/m_cap.c
@@ -33,7 +33,7 @@
 #include "stdinc.h"
 #include "class.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "msg.h"
diff --git a/modules/m_capab.c b/modules/m_capab.c
index 58901fb..3bc9372 100644
--- a/modules/m_capab.c
+++ b/modules/m_capab.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_serv.h"
 #include "s_conf.h"
 #include "msg.h"
diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index 0d2278e..ea7c128 100644
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -44,7 +44,7 @@
 #include "s_conf.h"
 #include "msg.h"
 #include "parse.h"
-#include "irc_string.h"
+#include "match.h"
 #include "logger.h"
 #include "s_user.h"
 #include "cache.h"
diff --git a/modules/m_connect.c b/modules/m_connect.c
index deb83b8..9f586b4 100644
--- a/modules/m_connect.c
+++ b/modules/m_connect.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_conf.h"
 #include "s_newconf.h"
diff --git a/modules/m_dline.c b/modules/m_dline.c
index 6ca3da8..97e0aa6 100644
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -29,7 +29,7 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
diff --git a/modules/m_etrace.c b/modules/m_etrace.c
index 9e2998d..35e93c1 100644
--- a/modules/m_etrace.c
+++ b/modules/m_etrace.c
@@ -39,7 +39,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
diff --git a/modules/m_info.c b/modules/m_info.c
index 470ded5..870fe12 100644
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -29,7 +29,7 @@
 #include "channel.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "hook.h"
 #include "numeric.h"
diff --git a/modules/m_invite.c b/modules/m_invite.c
index eb6c041..04e04f0 100644
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -29,7 +29,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
diff --git a/modules/m_ison.c b/modules/m_ison.c
index bcd7d94..d918b7b 100644
--- a/modules/m_ison.c
+++ b/modules/m_ison.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
diff --git a/modules/m_kline.c b/modules/m_kline.c
index 1dad6d9..5157961 100644
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -29,7 +29,7 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"
diff --git a/modules/m_knock.c b/modules/m_knock.c
index 2c786e0..958951d 100644
--- a/modules/m_knock.c
+++ b/modules/m_knock.c
@@ -27,7 +27,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
diff --git a/modules/m_links.c b/modules/m_links.c
index 75598a7..e4a0f88 100644
--- a/modules/m_links.c
+++ b/modules/m_links.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
diff --git a/modules/m_list.c b/modules/m_list.c
index e6aaff4..db397a2 100644
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -37,7 +37,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
diff --git a/modules/m_locops.c b/modules/m_locops.c
index 96681e0..bf2e014 100644
--- a/modules/m_locops.c
+++ b/modules/m_locops.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "send.h"
 #include "s_user.h"
diff --git a/modules/m_names.c b/modules/m_names.c
index d3c7024..76425fe 100644
--- a/modules/m_names.c
+++ b/modules/m_names.c
@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
diff --git a/modules/m_oper.c b/modules/m_oper.c
index 886da7c..ca5c212 100644
--- a/modules/m_oper.c
+++ b/modules/m_oper.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
diff --git a/modules/m_pass.c b/modules/m_pass.c
index 6ef11a8..1f4255e 100644
--- a/modules/m_pass.c
+++ b/modules/m_pass.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"		/* client struct */
-#include "irc_string.h"
+#include "match.h"
 #include "send.h"		/* sendto_one */
 #include "numeric.h"		/* ERR_xxx */
 #include "ircd.h"		/* me */
diff --git a/modules/m_ping.c b/modules/m_ping.c
index f2a0be3..6269c54 100644
--- a/modules/m_ping.c
+++ b/modules/m_ping.c
@@ -29,7 +29,7 @@
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
diff --git a/modules/m_pong.c b/modules/m_pong.c
index 7cf84d5..e5fb98e 100644
--- a/modules/m_pong.c
+++ b/modules/m_pong.c
@@ -34,7 +34,7 @@
 #include "s_conf.h"
 #include "send.h"
 #include "channel.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "hash.h"
diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index ff0a08a..8bddf18 100644
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -28,7 +28,7 @@
 #include "client.h"
 #include "channel.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "s_serv.h"
 #include "numeric.h"
diff --git a/modules/m_restart.c b/modules/m_restart.c
index 97f47db..e175e9d 100644
--- a/modules/m_restart.c
+++ b/modules/m_restart.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_conf.h"
diff --git a/modules/m_scan.c b/modules/m_scan.c
index ecb10e9..23a64b3 100644
--- a/modules/m_scan.c
+++ b/modules/m_scan.c
@@ -38,7 +38,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
diff --git a/modules/m_set.c b/modules/m_set.c
index e9d7f0a..dfa7a8e 100644
--- a/modules/m_set.c
+++ b/modules/m_set.c
@@ -28,7 +28,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
diff --git a/modules/m_signon.c b/modules/m_signon.c
index b050343..51d7971 100644
--- a/modules/m_signon.c
+++ b/modules/m_signon.c
@@ -48,7 +48,7 @@
 #include "monitor.h"
 #include "s_stats.h"
 #include "snomask.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_user.h"
 
 static int me_svslogin(struct Client *, struct Client *, int, const char **);
diff --git a/modules/m_snote.c b/modules/m_snote.c
index 785901e..2ab7f7b 100644
--- a/modules/m_snote.c
+++ b/modules/m_snote.c
@@ -38,7 +38,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
diff --git a/modules/m_stats.c b/modules/m_stats.c
index ce73a7b..8e3d1d2 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -28,7 +28,7 @@
 #include "class.h"		/* report_classes */
 #include "client.h"		/* Client */
 #include "common.h"		/* TRUE/FALSE */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"		/* me */
 #include "listener.h"		/* show_ports */
 #include "msg.h"		/* Message */
diff --git a/modules/m_svinfo.c b/modules/m_svinfo.c
index a6b4848..6f7f326 100644
--- a/modules/m_svinfo.c
+++ b/modules/m_svinfo.c
@@ -26,7 +26,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"		/* TRUE bleah */
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
diff --git a/modules/m_tb.c b/modules/m_tb.c
index 875713e..ddc2245 100644
--- a/modules/m_tb.c
+++ b/modules/m_tb.c
@@ -37,7 +37,7 @@
 #include "common.h"
 #include "config.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_conf.h"
 #include "msg.h"
 #include "modules.h"
diff --git a/modules/m_testmask.c b/modules/m_testmask.c
index 089f5e9..373193d 100644
--- a/modules/m_testmask.c
+++ b/modules/m_testmask.c
@@ -38,7 +38,7 @@
 #include "client.h"
 #include "common.h"     /* FALSE bleah */
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_conf.h"
 #include "logger.h"
diff --git a/modules/m_topic.c b/modules/m_topic.c
index bc2bc16..9c91170 100644
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -28,7 +28,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
diff --git a/modules/m_trace.c b/modules/m_trace.c
index 8d13159..2c8b983 100644
--- a/modules/m_trace.c
+++ b/modules/m_trace.c
@@ -31,7 +31,7 @@
 #include "hash.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
diff --git a/modules/m_user.c b/modules/m_user.c
index 94a6577..2f792a7 100644
--- a/modules/m_user.c
+++ b/modules/m_user.c
@@ -26,7 +26,7 @@
 
 #include "stdinc.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"
diff --git a/modules/m_userhost.c b/modules/m_userhost.c
index 964aa6b..c819764 100644
--- a/modules/m_userhost.c
+++ b/modules/m_userhost.c
@@ -30,7 +30,7 @@
 #include "numeric.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
diff --git a/modules/m_wallops.c b/modules/m_wallops.c
index ccd25e9..f468bff 100644
--- a/modules/m_wallops.c
+++ b/modules/m_wallops.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "send.h"
 #include "s_user.h"
diff --git a/modules/m_who.c b/modules/m_who.c
index 749d35f..b0b76f5 100644
--- a/modules/m_who.c
+++ b/modules/m_who.c
@@ -32,7 +32,7 @@
 #include "numeric.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_conf.h"
 #include "logger.h"
 #include "msg.h"
diff --git a/modules/m_whois.c b/modules/m_whois.c
index c3da07a..54c71a1 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -35,7 +35,7 @@
 #include "s_conf.h"
 #include "s_serv.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 #include "s_conf.h"
 #include "logger.h"
 #include "msg.h"
diff --git a/modules/m_whowas.c b/modules/m_whowas.c
index 0728a80..5ad67df 100644
--- a/modules/m_whowas.c
+++ b/modules/m_whowas.c
@@ -29,7 +29,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"
diff --git a/modules/m_xline.c b/modules/m_xline.c
index 957486f..fba0a13 100644
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -42,7 +42,7 @@
 #include "logger.h"
 #include "s_serv.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"
diff --git a/src/channel.c b/src/channel.c
index 980cef9..db8d327 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -30,7 +30,7 @@
 #include "common.h"
 #include "hash.h"
 #include "hook.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"		/* captab */
diff --git a/src/chmode.c b/src/chmode.c
index 78682fb..82adf8a 100644
--- a/src/chmode.c
+++ b/src/chmode.c
@@ -31,7 +31,7 @@
 #include "common.h"
 #include "hash.h"
 #include "hook.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"		/* captab */
diff --git a/src/class.c b/src/class.c
index f3a60e8..4b4769e 100644
--- a/src/class.c
+++ b/src/class.c
@@ -35,7 +35,7 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 
 #define BAD_CONF_CLASS          -1
 #define BAD_PING                -2
diff --git a/src/client.c b/src/client.c
index dc88b93..0d4f5a1 100644
--- a/src/client.c
+++ b/src/client.c
@@ -31,7 +31,7 @@
 #include "class.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "packet.h"
diff --git a/src/hash.c b/src/hash.c
index 7d57e2f..10e3506 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -31,7 +31,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
diff --git a/src/hook.c b/src/hook.c
index ef9b222..5ef51f0 100644
--- a/src/hook.c
+++ b/src/hook.c
@@ -38,7 +38,7 @@
  */
 #include "stdinc.h"
 #include "hook.h"
-#include "irc_string.h"
+#include "match.h"
 
 hook *hooks;
 
diff --git a/src/hostmask.c b/src/hostmask.c
index 3b353b9..e322e86 100644
--- a/src/hostmask.c
+++ b/src/hostmask.c
@@ -31,7 +31,7 @@
 #include "hostmask.h"
 #include "numeric.h"
 #include "send.h"
-#include "irc_string.h"
+#include "match.h"
 
 #ifdef RB_IPV6
 static unsigned long hash_ipv6(struct sockaddr *, int);
diff --git a/src/irc_dictionary.c b/src/irc_dictionary.c
index 0a827db..9096790 100644
--- a/src/irc_dictionary.c
+++ b/src/irc_dictionary.c
@@ -23,7 +23,7 @@
  */
 
 #include "stdinc.h"
-#include "irc_string.h"
+#include "match.h"
 #include "client.h"
 #include "setup.h"
 #include "irc_dictionary.h"
diff --git a/src/irc_string.c b/src/irc_string.c
index 6d7b8ea..5b3a463 100644
--- a/src/irc_string.c
+++ b/src/irc_string.c
@@ -24,10 +24,7 @@
  *  $Id: irc_string.c 678 2006-02-03 20:25:01Z jilles $
  */
 
-#include "stdinc.h"
 #include "irc_string.h"
-#include "client.h"
-#include "setup.h"
 
 char *
 strip_colour(char *string)
diff --git a/src/ircd.c b/src/ircd.c
index 9d8f54f..9068b26 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -34,7 +34,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd_signal.h"
 #include "msg.h"		/* msgtab */
 #include "hostmask.h"
diff --git a/src/kdparse.c b/src/kdparse.c
index ef64d9c..69a0c56 100644
--- a/src/kdparse.c
+++ b/src/kdparse.c
@@ -30,7 +30,7 @@
 #include "s_newconf.h"
 #include "hostmask.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 
 /* conf_add_fields()
diff --git a/src/listener.c b/src/listener.c
index 2fdea28..60289fb 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -28,7 +28,7 @@
 #include "setup.h"
 #include "listener.h"
 #include "client.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"
diff --git a/src/match.c b/src/match.c
index f764c64..44de328 100644
--- a/src/match.c
+++ b/src/match.c
@@ -23,7 +23,7 @@
 #include "config.h"
 #include "client.h"
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 
 /*
  * Compare if a given string (name) matches the given
diff --git a/src/modules.c b/src/modules.c
index 115f511..a8b84af 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -37,7 +37,7 @@
 #include "numeric.h"
 #include "parse.h"
 #include "ircd_defs.h"
-#include "irc_string.h"
+#include "match.h"
 
 
 
diff --git a/src/numeric.c b/src/numeric.c
index f43b763..71b970d 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #include "s_conf.h"
 #include "numeric.h"
-#include "irc_string.h"
+#include "match.h"
 #include "common.h"		/* NULL cripes */
 
 #include "messages.tab"
diff --git a/src/packet.c b/src/packet.c
index 9d8207b..fdba54e 100644
--- a/src/packet.c
+++ b/src/packet.c
@@ -31,7 +31,7 @@
 #include "ircd.h"
 #include "parse.h"
 #include "packet.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hook.h"
 #include "send.h"
 
diff --git a/src/parse.c b/src/parse.c
index a2979b6..79c037e 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -31,7 +31,7 @@
 #include "channel.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "logger.h"
diff --git a/src/res.c b/src/res.c
index bd5b31c..7af69af 100644
--- a/src/res.c
+++ b/src/res.c
@@ -31,7 +31,7 @@
 #include "ircd.h"
 #include "res.h"
 #include "reslib.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "client.h" /* SNO_* */
 
diff --git a/src/reslib.c b/src/reslib.c
index 516cb65..d646428 100644
--- a/src/reslib.c
+++ b/src/reslib.c
@@ -86,7 +86,7 @@
 #include "ircd.h"
 #include "res.h"
 #include "reslib.h"
-#include "irc_string.h"
+#include "match.h"
 
 #define NS_TYPE_ELT             0x40 /* EDNS0 extended label type */
 #define DNS_LABELTYPE_BITSTRING 0x41
diff --git a/src/s_auth.c b/src/s_auth.c
index bb67394..2ea496d 100644
--- a/src/s_auth.c
+++ b/src/s_auth.c
@@ -39,7 +39,7 @@
 #include "s_conf.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "packet.h"
diff --git a/src/s_conf.c b/src/s_conf.c
index a8ec861..d1719b8 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -35,7 +35,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "listener.h"
 #include "hostmask.h"
diff --git a/src/s_serv.c b/src/s_serv.c
index d7e2a8a..9a652d0 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -35,7 +35,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"
diff --git a/src/s_user.c b/src/s_user.c
index 2501ac4..a366e7d 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -31,7 +31,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "listener.h"
 #include "msg.h"
diff --git a/src/scache.c b/src/scache.c
index 1ec035d..ff8c9fa 100644
--- a/src/scache.c
+++ b/src/scache.c
@@ -27,7 +27,7 @@
 #include "stdinc.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
diff --git a/src/send.c b/src/send.c
index 1987687..a3154c3 100644
--- a/src/send.c
+++ b/src/send.c
@@ -30,7 +30,7 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_serv.h"
diff --git a/src/substitution.c b/src/substitution.c
index 81e8b68..e92fae4 100644
--- a/src/substitution.c
+++ b/src/substitution.c
@@ -35,7 +35,7 @@
 
 #include "stdinc.h"
 #include "s_user.h"
-#include "irc_string.h"
+#include "match.h"
 
 /*
  * Simple mappings for $foo -> 'bar'.
diff --git a/src/whowas.c b/src/whowas.c
index 36de913..9d910a0 100644
--- a/src/whowas.c
+++ b/src/whowas.c
@@ -30,7 +30,7 @@
 #include "client.h"
 #include "common.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"
diff --git a/unsupported/m_clearchan.c b/unsupported/m_clearchan.c
index f1c557e..0a3921f 100644
--- a/unsupported/m_clearchan.c
+++ b/unsupported/m_clearchan.c
@@ -23,7 +23,7 @@
 #include "channel.h"
 #include "client.h"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "s_user.h"
diff --git a/unsupported/m_force.c b/unsupported/m_force.c
index 3f457a2..146fa9c 100644
--- a/unsupported/m_force.c
+++ b/unsupported/m_force.c
@@ -34,7 +34,7 @@
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "hostmask.h"
 #include "numeric.h"