diff --git a/modules/cap_account_tag.c b/modules/cap_account_tag.c
index 2e45689d..73e55431 100644
--- a/modules/cap_account_tag.c
+++ b/modules/cap_account_tag.c
@@ -65,4 +65,4 @@ _moddeinit(void)
 	capability_orphan(cli_capindex, "account-tag");
 }
 
-DECLARE_MODULE_AV1(cap_account_tag, _modinit, _moddeinit, NULL, NULL, cap_account_tag_hfnlist, "$Revision$");
+DECLARE_MODULE_AV2(cap_account_tag, _modinit, _moddeinit, NULL, NULL, cap_account_tag_hfnlist, NULL, NULL, NULL);
diff --git a/modules/cap_server_time.c b/modules/cap_server_time.c
index b20f5d09..98d4616e 100644
--- a/modules/cap_server_time.c
+++ b/modules/cap_server_time.c
@@ -68,4 +68,4 @@ _moddeinit(void)
 	capability_orphan(cli_capindex, "server-time");
 }
 
-DECLARE_MODULE_AV1(cap_server_time, _modinit, _moddeinit, NULL, NULL, cap_server_time_hfnlist, "$Revision$");
+DECLARE_MODULE_AV2(cap_server_time, _modinit, _moddeinit, NULL, NULL, cap_server_time_hfnlist, NULL, NULL, NULL);
diff --git a/modules/chm_nocolour.c b/modules/chm_nocolour.c
index 3d3e2bb7..3d52529d 100644
--- a/modules/chm_nocolour.c
+++ b/modules/chm_nocolour.c
@@ -76,4 +76,4 @@ _moddeinit(void)
 	cflag_orphan('c');
 }
 
-DECLARE_MODULE_AV1(chm_nocolour, _modinit, _moddeinit, NULL, NULL, chm_nocolour_hfnlist, "$Revision$");
+DECLARE_MODULE_AV2(chm_nocolour, _modinit, _moddeinit, NULL, NULL, chm_nocolour_hfnlist, NULL, NULL, NULL);
diff --git a/modules/chm_noctcp.c b/modules/chm_noctcp.c
index 0e2a9438..c1d1edb9 100644
--- a/modules/chm_noctcp.c
+++ b/modules/chm_noctcp.c
@@ -76,4 +76,4 @@ _moddeinit(void)
 	cflag_orphan('C');
 }
 
-DECLARE_MODULE_AV1(chm_noctcp, _modinit, _moddeinit, NULL, NULL, chm_noctcp_hfnlist, "$Revision$");
+DECLARE_MODULE_AV2(chm_noctcp, _modinit, _moddeinit, NULL, NULL, chm_noctcp_hfnlist, NULL, NULL, NULL);
diff --git a/modules/core/m_ban.c b/modules/core/m_ban.c
index b9a9ec85..1de160fa 100644
--- a/modules/core/m_ban.c
+++ b/modules/core/m_ban.c
@@ -55,7 +55,7 @@ struct Message ban_msgtab = {
 };
 
 mapi_clist_av1 ban_clist[] =  { &ban_msgtab, NULL };
-DECLARE_MODULE_AV1(ban, NULL, NULL, ban_clist, NULL, NULL, "$Revision: 1349 $");
+DECLARE_MODULE_AV2(ban, NULL, NULL, ban_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int
 m_ban(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
diff --git a/modules/core/m_die.c b/modules/core/m_die.c
index 722b24ea..bb7aa4e4 100644
--- a/modules/core/m_die.c
+++ b/modules/core/m_die.c
@@ -47,7 +47,7 @@ static struct Message die_msgtab = {
 
 mapi_clist_av1 die_clist[] = { &die_msgtab, NULL };
 
-DECLARE_MODULE_AV1(die, NULL, NULL, die_clist, NULL, NULL, "$Revision: 3295 $");
+DECLARE_MODULE_AV2(die, NULL, NULL, die_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * mo_die - DIE command handler
diff --git a/modules/core/m_error.c b/modules/core/m_error.c
index 213d892a..c2ce31ad 100644
--- a/modules/core/m_error.c
+++ b/modules/core/m_error.c
@@ -45,7 +45,7 @@ mapi_clist_av1 error_clist[] = {
 	&error_msgtab, NULL
 };
 
-DECLARE_MODULE_AV1(error, NULL, NULL, error_clist, NULL, NULL, "$Revision: 494 $");
+DECLARE_MODULE_AV2(error, NULL, NULL, error_clist, NULL, NULL, NULL, NULL, NULL);
 
 /* Determine whether an ERROR message is safe to show (no IP address in it) */
 static int
diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index 8e27de0b..677792b9 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -67,7 +67,7 @@ mapi_hlist_av1 join_hlist[] = {
 	{ NULL, NULL },
 };
 
-DECLARE_MODULE_AV1(join, NULL, NULL, join_clist, join_hlist, NULL, "$Revision: 3494 $");
+DECLARE_MODULE_AV2(join, NULL, NULL, join_clist, join_hlist, NULL, NULL, NULL, NULL);
 
 static void do_join_0(struct Client *client_p, struct Client *source_p);
 static int check_channel_name_loc(struct Client *source_p, const char *name);
diff --git a/modules/core/m_kick.c b/modules/core/m_kick.c
index 50030dd0..2f7077ae 100644
--- a/modules/core/m_kick.c
+++ b/modules/core/m_kick.c
@@ -47,7 +47,7 @@ struct Message kick_msgtab = {
 
 mapi_clist_av1 kick_clist[] = { &kick_msgtab, NULL };
 
-DECLARE_MODULE_AV1(kick, NULL, NULL, kick_clist, NULL, NULL, "$Revision: 3317 $");
+DECLARE_MODULE_AV2(kick, NULL, NULL, kick_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
 ** m_kick
diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index 577c8115..06bbe9a2 100644
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -58,7 +58,7 @@ mapi_hlist_av1 kill_hlist[] = {
 	{ NULL, NULL},
 };
 
-DECLARE_MODULE_AV1(kill, NULL, NULL, kill_clist, kill_hlist, NULL, "$Revision: 3408 $");
+DECLARE_MODULE_AV2(kill, NULL, NULL, kill_clist, kill_hlist, NULL, NULL, NULL, NULL);
 
 /*
 ** mo_kill
diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index c5faeb41..4b98d222 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -76,7 +76,7 @@ struct Message notice_msgtab = {
 
 mapi_clist_av1 message_clist[] = { &privmsg_msgtab, &notice_msgtab, NULL };
 
-DECLARE_MODULE_AV1(message, modinit, moddeinit, message_clist, NULL, NULL, "$Revision: 3173 $");
+DECLARE_MODULE_AV2(message, modinit, moddeinit, message_clist, NULL, NULL, NULL, NULL, NULL);
 
 struct entity
 {
diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index 6633d252..c84ffaaf 100644
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -65,7 +65,7 @@ struct Message bmask_msgtab = {
 
 mapi_clist_av1 mode_clist[] = { &mode_msgtab, &tmode_msgtab, &mlock_msgtab, &bmask_msgtab, NULL };
 
-DECLARE_MODULE_AV1(mode, NULL, NULL, mode_clist, NULL, NULL, "$Revision: 1006 $");
+DECLARE_MODULE_AV2(mode, NULL, NULL, mode_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * m_mode - MODE command handler
diff --git a/modules/core/m_nick.c b/modules/core/m_nick.c
index f8cd00e9..e29e81a8 100644
--- a/modules/core/m_nick.c
+++ b/modules/core/m_nick.c
@@ -85,7 +85,7 @@ struct Message save_msgtab = {
 mapi_clist_av1 nick_clist[] = { &nick_msgtab, &uid_msgtab, &euid_msgtab,
 	&save_msgtab, NULL };
 
-DECLARE_MODULE_AV1(nick, NULL, NULL, nick_clist, NULL, NULL, "$Revision: 3518 $");
+DECLARE_MODULE_AV2(nick, NULL, NULL, nick_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int change_remote_nick(struct Client *, struct Client *, time_t,
 			      const char *, int);
diff --git a/modules/core/m_part.c b/modules/core/m_part.c
index faadda43..cd26b677 100644
--- a/modules/core/m_part.c
+++ b/modules/core/m_part.c
@@ -49,7 +49,7 @@ struct Message part_msgtab = {
 
 mapi_clist_av1 part_clist[] = { &part_msgtab, NULL };
 
-DECLARE_MODULE_AV1(part, NULL, NULL, part_clist, NULL, NULL, "$Revision: 98 $");
+DECLARE_MODULE_AV2(part, NULL, NULL, part_clist, NULL, NULL, NULL, NULL, NULL);
 
 static void part_one_client(struct Client *client_p,
 			    struct Client *source_p, char *name,
diff --git a/modules/core/m_quit.c b/modules/core/m_quit.c
index 01def830..472cab9e 100644
--- a/modules/core/m_quit.c
+++ b/modules/core/m_quit.c
@@ -44,7 +44,7 @@ struct Message quit_msgtab = {
 
 mapi_clist_av1 quit_clist[] = { &quit_msgtab, NULL };
 
-DECLARE_MODULE_AV1(quit, NULL, NULL, quit_clist, NULL, NULL, "$Revision: 1333 $");
+DECLARE_MODULE_AV2(quit, NULL, NULL, quit_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
 ** m_quit
diff --git a/modules/core/m_server.c b/modules/core/m_server.c
index f3ad0434..c25f02b9 100644
--- a/modules/core/m_server.c
+++ b/modules/core/m_server.c
@@ -55,7 +55,7 @@ struct Message sid_msgtab = {
 
 mapi_clist_av1 server_clist[] = { &server_msgtab, &sid_msgtab, NULL };
 
-DECLARE_MODULE_AV1(server, NULL, NULL, server_clist, NULL, NULL, "$Revision: 3291 $");
+DECLARE_MODULE_AV2(server, NULL, NULL, server_clist, NULL, NULL, NULL, NULL, NULL);
 
 int bogus_host(const char *host);
 static int set_server_gecos(struct Client *, const char *);
diff --git a/modules/core/m_squit.c b/modules/core/m_squit.c
index 6c6da052..9c72969d 100644
--- a/modules/core/m_squit.c
+++ b/modules/core/m_squit.c
@@ -48,7 +48,7 @@ struct Message squit_msgtab = {
 
 mapi_clist_av1 squit_clist[] = { &squit_msgtab, NULL };
 
-DECLARE_MODULE_AV1(squit, NULL, NULL, squit_clist, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV2(squit, NULL, NULL, squit_clist, NULL, NULL, NULL, NULL, NULL);
 
 struct squit_parms
 {
diff --git a/modules/m_accept.c b/modules/m_accept.c
index f1f0b4c1..4999fcd7 100644
--- a/modules/m_accept.c
+++ b/modules/m_accept.c
@@ -48,7 +48,7 @@ struct Message accept_msgtab = {
 mapi_clist_av1 accept_clist[] = {
 	&accept_msgtab, NULL
 };
-DECLARE_MODULE_AV1(accept, NULL, NULL, accept_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(accept, NULL, NULL, accept_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * m_accept - ACCEPT command handler
diff --git a/modules/m_admin.c b/modules/m_admin.c
index 9d01d9b9..2f1d1242 100644
--- a/modules/m_admin.c
+++ b/modules/m_admin.c
@@ -54,7 +54,7 @@ mapi_hlist_av1 admin_hlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(admin, NULL, NULL, admin_clist, admin_hlist, NULL, "$Revision: 3368 $");
+DECLARE_MODULE_AV2(admin, NULL, NULL, admin_clist, admin_hlist, NULL, NULL, NULL, NULL);
 
 /*
  * mr_admin - ADMIN command handler
diff --git a/modules/m_away.c b/modules/m_away.c
index a36dafbc..2718126c 100644
--- a/modules/m_away.c
+++ b/modules/m_away.c
@@ -43,7 +43,7 @@ struct Message away_msgtab = {
 };
 
 mapi_clist_av1 away_clist[] = { &away_msgtab, NULL };
-DECLARE_MODULE_AV1(away, NULL, NULL, away_clist, NULL, NULL, "$Revision: 3370 $");
+DECLARE_MODULE_AV2(away, NULL, NULL, away_clist, NULL, NULL, NULL, NULL, NULL);
 
 /***********************************************************************
  * m_away() - Added 14 Dec 1988 by jto.
diff --git a/modules/m_cap.c b/modules/m_cap.c
index bd1c46f5..b2e4a78a 100644
--- a/modules/m_cap.c
+++ b/modules/m_cap.c
@@ -54,7 +54,7 @@ struct Message cap_msgtab = {
 };
 
 mapi_clist_av1 cap_clist[] = { &cap_msgtab, NULL };
-DECLARE_MODULE_AV1(cap, NULL, NULL, cap_clist, NULL, NULL, "$Revision: 676 $");
+DECLARE_MODULE_AV2(cap, NULL, NULL, cap_clist, NULL, NULL, NULL, NULL, NULL);
 
 #define IsCapableEntry(c, e)		IsCapable(c, 1 << (e)->value)
 #define HasCapabilityFlag(c, f)		(c->ownerdata != NULL && (((struct ClientCapability *)c->ownerdata)->flags & (f)) == f)
diff --git a/modules/m_capab.c b/modules/m_capab.c
index c2b49609..054a506b 100644
--- a/modules/m_capab.c
+++ b/modules/m_capab.c
@@ -44,7 +44,7 @@ struct Message gcap_msgtab = {
 };
 
 mapi_clist_av1 capab_clist[] = { &capab_msgtab, &gcap_msgtab, NULL };
-DECLARE_MODULE_AV1(capab, NULL, NULL, capab_clist, NULL, NULL, "$Revision: 1295 $");
+DECLARE_MODULE_AV2(capab, NULL, NULL, capab_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * mr_capab - CAPAB message handler
diff --git a/modules/m_certfp.c b/modules/m_certfp.c
index 4828934b..ab394925 100644
--- a/modules/m_certfp.c
+++ b/modules/m_certfp.c
@@ -47,7 +47,7 @@ struct Message certfp_msgtab = {
 
 mapi_clist_av1 certfp_clist[] = { &certfp_msgtab, NULL };
 
-DECLARE_MODULE_AV1(certfp, NULL, NULL, certfp_clist, NULL, NULL, "$Revision$");
+DECLARE_MODULE_AV2(certfp, NULL, NULL, certfp_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
 ** me_certfp
diff --git a/modules/m_challenge.c b/modules/m_challenge.c
index 311b0fb7..b3410b88 100644
--- a/modules/m_challenge.c
+++ b/modules/m_challenge.c
@@ -67,7 +67,7 @@ static int	challenge_load(void)
 #endif
 }
 
-DECLARE_MODULE_AV1(challenge, challenge_load, NULL, NULL, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV2(challenge, challenge_load, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #else
 
 static int m_challenge(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
@@ -79,7 +79,7 @@ struct Message challenge_msgtab = {
 };
 
 mapi_clist_av1 challenge_clist[] = { &challenge_msgtab, NULL };
-DECLARE_MODULE_AV1(challenge, NULL, NULL, challenge_clist, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV2(challenge, NULL, NULL, challenge_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int generate_challenge(char **r_challenge, char **r_response, RSA * key);
 
diff --git a/modules/m_chghost.c b/modules/m_chghost.c
index 72e19622..20bf1bcc 100644
--- a/modules/m_chghost.c
+++ b/modules/m_chghost.c
@@ -45,7 +45,7 @@ struct Message chghost_msgtab = {
 
 mapi_clist_av1 chghost_clist[] = { &chghost_msgtab, &realhost_msgtab, NULL };
 
-DECLARE_MODULE_AV1(chghost, NULL, NULL, chghost_clist, NULL, NULL, "$Revision: 3424 $");
+DECLARE_MODULE_AV2(chghost, NULL, NULL, chghost_clist, NULL, NULL, NULL, NULL, NULL);
 
 /* clean_host()
  *
diff --git a/modules/m_close.c b/modules/m_close.c
index decfc6eb..b6b73202 100644
--- a/modules/m_close.c
+++ b/modules/m_close.c
@@ -39,7 +39,7 @@ struct Message close_msgtab = {
 };
 
 mapi_clist_av1 close_clist[] = { &close_msgtab, NULL };
-DECLARE_MODULE_AV1(close, NULL, NULL, close_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(close, NULL, NULL, close_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * mo_close - CLOSE message handler
diff --git a/modules/m_cmessage.c b/modules/m_cmessage.c
index 4b405148..66e19fc6 100644
--- a/modules/m_cmessage.c
+++ b/modules/m_cmessage.c
@@ -72,7 +72,7 @@ struct Message cnotice_msgtab = {
 };
 
 mapi_clist_av1 cmessage_clist[] = { &cprivmsg_msgtab, &cnotice_msgtab, NULL };
-DECLARE_MODULE_AV1(cmessage, _modinit, _moddeinit, cmessage_clist, NULL, NULL, "$Revision: 1543 $");
+DECLARE_MODULE_AV2(cmessage, _modinit, _moddeinit, cmessage_clist, NULL, NULL, NULL, NULL, NULL);
 
 #define PRIVMSG 0
 #define NOTICE 1
diff --git a/modules/m_connect.c b/modules/m_connect.c
index 9171fc31..fd9bebc0 100644
--- a/modules/m_connect.c
+++ b/modules/m_connect.c
@@ -47,7 +47,7 @@ struct Message connect_msgtab = {
 };
 
 mapi_clist_av1 connect_clist[] = { &connect_msgtab, NULL };
-DECLARE_MODULE_AV1(connect, NULL, NULL, connect_clist, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV2(connect, NULL, NULL, connect_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * mo_connect - CONNECT command handler
diff --git a/modules/m_dline.c b/modules/m_dline.c
index 7cf5434f..fad28340 100644
--- a/modules/m_dline.c
+++ b/modules/m_dline.c
@@ -60,7 +60,7 @@ struct Message undline_msgtab = {
 
 mapi_clist_av1 dline_clist[] = { &dline_msgtab, &undline_msgtab, NULL };
 
-DECLARE_MODULE_AV1(dline, NULL, NULL, dline_clist, NULL, NULL, "$Revision$");
+DECLARE_MODULE_AV2(dline, NULL, NULL, dline_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int remove_temp_dline(struct ConfItem *);
 static int apply_dline(struct Client *, const char *, int, char *);
diff --git a/modules/m_encap.c b/modules/m_encap.c
index 434c28c7..814953c4 100644
--- a/modules/m_encap.c
+++ b/modules/m_encap.c
@@ -50,7 +50,7 @@ struct Message encap_msgtab = {
 };
 
 mapi_clist_av1 encap_clist[] = { &encap_msgtab, NULL };
-DECLARE_MODULE_AV1(encap, NULL, NULL, encap_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(encap, NULL, NULL, encap_clist, NULL, NULL, NULL, NULL, NULL);
 
 /* ms_encap()
  *
diff --git a/modules/m_etrace.c b/modules/m_etrace.c
index 1af6b4de..a2b551e8 100644
--- a/modules/m_etrace.c
+++ b/modules/m_etrace.c
@@ -83,7 +83,7 @@ _moddeinit(void)
 }
 
 mapi_clist_av1 etrace_clist[] = { &etrace_msgtab, &chantrace_msgtab, &masktrace_msgtab, NULL };
-DECLARE_MODULE_AV1(etrace, _modinit, _moddeinit, etrace_clist, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV2(etrace, _modinit, _moddeinit, etrace_clist, NULL, NULL, NULL, NULL, NULL);
 
 static void do_etrace(struct Client *source_p, int ipv4, int ipv6);
 static void do_etrace_full(struct Client *source_p);
diff --git a/modules/m_grant.c b/modules/m_grant.c
index 4198530e..fe41d1a1 100644
--- a/modules/m_grant.c
+++ b/modules/m_grant.c
@@ -26,7 +26,7 @@ struct Message grant_msgtab = {
 
 mapi_clist_av1 grant_clist[] = { &grant_msgtab, NULL };
 
-DECLARE_MODULE_AV1(grant, NULL, NULL, grant_clist, NULL, NULL, "$Revision$");
+DECLARE_MODULE_AV2(grant, NULL, NULL, grant_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int
 mo_grant(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
diff --git a/modules/m_help.c b/modules/m_help.c
index 364282cb..640a1cf3 100644
--- a/modules/m_help.c
+++ b/modules/m_help.c
@@ -51,7 +51,7 @@ struct Message uhelp_msgtab = {
 };
 
 mapi_clist_av1 help_clist[] = { &help_msgtab, &uhelp_msgtab, NULL };
-DECLARE_MODULE_AV1(help, NULL, NULL, help_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(help, NULL, NULL, help_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * m_help - HELP message handler
diff --git a/modules/m_info.c b/modules/m_info.c
index 66095d21..2e4f7f5a 100644
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -60,7 +60,7 @@ mapi_hlist_av1 info_hlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(info, NULL, NULL, info_clist, info_hlist, NULL, "$Revision: 3396 $");
+DECLARE_MODULE_AV2(info, NULL, NULL, info_clist, info_hlist, NULL, NULL, NULL, NULL);
 
 /*
  * jdc -- Structure for our configuration value table
diff --git a/modules/m_invite.c b/modules/m_invite.c
index 3b7f4825..f9abe46c 100644
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -61,7 +61,7 @@ invite_moddeinit(void)
 	capability_orphan(cli_capindex, "invite-notify");
 }
 
-DECLARE_MODULE_AV1(invite, invite_modinit, invite_moddeinit, invite_clist, NULL, NULL, "$Revision: 3438 $");
+DECLARE_MODULE_AV2(invite, invite_modinit, invite_moddeinit, invite_clist, NULL, NULL, NULL, NULL, NULL);
 
 static void add_invite(struct Channel *, struct Client *);
 
diff --git a/modules/m_ison.c b/modules/m_ison.c
index 0645a7b2..d6f4c0a7 100644
--- a/modules/m_ison.c
+++ b/modules/m_ison.c
@@ -45,7 +45,7 @@ struct Message ison_msgtab = {
 };
 
 mapi_clist_av1 ison_clist[] = { &ison_msgtab, NULL };
-DECLARE_MODULE_AV1(ison, NULL, NULL, ison_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(ison, NULL, NULL, ison_clist, NULL, NULL, NULL, NULL, NULL);
 
 static char buf[BUFSIZE];
 static char buf2[BUFSIZE];
diff --git a/modules/m_kline.c b/modules/m_kline.c
index b43efe8b..0377bd53 100644
--- a/modules/m_kline.c
+++ b/modules/m_kline.c
@@ -63,7 +63,7 @@ struct Message unkline_msgtab = {
 
 mapi_clist_av1 kline_clist[] = { &kline_msgtab, &unkline_msgtab, NULL };
 
-DECLARE_MODULE_AV1(kline, NULL, NULL, kline_clist, NULL, NULL, "$Revision$");
+DECLARE_MODULE_AV2(kline, NULL, NULL, kline_clist, NULL, NULL, NULL, NULL, NULL);
 
 /* Local function prototypes */
 static int find_user_host(struct Client *source_p, const char *userhost, char *user, char *host);
diff --git a/modules/m_knock.c b/modules/m_knock.c
index ef6bf97b..aae86dc4 100644
--- a/modules/m_knock.c
+++ b/modules/m_knock.c
@@ -57,7 +57,7 @@ _moddeinit(void)
 }
 
 mapi_clist_av1 knock_clist[] = { &knock_msgtab, NULL };
-DECLARE_MODULE_AV1(knock, _modinit, _moddeinit, knock_clist, NULL, NULL, "$Revision: 3570 $");
+DECLARE_MODULE_AV2(knock, _modinit, _moddeinit, knock_clist, NULL, NULL, NULL, NULL, NULL);
 
 /* m_knock
  *    parv[1] = channel
diff --git a/modules/m_links.c b/modules/m_links.c
index a4a4ef06..29c759f5 100644
--- a/modules/m_links.c
+++ b/modules/m_links.c
@@ -54,7 +54,7 @@ mapi_hlist_av1 links_hlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(links, NULL, NULL, links_clist, links_hlist, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(links, NULL, NULL, links_clist, links_hlist, NULL, NULL, NULL, NULL);
 
 /*
  * m_links - LINKS message handler
diff --git a/modules/m_list.c b/modules/m_list.c
index 2e15147e..80f9d9da 100644
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -81,7 +81,7 @@ mapi_hfn_list_av1 list_hfnlist[] = {
 	{NULL, NULL}
 };
 
-DECLARE_MODULE_AV1(list, _modinit, _moddeinit, list_clist, NULL, list_hfnlist, "$Revision: 3372 $");
+DECLARE_MODULE_AV2(list, _modinit, _moddeinit, list_clist, NULL, list_hfnlist, NULL, NULL, NULL);
 
 static struct ev_entry *iterate_clients_ev = NULL;
 
diff --git a/modules/m_locops.c b/modules/m_locops.c
index c9bda46a..29bb7570 100644
--- a/modules/m_locops.c
+++ b/modules/m_locops.c
@@ -47,7 +47,7 @@ struct Message locops_msgtab = {
 };
 
 mapi_clist_av1 locops_clist[] = { &locops_msgtab, NULL };
-DECLARE_MODULE_AV1(locops, NULL, NULL, locops_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(locops, NULL, NULL, locops_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * m_locops - LOCOPS message handler
diff --git a/modules/m_lusers.c b/modules/m_lusers.c
index ae03e10d..7816066e 100644
--- a/modules/m_lusers.c
+++ b/modules/m_lusers.c
@@ -43,7 +43,7 @@ struct Message lusers_msgtab = {
 };
 
 mapi_clist_av1 lusers_clist[] = { &lusers_msgtab, NULL };
-DECLARE_MODULE_AV1(lusers, NULL, NULL, lusers_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(lusers, NULL, NULL, lusers_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * m_lusers - LUSERS message handler
diff --git a/modules/m_map.c b/modules/m_map.c
index ba2bd442..ed7bcc56 100644
--- a/modules/m_map.c
+++ b/modules/m_map.c
@@ -39,7 +39,7 @@ struct Message map_msgtab = {
 };
 
 mapi_clist_av1 map_clist[] = { &map_msgtab, NULL };
-DECLARE_MODULE_AV1(map, NULL, NULL, map_clist, NULL, NULL, "$Revision: 3368 $");
+DECLARE_MODULE_AV2(map, NULL, NULL, map_clist, NULL, NULL, NULL, NULL, NULL);
 
 static void dump_map(struct Client *client_p, struct Client *root, char *pbuf);
 static void flattened_map(struct Client *client_p);
diff --git a/modules/m_monitor.c b/modules/m_monitor.c
index 2c215d09..2a26af86 100644
--- a/modules/m_monitor.c
+++ b/modules/m_monitor.c
@@ -49,7 +49,7 @@ struct Message monitor_msgtab = {
 };
 
 mapi_clist_av1 monitor_clist[] = { &monitor_msgtab, NULL };
-DECLARE_MODULE_AV1(monitor, monitor_init, monitor_deinit, monitor_clist, NULL, NULL, "$Revision: 312 $");
+DECLARE_MODULE_AV2(monitor, monitor_init, monitor_deinit, monitor_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int monitor_init(void)
 {
diff --git a/modules/m_motd.c b/modules/m_motd.c
index 47cfd4d7..b81c8e98 100644
--- a/modules/m_motd.c
+++ b/modules/m_motd.c
@@ -52,7 +52,7 @@ mapi_hlist_av1 motd_hlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(motd, NULL, NULL, motd_clist, motd_hlist, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(motd, NULL, NULL, motd_clist, motd_hlist, NULL, NULL, NULL, NULL);
 
 static void motd_spy(struct Client *);
 
diff --git a/modules/m_names.c b/modules/m_names.c
index 1b31d9b8..c4c755fc 100644
--- a/modules/m_names.c
+++ b/modules/m_names.c
@@ -45,7 +45,7 @@ struct Message names_msgtab = {
 };
 
 mapi_clist_av1 names_clist[] = { &names_msgtab, NULL };
-DECLARE_MODULE_AV1(names, NULL, NULL, names_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(names, NULL, NULL, names_clist, NULL, NULL, NULL, NULL, NULL);
 
 static void names_global(struct Client *source_p);
 
diff --git a/modules/m_oper.c b/modules/m_oper.c
index 724ebf6b..62e94ffc 100644
--- a/modules/m_oper.c
+++ b/modules/m_oper.c
@@ -47,7 +47,7 @@ struct Message oper_msgtab = {
 };
 
 mapi_clist_av1 oper_clist[] = { &oper_msgtab, NULL };
-DECLARE_MODULE_AV1(oper, NULL, NULL, oper_clist, NULL, NULL, "$Revision: 1483 $");
+DECLARE_MODULE_AV2(oper, NULL, NULL, oper_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int match_oper_password(const char *password, struct oper_conf *oper_p);
 
diff --git a/modules/m_operspy.c b/modules/m_operspy.c
index 8f9cbe0b..b5e3250b 100644
--- a/modules/m_operspy.c
+++ b/modules/m_operspy.c
@@ -51,7 +51,7 @@ struct Message operspy_msgtab = {
 };
 
 mapi_clist_av1 operspy_clist[] = { &operspy_msgtab, NULL };
-DECLARE_MODULE_AV1(operspy, NULL, NULL, operspy_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(operspy, NULL, NULL, operspy_clist, NULL, NULL, NULL, NULL, NULL);
 
 /* ms_operspy()
  *
diff --git a/modules/m_pass.c b/modules/m_pass.c
index 7f8037d2..9dc36c06 100644
--- a/modules/m_pass.c
+++ b/modules/m_pass.c
@@ -43,7 +43,7 @@ struct Message pass_msgtab = {
 };
 
 mapi_clist_av1 pass_clist[] = { &pass_msgtab, NULL };
-DECLARE_MODULE_AV1(pass, NULL, NULL, pass_clist, NULL, NULL, "$Revision: 3550 $");
+DECLARE_MODULE_AV2(pass, NULL, NULL, pass_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * m_pass() - Added Sat, 4 March 1989
diff --git a/modules/m_ping.c b/modules/m_ping.c
index 6d3bac07..1d9f87a3 100644
--- a/modules/m_ping.c
+++ b/modules/m_ping.c
@@ -44,7 +44,7 @@ struct Message ping_msgtab = {
 };
 
 mapi_clist_av1 ping_clist[] = { &ping_msgtab, NULL };
-DECLARE_MODULE_AV1(ping, NULL, NULL, ping_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(ping, NULL, NULL, ping_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
 ** m_ping
diff --git a/modules/m_pong.c b/modules/m_pong.c
index 6630a831..b09b68f5 100644
--- a/modules/m_pong.c
+++ b/modules/m_pong.c
@@ -47,7 +47,7 @@ struct Message pong_msgtab = {
 };
 
 mapi_clist_av1 pong_clist[] = { &pong_msgtab, NULL };
-DECLARE_MODULE_AV1(pong, NULL, NULL, pong_clist, NULL, NULL, "$Revision: 3181 $");
+DECLARE_MODULE_AV2(pong, NULL, NULL, pong_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int
 ms_pong(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
diff --git a/modules/m_post.c b/modules/m_post.c
index 98aa6e4a..91d95bf4 100644
--- a/modules/m_post.c
+++ b/modules/m_post.c
@@ -52,7 +52,7 @@ struct Message put_msgtab = {
 mapi_clist_av1 post_clist[] = {
 	&post_msgtab, &get_msgtab, &put_msgtab, NULL
 };
-DECLARE_MODULE_AV1(post, NULL, NULL, post_clist, NULL, NULL, "$Revision: 498 $");
+DECLARE_MODULE_AV2(post, NULL, NULL, post_clist, NULL, NULL, NULL, NULL, NULL);
 
 
 /*
diff --git a/modules/m_privs.c b/modules/m_privs.c
index 9ac1af1a..eb8b3908 100644
--- a/modules/m_privs.c
+++ b/modules/m_privs.c
@@ -73,7 +73,7 @@ static struct mode_table auth_client_table[] = {
 	{NULL, 0}
 };
 
-DECLARE_MODULE_AV1(privs, NULL, NULL, privs_clist, NULL, NULL, "");
+DECLARE_MODULE_AV2(privs, NULL, NULL, privs_clist, NULL, NULL, NULL, NULL, NULL);
 
 static void show_privs(struct Client *source_p, struct Client *target_p)
 {
diff --git a/modules/m_rehash.c b/modules/m_rehash.c
index 0f491653..2dd96bc5 100644
--- a/modules/m_rehash.c
+++ b/modules/m_rehash.c
@@ -53,7 +53,7 @@ struct Message rehash_msgtab = {
 };
 
 mapi_clist_av1 rehash_clist[] = { &rehash_msgtab, NULL };
-DECLARE_MODULE_AV1(rehash, NULL, NULL, rehash_clist, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV2(rehash, NULL, NULL, rehash_clist, NULL, NULL, NULL, NULL, NULL);
 
 struct hash_commands
 {
diff --git a/modules/m_restart.c b/modules/m_restart.c
index 9def4d7d..de229c69 100644
--- a/modules/m_restart.c
+++ b/modules/m_restart.c
@@ -48,7 +48,7 @@ struct Message restart_msgtab = {
 };
 
 mapi_clist_av1 restart_clist[] = { &restart_msgtab, NULL };
-DECLARE_MODULE_AV1(restart, NULL, NULL, restart_clist, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV2(restart, NULL, NULL, restart_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * mo_restart
diff --git a/modules/m_resv.c b/modules/m_resv.c
index 7bc31644..9d73c8eb 100644
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -57,7 +57,7 @@ struct Message unresv_msgtab = {
 
 mapi_clist_av1 resv_clist[] = { &resv_msgtab, &unresv_msgtab, NULL };
 
-DECLARE_MODULE_AV1(resv, NULL, NULL, resv_clist, NULL, NULL, "$Revision$");
+DECLARE_MODULE_AV2(resv, NULL, NULL, resv_clist, NULL, NULL, NULL, NULL, NULL);
 
 static void parse_resv(struct Client *source_p, const char *name,
 		       const char *reason, int temp_time, int propagated);
diff --git a/modules/m_sasl.c b/modules/m_sasl.c
index 514497f8..6feec890 100644
--- a/modules/m_sasl.c
+++ b/modules/m_sasl.c
@@ -115,7 +115,7 @@ _moddeinit(void)
 	capability_orphan(cli_capindex, "sasl");
 }
 
-DECLARE_MODULE_AV1(sasl, _modinit, _moddeinit, sasl_clist, NULL, sasl_hfnlist, "$Revision: 1409 $");
+DECLARE_MODULE_AV2(sasl, _modinit, _moddeinit, sasl_clist, NULL, sasl_hfnlist, NULL, NULL, NULL);
 
 static int
 m_authenticate(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
diff --git a/modules/m_scan.c b/modules/m_scan.c
index ea730603..681990ea 100644
--- a/modules/m_scan.c
+++ b/modules/m_scan.c
@@ -59,7 +59,7 @@ struct Message scan_msgtab = {
 };
 
 mapi_clist_av1 scan_clist[] = { &scan_msgtab, NULL };
-DECLARE_MODULE_AV1(scan, NULL, NULL, scan_clist, NULL, NULL, "$Revision: 1853 $");
+DECLARE_MODULE_AV2(scan, NULL, NULL, scan_clist, NULL, NULL, NULL, NULL, NULL);
 
 typedef int (*scan_handler)(struct MsgBuf *, struct Client *, struct Client *, int,
 	const char **);
diff --git a/modules/m_services.c b/modules/m_services.c
index 1bb45333..3b7e0475 100644
--- a/modules/m_services.c
+++ b/modules/m_services.c
@@ -94,7 +94,7 @@ mapi_hfn_list_av1 services_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(services, _modinit, _moddeinit, services_clist, NULL, services_hfnlist, "$Revision: 1907 $");
+DECLARE_MODULE_AV2(services, _modinit, _moddeinit, services_clist, NULL, services_hfnlist, NULL, NULL, NULL);
 
 static int
 _modinit(void)
diff --git a/modules/m_set.c b/modules/m_set.c
index ffae83fc..a2e5059b 100644
--- a/modules/m_set.c
+++ b/modules/m_set.c
@@ -47,7 +47,7 @@ struct Message set_msgtab = {
 };
 
 mapi_clist_av1 set_clist[] = { &set_msgtab, NULL };
-DECLARE_MODULE_AV1(set, NULL, NULL, set_clist, NULL, NULL, "$Revision: 3406 $");
+DECLARE_MODULE_AV2(set, NULL, NULL, set_clist, NULL, NULL, NULL, NULL, NULL);
 
 /* Structure used for the SET table itself */
 struct SetStruct
diff --git a/modules/m_signon.c b/modules/m_signon.c
index 003655c4..20f6b42a 100644
--- a/modules/m_signon.c
+++ b/modules/m_signon.c
@@ -67,7 +67,7 @@ mapi_clist_av1 signon_clist[] = {
 	&svslogin_msgtab, &signon_msgtab, NULL
 };
 
-DECLARE_MODULE_AV1(signon, NULL, NULL, signon_clist, NULL, NULL, "$Revision: 1192 $");
+DECLARE_MODULE_AV2(signon, NULL, NULL, signon_clist, NULL, NULL, NULL, NULL, NULL);
 
 #define NICK_VALID	1
 #define USER_VALID	2
diff --git a/modules/m_snote.c b/modules/m_snote.c
index e5320fcc..a381e380 100644
--- a/modules/m_snote.c
+++ b/modules/m_snote.c
@@ -56,7 +56,7 @@ struct Message snote_msgtab = {
 };
 
 mapi_clist_av1 snote_clist[] = { &snote_msgtab, NULL };
-DECLARE_MODULE_AV1(snote, NULL, NULL, snote_clist, NULL, NULL, "$Revision: 623 $");
+DECLARE_MODULE_AV2(snote, NULL, NULL, snote_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * me_snote
diff --git a/modules/m_starttls.c b/modules/m_starttls.c
index 8d8bb8be..3a152104 100644
--- a/modules/m_starttls.c
+++ b/modules/m_starttls.c
@@ -61,7 +61,7 @@ _moddeinit(void)
 #endif
 }
 
-DECLARE_MODULE_AV1(starttls, _modinit, _moddeinit, starttls_clist, NULL, NULL, "$Revision$");
+DECLARE_MODULE_AV2(starttls, _modinit, _moddeinit, starttls_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int
 mr_starttls(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
diff --git a/modules/m_stats.c b/modules/m_stats.c
index 261cd002..50fc2b40 100644
--- a/modules/m_stats.c
+++ b/modules/m_stats.c
@@ -66,7 +66,7 @@ mapi_hlist_av1 stats_hlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(stats, NULL, NULL, stats_clist, stats_hlist, NULL, "$Revision: 1608 $");
+DECLARE_MODULE_AV2(stats, NULL, NULL, stats_clist, stats_hlist, NULL, NULL, NULL, NULL);
 
 const char *Lformat = "%s %u %u %u %u %u :%u %u %s";
 
diff --git a/modules/m_svinfo.c b/modules/m_svinfo.c
index 98e50cca..9e2d07ba 100644
--- a/modules/m_svinfo.c
+++ b/modules/m_svinfo.c
@@ -43,7 +43,7 @@ struct Message svinfo_msgtab = {
 };
 
 mapi_clist_av1 svinfo_clist[] = { &svinfo_msgtab, NULL };
-DECLARE_MODULE_AV1(svinfo, NULL, NULL, svinfo_clist, NULL, NULL, "$Revision: 494 $");
+DECLARE_MODULE_AV2(svinfo, NULL, NULL, svinfo_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * ms_svinfo - SVINFO message handler
diff --git a/modules/m_tb.c b/modules/m_tb.c
index 50b8c696..769f773f 100644
--- a/modules/m_tb.c
+++ b/modules/m_tb.c
@@ -56,7 +56,7 @@ struct Message etb_msgtab = {
 };
 
 mapi_clist_av1 tb_clist[] =  { &tb_msgtab, &etb_msgtab, NULL };
-DECLARE_MODULE_AV1(tb, NULL, NULL, tb_clist, NULL, NULL, "$Revision: 1349 $");
+DECLARE_MODULE_AV2(tb, NULL, NULL, tb_clist, NULL, NULL, NULL, NULL, NULL);
 
 /* m_tb()
  *
diff --git a/modules/m_testline.c b/modules/m_testline.c
index d2285338..302ec86e 100644
--- a/modules/m_testline.c
+++ b/modules/m_testline.c
@@ -52,7 +52,7 @@ struct Message testgecos_msgtab = {
 };
 
 mapi_clist_av1 testline_clist[] = { &testline_msgtab, &testgecos_msgtab, NULL };
-DECLARE_MODULE_AV1(testline, NULL, NULL, testline_clist, NULL, NULL, "$Revision: 3303 $");
+DECLARE_MODULE_AV2(testline, NULL, NULL, testline_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int
 mo_testline(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
diff --git a/modules/m_testmask.c b/modules/m_testmask.c
index 81ce62e2..c46b0e0e 100644
--- a/modules/m_testmask.c
+++ b/modules/m_testmask.c
@@ -55,7 +55,7 @@ struct Message testmask_msgtab = {
 };
 
 mapi_clist_av1 testmask_clist[] = { &testmask_msgtab, NULL };
-DECLARE_MODULE_AV1(testmask, NULL, NULL, testmask_clist, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV2(testmask, NULL, NULL, testmask_clist, NULL, NULL, NULL, NULL, NULL);
 
 static const char *empty_sockhost = "255.255.255.255";
 static const char *spoofed_sockhost = "0";
diff --git a/modules/m_tginfo.c b/modules/m_tginfo.c
index 0f3ab77b..06178ba6 100644
--- a/modules/m_tginfo.c
+++ b/modules/m_tginfo.c
@@ -48,7 +48,7 @@ struct Message tginfo_msgtab = {
 
 mapi_clist_av1 tginfo_clist[] = { &tginfo_msgtab, NULL };
 
-DECLARE_MODULE_AV1(tginfo, NULL, NULL, tginfo_clist, NULL, NULL, "$Revision$");
+DECLARE_MODULE_AV2(tginfo, NULL, NULL, tginfo_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
 ** me_tginfo
diff --git a/modules/m_time.c b/modules/m_time.c
index 547efb2e..a889dabc 100644
--- a/modules/m_time.c
+++ b/modules/m_time.c
@@ -43,7 +43,7 @@ struct Message time_msgtab = {
 };
 
 mapi_clist_av1 time_clist[] = { &time_msgtab, NULL };
-DECLARE_MODULE_AV1(time, NULL, NULL, time_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(time, NULL, NULL, time_clist, NULL, NULL, NULL, NULL, NULL);
 
 static const char *months[] = {
 	"January", "February", "March", "April",
diff --git a/modules/m_topic.c b/modules/m_topic.c
index 106c689f..ab292f79 100644
--- a/modules/m_topic.c
+++ b/modules/m_topic.c
@@ -50,7 +50,7 @@ struct Message topic_msgtab = {
 };
 
 mapi_clist_av1 topic_clist[] = { &topic_msgtab, NULL };
-DECLARE_MODULE_AV1(topic, NULL, NULL, topic_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(topic, NULL, NULL, topic_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * m_topic
diff --git a/modules/m_trace.c b/modules/m_trace.c
index b6aea27c..239b224d 100644
--- a/modules/m_trace.c
+++ b/modules/m_trace.c
@@ -56,7 +56,7 @@ mapi_hlist_av1 trace_hlist[] = {
 	{ "doing_trace",	&doing_trace_hook },
 	{ NULL, NULL }
 };
-DECLARE_MODULE_AV1(trace, NULL, NULL, trace_clist, trace_hlist, NULL, "$Revision: 3183 $");
+DECLARE_MODULE_AV2(trace, NULL, NULL, trace_clist, trace_hlist, NULL, NULL, NULL, NULL);
 
 static void count_downlinks(struct Client *server_p, int *pservcount, int *pusercount);
 static int report_this_status(struct Client *source_p, struct Client *target_p);
diff --git a/modules/m_unreject.c b/modules/m_unreject.c
index 475a83c9..bb9e8c54 100644
--- a/modules/m_unreject.c
+++ b/modules/m_unreject.c
@@ -38,7 +38,7 @@ struct Message unreject_msgtab = {
 };
 
 mapi_clist_av1 unreject_clist[] = { &unreject_msgtab, NULL };
-DECLARE_MODULE_AV1(unreject, NULL, NULL, unreject_clist, NULL, NULL, "$Revision: 3161 $");
+DECLARE_MODULE_AV2(unreject, NULL, NULL, unreject_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * mo_unreject
diff --git a/modules/m_user.c b/modules/m_user.c
index 982621ae..f3905789 100644
--- a/modules/m_user.c
+++ b/modules/m_user.c
@@ -44,7 +44,7 @@ struct Message user_msgtab = {
 };
 
 mapi_clist_av1 user_clist[] = { &user_msgtab, NULL };
-DECLARE_MODULE_AV1(user, NULL, NULL, user_clist, NULL, NULL, "$Revision: 3416 $");
+DECLARE_MODULE_AV2(user, NULL, NULL, user_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int do_local_user(struct Client *client_p, struct Client *source_p,
 			 const char *username, const char *realname);
diff --git a/modules/m_userhost.c b/modules/m_userhost.c
index 9eb63ead..8c745e89 100644
--- a/modules/m_userhost.c
+++ b/modules/m_userhost.c
@@ -44,7 +44,7 @@ struct Message userhost_msgtab = {
 };
 
 mapi_clist_av1 userhost_clist[] = { &userhost_msgtab, NULL };
-DECLARE_MODULE_AV1(userhost, NULL, NULL, userhost_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(userhost, NULL, NULL, userhost_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * m_userhost added by Darren Reed 13/8/91 to aid clients and reduce
diff --git a/modules/m_users.c b/modules/m_users.c
index 3cb718f3..d298c22d 100644
--- a/modules/m_users.c
+++ b/modules/m_users.c
@@ -41,7 +41,7 @@ struct Message users_msgtab = {
 };
 
 mapi_clist_av1 users_clist[] = { &users_msgtab, NULL };
-DECLARE_MODULE_AV1(users, NULL, NULL, users_clist, NULL, NULL, "$Revision: 254 $");
+DECLARE_MODULE_AV2(users, NULL, NULL, users_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * m_users
diff --git a/modules/m_version.c b/modules/m_version.c
index 667bfe16..13cdb360 100644
--- a/modules/m_version.c
+++ b/modules/m_version.c
@@ -45,7 +45,7 @@ struct Message version_msgtab = {
 };
 
 mapi_clist_av1 version_clist[] = { &version_msgtab, NULL };
-DECLARE_MODULE_AV1(version, NULL, NULL, version_clist, NULL, NULL, "$Revision: 1887 $");
+DECLARE_MODULE_AV2(version, NULL, NULL, version_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * m_version - VERSION command handler
diff --git a/modules/m_wallops.c b/modules/m_wallops.c
index 60ddba02..8e0ba6e9 100644
--- a/modules/m_wallops.c
+++ b/modules/m_wallops.c
@@ -50,7 +50,7 @@ struct Message operwall_msgtab = {
 };
 
 mapi_clist_av1 wallops_clist[] = { &wallops_msgtab, &operwall_msgtab, NULL };
-DECLARE_MODULE_AV1(wallops, NULL, NULL, wallops_clist, NULL, NULL, "$Revision: 1377 $");
+DECLARE_MODULE_AV2(wallops, NULL, NULL, wallops_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
  * mo_operwall (write to *all* opers currently online)
diff --git a/modules/m_who.c b/modules/m_who.c
index 95895c14..f70f2d0e 100644
--- a/modules/m_who.c
+++ b/modules/m_who.c
@@ -82,7 +82,7 @@ _moddeinit(void)
 }
 
 mapi_clist_av1 who_clist[] = { &who_msgtab, NULL };
-DECLARE_MODULE_AV1(who, _modinit, _moddeinit, who_clist, NULL, NULL, "$Revision: 3350 $");
+DECLARE_MODULE_AV2(who, _modinit, _moddeinit, who_clist, NULL, NULL, NULL, NULL, NULL);
 
 static void do_who_on_channel(struct Client *source_p, struct Channel *chptr,
 			      int server_oper, int member,
diff --git a/modules/m_whois.c b/modules/m_whois.c
index 904efd45..f419308c 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -68,7 +68,7 @@ mapi_hlist_av1 whois_hlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(whois, NULL, NULL, whois_clist, whois_hlist, NULL, "$Revision: 3536 $");
+DECLARE_MODULE_AV2(whois, NULL, NULL, whois_clist, whois_hlist, NULL, NULL, NULL, NULL);
 
 /*
  * m_whois
diff --git a/modules/m_whowas.c b/modules/m_whowas.c
index 929334bb..38107e93 100644
--- a/modules/m_whowas.c
+++ b/modules/m_whowas.c
@@ -47,7 +47,7 @@ struct Message whowas_msgtab = {
 };
 
 mapi_clist_av1 whowas_clist[] = { &whowas_msgtab, NULL };
-DECLARE_MODULE_AV1(whowas, NULL, NULL, whowas_clist, NULL, NULL, "$Revision: 1717 $");
+DECLARE_MODULE_AV2(whowas, NULL, NULL, whowas_clist, NULL, NULL, NULL, NULL, NULL);
 
 /*
 ** m_whowas
diff --git a/modules/m_xline.c b/modules/m_xline.c
index 50423715..ec5b246a 100644
--- a/modules/m_xline.c
+++ b/modules/m_xline.c
@@ -73,7 +73,7 @@ struct Message unxline_msgtab = {
 
 mapi_clist_av1 xline_clist[] = { &xline_msgtab, &unxline_msgtab, NULL };
 
-DECLARE_MODULE_AV1(xline, NULL, NULL, xline_clist, NULL, NULL, "$Revision$");
+DECLARE_MODULE_AV2(xline, NULL, NULL, xline_clist, NULL, NULL, NULL, NULL, NULL);
 
 static int valid_xline(struct Client *, const char *, const char *);
 static void apply_xline(struct Client *client_p, const char *name,
diff --git a/modules/sno_routing.c b/modules/sno_routing.c
index 1eb01cbf..98ee2878 100644
--- a/modules/sno_routing.c
+++ b/modules/sno_routing.c
@@ -45,7 +45,7 @@ mapi_hfn_list_av1 nn_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(networknotice, NULL, NULL, NULL, NULL, nn_hfnlist, "$Revision: 1172 $");
+DECLARE_MODULE_AV2(networknotice, NULL, NULL, NULL, NULL, nn_hfnlist, NULL, NULL, NULL);
 
 /*
  * count_mark_downlinks