diff --git a/extensions/chm_nonotice.c b/extensions/chm_nonotice.c
index 70ec2c4a2..a2fa3603c 100644
--- a/extensions/chm_nonotice.c
+++ b/extensions/chm_nonotice.c
@@ -32,6 +32,7 @@
 #include "s_serv.h"
 #include "numeric.h"
 #include "chmode.h"
+#include "messages.h"
 #include "inline/stringops.h"
 
 static unsigned int mode_nonotice;
diff --git a/extensions/hurt.c b/extensions/hurt.c
index 83e0c8923..f976aa7a7 100644
--- a/extensions/hurt.c
+++ b/extensions/hurt.c
@@ -17,6 +17,7 @@
 #include "s_conf.h"
 #include "s_newconf.h"
 #include "hash.h"
+#include "messages.h"
 
 /* {{{ Structures */
 #define HURT_CUTOFF             (10)            /* protocol messages. */
diff --git a/extensions/m_adminwall.c b/extensions/m_adminwall.c
index b37734be6..ddbd2d3fc 100644
--- a/extensions/m_adminwall.c
+++ b/extensions/m_adminwall.c
@@ -37,6 +37,7 @@
 #include "parse.h"
 #include "modules.h"
 #include "s_serv.h"
+#include "messages.h"
 
 static int mo_adminwall(struct Client *, struct Client *, int, const char **);
 static int me_adminwall(struct Client *, struct Client *, int, const char **);
diff --git a/extensions/m_findforwards.c b/extensions/m_findforwards.c
index f681234e1..6d1cd241f 100644
--- a/extensions/m_findforwards.c
+++ b/extensions/m_findforwards.c
@@ -34,6 +34,7 @@
 #include "parse.h"
 #include "modules.h"
 #include "packet.h"
+#include "messages.h"
 
 static int m_findforwards(struct Client *client_p, struct Client *source_p,
 			int parc, const char *parv[]);
diff --git a/extensions/m_identify.c b/extensions/m_identify.c
index c3f110098..f2450a6a8 100644
--- a/extensions/m_identify.c
+++ b/extensions/m_identify.c
@@ -44,6 +44,7 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
+#include "messages.h"
 
 #define SVS_chanserv_NICK "ChanServ"
 #define SVS_nickserv_NICK "NickServ"
diff --git a/extensions/m_mkpasswd.c b/extensions/m_mkpasswd.c
index a277cfa4a..4207cea15 100644
--- a/extensions/m_mkpasswd.c
+++ b/extensions/m_mkpasswd.c
@@ -10,6 +10,7 @@
 #include "numeric.h"
 #include "s_conf.h"
 #include "modules.h"
+#include "messages.h"
 
 #include <string.h>
 
@@ -37,7 +38,7 @@ mapi_clist_av1 mkpasswd_clist[] = { &mkpasswd_msgtab, NULL };
 DECLARE_MODULE_AV1(mkpasswd, NULL, NULL, mkpasswd_clist, NULL, NULL, "$Revision$");
 
 
-/* m_mkpasswd - mkpasswd message handler
+/* m_mkpasswd - mkpasswd messages.handler
  *	parv[1] = password
  *	parv[2] = type
  */
@@ -88,7 +89,7 @@ m_mkpasswd(struct Client *client_p, struct Client *source_p, int parc, const cha
 	return 0;
 }
 
-/* mo_mkpasswd - mkpasswd message handler
+/* mo_mkpasswd - mkpasswd messages.handler
  *	parv[1] = password
  *	parv[2] = type
  */
diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index 89d99778f..b69001fd7 100644
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -35,6 +35,7 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
+#include "messages.h"
 
 static int mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
diff --git a/extensions/m_opme.c b/extensions/m_opme.c
index 31ee67f8d..533984dd0 100644
--- a/extensions/m_opme.c
+++ b/extensions/m_opme.c
@@ -34,6 +34,7 @@
 #include "modules.h"
 #include "s_conf.h"
 #include "s_newconf.h"
+#include "messages.h"
 
 static int mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
diff --git a/extensions/m_remove.c b/extensions/m_remove.c
index 8adc86d30..1a4c32aae 100644
--- a/extensions/m_remove.c
+++ b/extensions/m_remove.c
@@ -39,6 +39,7 @@
 #include "s_serv.h"
 #include "s_conf.h"
 #include "hook.h"
+#include "messages.h"
 
 unsigned int CAP_REMOVE;
 
diff --git a/extensions/m_roleplay.c b/extensions/m_roleplay.c
index 30da31d59..59f25b056 100644
--- a/extensions/m_roleplay.c
+++ b/extensions/m_roleplay.c
@@ -27,6 +27,7 @@
 #include "tgchange.h"
 #include "channel.h"
 #include "packet.h"
+#include "messages.h"
 
 static int m_scene(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 static int m_fsay(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
diff --git a/extensions/m_sendbans.c b/extensions/m_sendbans.c
index a623cf132..67df6df26 100644
--- a/extensions/m_sendbans.c
+++ b/extensions/m_sendbans.c
@@ -42,6 +42,7 @@
 #include "msg.h"
 #include "hash.h"
 #include "modules.h"
+#include "messages.h"
 
 static int mo_sendbans(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index ea6bc362f..a262da65f 100644
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -66,7 +66,7 @@ mapi_clist_av1 webirc_clist[] = { &webirc_msgtab, NULL };
 DECLARE_MODULE_AV1(webirc, NULL, NULL, webirc_clist, NULL, NULL, "$Revision: 20702 $");
 
 /*
- * mr_webirc - webirc message handler
+ * mr_webirc - webirc messages.handler
  *      parv[1] = password
  *      parv[2] = fake username (we ignore this)
  *	parv[3] = fake hostname