Add MODULE_INIT to all modules, fix a few various crashes.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1273 5417fbe8-f217-4b02-8779-1006273d7864

142 files changed, 299 insertions, 13 deletions

diff --git a/src/core/bs_act.c b/src/core/bs_act.c
index 1f92b7e42..ff33c9955 100644
--- a/src/core/bs_act.c
+++ b/src/core/bs_act.c
@@ -90,3 +90,5 @@ int do_act(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_act")
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c
index fe07bace1..37e6d3b45 100644
--- a/src/core/bs_assign.c
+++ b/src/core/bs_assign.c
@@ -93,3 +93,5 @@ int do_assign(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_assign")
diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c
index 1ba1aa97c..cc6147a9f 100644
--- a/src/core/bs_badwords.c
+++ b/src/core/bs_badwords.c
@@ -324,3 +324,5 @@ int badwords_list_callback(User * u, int num, va_list args)
         return 0;
     return badwords_list(u, num - 1, ci, sent_header);
 }
+
+MODULE_INIT("bs_badwords")
diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 17f237be6..3701bf662 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -360,3 +360,5 @@ int delbot(BotInfo * bi)
     return 1;
 }
 
+
+MODULE_INIT("bs_bot")
diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c
index 9e0fb9d45..4a6efa014 100644
--- a/src/core/bs_botlist.c
+++ b/src/core/bs_botlist.c
@@ -106,3 +106,5 @@ int do_botlist(User * u)
         notice_lang(s_BotServ, u, BOT_BOTLIST_FOOTER, count);
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_botlist")
diff --git a/src/core/bs_fantasy.c b/src/core/bs_fantasy.c
index c63d139b1..1a0a1a7d5 100644
--- a/src/core/bs_fantasy.c
+++ b/src/core/bs_fantasy.c
@@ -87,3 +87,5 @@ int do_fantasy(int argc, char **argv)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_fantasy")
diff --git a/src/core/bs_fantasy_kick.c b/src/core/bs_fantasy_kick.c
index d8f272e8a..f9f1af797 100644
--- a/src/core/bs_fantasy_kick.c
+++ b/src/core/bs_fantasy_kick.c
@@ -96,3 +96,5 @@ int do_fantasy(int argc, char **argv)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_fantasy_kick")
diff --git a/src/core/bs_fantasy_kickban.c b/src/core/bs_fantasy_kickban.c
index 4cb64f116..526dfb9a1 100644
--- a/src/core/bs_fantasy_kickban.c
+++ b/src/core/bs_fantasy_kickban.c
@@ -97,3 +97,5 @@ int do_fantasy(int argc, char **argv)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_fantasy_kickban")
diff --git a/src/core/bs_fantasy_owner.c b/src/core/bs_fantasy_owner.c
index 934d3ccca..8ff8c2842 100644
--- a/src/core/bs_fantasy_owner.c
+++ b/src/core/bs_fantasy_owner.c
@@ -86,3 +86,5 @@ int do_fantasy(int argc, char **argv)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_fantasy_owner")
diff --git a/src/core/bs_fantasy_seen.c b/src/core/bs_fantasy_seen.c
index 75abdd26b..5703d9e9a 100644
--- a/src/core/bs_fantasy_seen.c
+++ b/src/core/bs_fantasy_seen.c
@@ -137,3 +137,5 @@ int do_fantasy(int argc, char **argv)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_fantasy_seen")
diff --git a/src/core/bs_help.c b/src/core/bs_help.c
index 7d34ef705..c2e890ad2 100644
--- a/src/core/bs_help.c
+++ b/src/core/bs_help.c
@@ -65,3 +65,5 @@ int do_help(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_help")
diff --git a/src/core/bs_info.c b/src/core/bs_info.c
index fe9d40a11..7de46e17c 100644
--- a/src/core/bs_info.c
+++ b/src/core/bs_info.c
@@ -280,3 +280,5 @@ void send_bot_channels(User * u, BotInfo * bi)
         notice_user(s_BotServ, u, buf);
     return;
 }
+
+MODULE_INIT("bs_info")
diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c
index 22a1e72c9..98ec85ab5 100644
--- a/src/core/bs_kick.c
+++ b/src/core/bs_kick.c
@@ -377,3 +377,5 @@ int do_kickcmd(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_kick")
diff --git a/src/core/bs_say.c b/src/core/bs_say.c
index 508efe320..06a9497ce 100644
--- a/src/core/bs_say.c
+++ b/src/core/bs_say.c
@@ -95,3 +95,5 @@ int do_say(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_say")
diff --git a/src/core/bs_set.c b/src/core/bs_set.c
index 08d12ec23..37cd7ac6d 100644
--- a/src/core/bs_set.c
+++ b/src/core/bs_set.c
@@ -206,3 +206,5 @@ int do_set(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_set")
diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c
index 3dcb15506..12804dcd5 100644
--- a/src/core/bs_unassign.c
+++ b/src/core/bs_unassign.c
@@ -87,3 +87,5 @@ int do_unassign(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_unassign")
diff --git a/src/core/cs_access.c b/src/core/cs_access.c
index d545eb97e..5d1621972 100644
--- a/src/core/cs_access.c
+++ b/src/core/cs_access.c
@@ -541,3 +541,5 @@ int do_levels(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_access")
diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c
index 0787065a4..2c1e050d6 100644
--- a/src/core/cs_akick.c
+++ b/src/core/cs_akick.c
@@ -667,3 +667,5 @@ int get_access_nc(NickCore *nc, ChannelInfo *ci)
 }
 
 /* EOF */
+
+MODULE_INIT("cs_akick")
diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c
index 3031d461e..fa8b9ee97 100644
--- a/src/core/cs_ban.c
+++ b/src/core/cs_ban.c
@@ -226,3 +226,5 @@ int do_unban(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_ban")
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index 4d7cb56da..5c9dbc871 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -370,3 +370,5 @@ int do_clear(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_clear")
diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c
index dff5992e9..045594209 100644
--- a/src/core/cs_drop.c
+++ b/src/core/cs_drop.c
@@ -126,3 +126,5 @@ int do_drop(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_drop")
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index 1fd71a040..320c8a32b 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -137,3 +137,5 @@ int do_forbid(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_forbid")
diff --git a/src/core/cs_getkey.c b/src/core/cs_getkey.c
index e869e795e..2fe928c43 100644
--- a/src/core/cs_getkey.c
+++ b/src/core/cs_getkey.c
@@ -86,3 +86,5 @@ int do_getkey(User * u)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_getkey")
diff --git a/src/core/cs_getpass.c b/src/core/cs_getpass.c
index 458488cf0..df2ce9b2d 100644
--- a/src/core/cs_getpass.c
+++ b/src/core/cs_getpass.c
@@ -100,3 +100,5 @@ int do_getpass(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_getpass")
diff --git a/src/core/cs_help.c b/src/core/cs_help.c
index 208009038..8b7449c3d 100644
--- a/src/core/cs_help.c
+++ b/src/core/cs_help.c
@@ -82,3 +82,5 @@ int do_help(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_help")
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index 1ca12d75c..c8fad675e 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -115,3 +115,5 @@ int do_identify(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_identify")
diff --git a/src/core/cs_info.c b/src/core/cs_info.c
index 0be9a8854..58972a0b3 100644
--- a/src/core/cs_info.c
+++ b/src/core/cs_info.c
@@ -247,3 +247,5 @@ int do_info(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_info")
diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c
index a5b76fce2..60e92fb80 100644
--- a/src/core/cs_invite.c
+++ b/src/core/cs_invite.c
@@ -88,3 +88,5 @@ int do_invite(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_invite")
diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c
index 226086fdf..4d73ee5ba 100644
--- a/src/core/cs_kick.c
+++ b/src/core/cs_kick.c
@@ -150,3 +150,5 @@ int do_cs_kick(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_kick")
diff --git a/src/core/cs_list.c b/src/core/cs_list.c
index 664cb9339..b7b477744 100644
--- a/src/core/cs_list.c
+++ b/src/core/cs_list.c
@@ -197,3 +197,5 @@ int do_list(User * u)
     return MOD_CONT;
 
 }
+
+MODULE_INIT("cs_list")
diff --git a/src/core/cs_logout.c b/src/core/cs_logout.c
index e11a1ac8f..fff40ed4e 100644
--- a/src/core/cs_logout.c
+++ b/src/core/cs_logout.c
@@ -126,3 +126,5 @@ void make_unidentified(User * u, ChannelInfo * ci)
         }
     }
 }
+
+MODULE_INIT("cs_logout")
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index 7d3800ba4..ab8e82d4a 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -386,3 +386,5 @@ int do_util(User * u, CSModeUtil * util)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_modes")
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index 40935ad6e..3b11bef3b 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -190,3 +190,5 @@ int do_register(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_register")
diff --git a/src/core/cs_sendpass.c b/src/core/cs_sendpass.c
index ff3bb1cff..ac858f1a6 100644
--- a/src/core/cs_sendpass.c
+++ b/src/core/cs_sendpass.c
@@ -123,3 +123,5 @@ int do_sendpass(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_sendpass")
diff --git a/src/core/cs_set.c b/src/core/cs_set.c
index ccdf1e9bb..0616e933b 100644
--- a/src/core/cs_set.c
+++ b/src/core/cs_set.c
@@ -835,3 +835,5 @@ int do_set_noexpire(User * u, ChannelInfo * ci, char *param)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_set")
diff --git a/src/core/cs_status.c b/src/core/cs_status.c
index b52efbcdb..8da8efce0 100644
--- a/src/core/cs_status.c
+++ b/src/core/cs_status.c
@@ -100,3 +100,5 @@ int do_status(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_status")
diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c
index 30684243d..43ac256da 100644
--- a/src/core/cs_suspend.c
+++ b/src/core/cs_suspend.c
@@ -209,3 +209,5 @@ int do_unsuspend(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_suspend")
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index dd5a15cb8..b117d3d35 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -117,3 +117,5 @@ int do_cs_topic(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_topic")
diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c
index fc06397ed..4d8031106 100644
--- a/src/core/cs_xop.c
+++ b/src/core/cs_xop.c
@@ -507,3 +507,5 @@ int do_xop(User * u, char *xname, int xlev, int *xmsgs)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("cs_xop")
diff --git a/src/core/enc_md5.c b/src/core/enc_md5.c
index 3238adb4a..cda7b3393 100644
--- a/src/core/enc_md5.c
+++ b/src/core/enc_md5.c
@@ -411,3 +411,5 @@ void AnopeFini(void) {
 
 /*************************************************************************/
 
+
+MODULE_INIT("enc_md5")
diff --git a/src/core/enc_none.c b/src/core/enc_none.c
index 871a85620..babf8b56c 100644
--- a/src/core/enc_none.c
+++ b/src/core/enc_none.c
@@ -76,3 +76,5 @@ int plain_check_password(const char *plaintext, const char *password) {
 
 /* EOF */
 
+
+MODULE_INIT("enc_none")
diff --git a/src/core/enc_old.c b/src/core/enc_old.c
index 77c1964c0..77929f468 100644
--- a/src/core/enc_old.c
+++ b/src/core/enc_old.c
@@ -435,3 +435,5 @@ void AnopeFini(void) {
 
 /*************************************************************************/
 
+
+MODULE_INIT("enc_old")
diff --git a/src/core/enc_sha1.c b/src/core/enc_sha1.c
index f4384dadf..8286c9cbe 100644
--- a/src/core/enc_sha1.c
+++ b/src/core/enc_sha1.c
@@ -273,3 +273,5 @@ void AnopeFini(void) {
 
 /* EOF */
 
+
+MODULE_INIT("enc_sha1")
diff --git a/src/core/he_help.c b/src/core/he_help.c
index 220df6455..0739e92b2 100644
--- a/src/core/he_help.c
+++ b/src/core/he_help.c
@@ -74,3 +74,5 @@ int do_help(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("he_help")
diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index 73af8cc22..5c12457b9 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -89,3 +89,5 @@ int do_del(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("hs_del")
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index b3b1b9378..e5eee9a6f 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -94,3 +94,5 @@ int do_delall(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("hs_delall")
diff --git a/src/core/hs_group.c b/src/core/hs_group.c
index d5dbf67b0..3946fcc94 100644
--- a/src/core/hs_group.c
+++ b/src/core/hs_group.c
@@ -122,3 +122,5 @@ int do_group(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("hs_group")
diff --git a/src/core/hs_help.c b/src/core/hs_help.c
index f237016de..008d62082 100644
--- a/src/core/hs_help.c
+++ b/src/core/hs_help.c
@@ -64,3 +64,5 @@ int do_help(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("hs_help")
diff --git a/src/core/hs_list.c b/src/core/hs_list.c
index 59a7fd8ae..68c1f6be4 100644
--- a/src/core/hs_list.c
+++ b/src/core/hs_list.c
@@ -185,3 +185,5 @@ int listOut(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("hs_list")
diff --git a/src/core/hs_off.c b/src/core/hs_off.c
index c2ce6c498..8b4e1d4a3 100644
--- a/src/core/hs_off.c
+++ b/src/core/hs_off.c
@@ -85,3 +85,5 @@ int do_off(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("hs_off")
diff --git a/src/core/hs_on.c b/src/core/hs_on.c
index 9ce692377..6ff31d0a7 100644
--- a/src/core/hs_on.c
+++ b/src/core/hs_on.c
@@ -100,3 +100,5 @@ int do_on(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("hs_on")
diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index 3bace055e..26a9141dd 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -176,3 +176,5 @@ int myDoSet(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("hs_set")
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index bd398823e..902112663 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -178,3 +178,5 @@ int do_setall(User * u)
     free(hostmask);
     return MOD_CONT;
 }
+
+MODULE_INIT("hs_setall")
diff --git a/src/core/ms_cancel.c b/src/core/ms_cancel.c
index 568a05310..ceda631df 100644
--- a/src/core/ms_cancel.c
+++ b/src/core/ms_cancel.c
@@ -103,3 +103,5 @@ int do_cancel(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ms_cancel")
diff --git a/src/core/ms_check.c b/src/core/ms_check.c
index 661a5c1ab..1cc755232 100644
--- a/src/core/ms_check.c
+++ b/src/core/ms_check.c
@@ -116,3 +116,5 @@ int do_memocheck(User * u)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("ms_check")
diff --git a/src/core/ms_del.c b/src/core/ms_del.c
index f8a294f3e..4bc32630c 100644
--- a/src/core/ms_del.c
+++ b/src/core/ms_del.c
@@ -200,3 +200,5 @@ int del_memo_callback(User * u, int num, va_list args)
         return 0;
     }
 }
+
+MODULE_INIT("ms_del")
diff --git a/src/core/ms_help.c b/src/core/ms_help.c
index 7b49aa43c..470b74e60 100644
--- a/src/core/ms_help.c
+++ b/src/core/ms_help.c
@@ -64,3 +64,5 @@ int do_help(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ms_help")
diff --git a/src/core/ms_info.c b/src/core/ms_info.c
index 2e4e91b46..48703eccc 100644
--- a/src/core/ms_info.c
+++ b/src/core/ms_info.c
@@ -229,3 +229,5 @@ int do_info(User * u)
     }
     return MOD_CONT;            /* if (name && (ci || na->nc != u->na->nc)) */
 }
+
+MODULE_INIT("ms_info")
diff --git a/src/core/ms_list.c b/src/core/ms_list.c
index 9d795cf70..815fc80c5 100644
--- a/src/core/ms_list.c
+++ b/src/core/ms_list.c
@@ -193,3 +193,5 @@ int list_memo(User * u, int index, MemoInfo * mi, int *sent_header, int newi, co
                 m->number, m->sender, timebuf);
     return 1;
 }
+
+MODULE_INIT("ms_list")
diff --git a/src/core/ms_read.c b/src/core/ms_read.c
index 3588ac9f0..7b107b69e 100644
--- a/src/core/ms_read.c
+++ b/src/core/ms_read.c
@@ -201,3 +201,5 @@ int read_memo(User * u, int index, MemoInfo * mi, const char *chan)
 
     return 1;
 }
+
+MODULE_INIT("ms_read")
diff --git a/src/core/ms_rsend.c b/src/core/ms_rsend.c
index 4baf81c00..7cb0be1ad 100644
--- a/src/core/ms_rsend.c
+++ b/src/core/ms_rsend.c
@@ -118,3 +118,5 @@ int do_rsend(User * u)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("ms_rsend")
diff --git a/src/core/ms_send.c b/src/core/ms_send.c
index 3ea195262..64faec005 100644
--- a/src/core/ms_send.c
+++ b/src/core/ms_send.c
@@ -72,3 +72,5 @@ int do_send(User * u)
     memo_send(u, name, text, z);
     return MOD_CONT;
 }
+
+MODULE_INIT("ms_send")
diff --git a/src/core/ms_sendall.c b/src/core/ms_sendall.c
index fd0e32454..f2e0382a9 100644
--- a/src/core/ms_sendall.c
+++ b/src/core/ms_sendall.c
@@ -94,3 +94,5 @@ int do_sendall(User * u)
     notice_lang(s_MemoServ, u, MEMO_MASS_SENT);
     return MOD_CONT;
 }
+
+MODULE_INIT("ms_sendall")
diff --git a/src/core/ms_set.c b/src/core/ms_set.c
index 699a949c7..4f5b16fb8 100644
--- a/src/core/ms_set.c
+++ b/src/core/ms_set.c
@@ -264,3 +264,5 @@ int do_set_limit(User * u, MemoInfo * mi, char *param)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ms_set")
diff --git a/src/core/ms_staff.c b/src/core/ms_staff.c
index e6462c975..4d5b849f9 100644
--- a/src/core/ms_staff.c
+++ b/src/core/ms_staff.c
@@ -91,3 +91,5 @@ int do_staff(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ms_staff")
diff --git a/src/core/ns_access.c b/src/core/ns_access.c
index a4a2962ad..5912a500d 100644
--- a/src/core/ns_access.c
+++ b/src/core/ns_access.c
@@ -187,3 +187,5 @@ int do_access(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_access")
diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c
index 8090531d2..7189439dd 100644
--- a/src/core/ns_alist.c
+++ b/src/core/ns_alist.c
@@ -184,3 +184,5 @@ int do_alist(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_alist")
diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c
index e0434d7e0..e191a8395 100644
--- a/src/core/ns_drop.c
+++ b/src/core/ns_drop.c
@@ -154,3 +154,5 @@ int do_unlink(User * u)
     notice_lang(s_NickServ, u, OBSOLETE_COMMAND, "DROP");
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_drop")
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index 8fb5402a1..6612be06e 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -153,3 +153,5 @@ NickAlias *makenick(const char *nick)
     alpha_insert_alias(na);
     return na;
 }
+
+MODULE_INIT("ns_forbid")
diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c
index 5dc8b08bc..5985fb123 100644
--- a/src/core/ns_getemail.c
+++ b/src/core/ns_getemail.c
@@ -100,3 +100,5 @@ int do_getemail(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_getemail")
diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c
index 946102389..938b75f8d 100644
--- a/src/core/ns_getpass.c
+++ b/src/core/ns_getpass.c
@@ -110,3 +110,5 @@ int do_getpass(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_getpass")
diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c
index 2589b8a24..689fd2aff 100644
--- a/src/core/ns_ghost.c
+++ b/src/core/ns_ghost.c
@@ -120,3 +120,5 @@ int do_ghost(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_ghost")
diff --git a/src/core/ns_group.c b/src/core/ns_group.c
index 5ee2b6483..29e5d44f4 100644
--- a/src/core/ns_group.c
+++ b/src/core/ns_group.c
@@ -335,3 +335,5 @@ int do_listlinks(User * u)
     notice_lang(s_NickServ, u, OBSOLETE_COMMAND, "GLIST");
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_group")
diff --git a/src/core/ns_help.c b/src/core/ns_help.c
index e65d9dbf5..0de4764ac 100644
--- a/src/core/ns_help.c
+++ b/src/core/ns_help.c
@@ -77,3 +77,5 @@ int do_help(User * u)
 }
 
 /* EOF */
+
+MODULE_INIT("ns_help")
diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c
index c0de8bf0e..2fe223222 100644
--- a/src/core/ns_identify.c
+++ b/src/core/ns_identify.c
@@ -169,3 +169,5 @@ int do_identify(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_identify")
diff --git a/src/core/ns_info.c b/src/core/ns_info.c
index ecc2b3bb8..829ff826d 100644
--- a/src/core/ns_info.c
+++ b/src/core/ns_info.c
@@ -282,3 +282,5 @@ int do_info(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_info")
diff --git a/src/core/ns_list.c b/src/core/ns_list.c
index 6c6639f66..a9984c79b 100644
--- a/src/core/ns_list.c
+++ b/src/core/ns_list.c
@@ -245,3 +245,5 @@ int do_list(User * u)
         free(pattern);
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_list")
diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c
index d2691132a..d8e6eb0da 100644
--- a/src/core/ns_logout.c
+++ b/src/core/ns_logout.c
@@ -126,3 +126,5 @@ int do_logout(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_logout")
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c
index 71aa2b893..6f3f3c3ef 100644
--- a/src/core/ns_recover.c
+++ b/src/core/ns_recover.c
@@ -135,3 +135,5 @@ int do_recover(User * u)
 }
 
 /* EOF */
+
+MODULE_INIT("ns_recover")
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index cb5abab8e..acf89cc2c 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -495,3 +495,5 @@ int do_sendregmail(User * u, NickRequest * nr)
     return 0;
 }
 
+
+MODULE_INIT("ns_register")
diff --git a/src/core/ns_release.c b/src/core/ns_release.c
index e2820b0e9..5bb200907 100644
--- a/src/core/ns_release.c
+++ b/src/core/ns_release.c
@@ -125,3 +125,5 @@ int do_release(User * u)
 }
 
 /* EOF */
+
+MODULE_INIT("ns_release")
diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c
index 31d218e17..88db0526b 100644
--- a/src/core/ns_saset.c
+++ b/src/core/ns_saset.c
@@ -535,3 +535,5 @@ int do_saset_language(User * u, NickCore * nc, char *param)
 }
 
 /* EOF */
+
+MODULE_INIT("ns_saset")
diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c
index ce1834167..7ea1c35d3 100644
--- a/src/core/ns_sendpass.c
+++ b/src/core/ns_sendpass.c
@@ -120,3 +120,5 @@ int do_sendpass(User * u)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_sendpass")
diff --git a/src/core/ns_set.c b/src/core/ns_set.c
index 17ab357f0..a5a9b71b3 100644
--- a/src/core/ns_set.c
+++ b/src/core/ns_set.c
@@ -477,3 +477,5 @@ int do_set_autoop(User *u, NickCore *nc, char *param) {
 
 
 /* EOF */
+
+MODULE_INIT("ns_set")
diff --git a/src/core/ns_status.c b/src/core/ns_status.c
index 86963b4a3..7ef91b6f8 100644
--- a/src/core/ns_status.c
+++ b/src/core/ns_status.c
@@ -92,3 +92,5 @@ int do_status(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_status")
diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c
index dd042f621..1cf9f7030 100644
--- a/src/core/ns_suspend.c
+++ b/src/core/ns_suspend.c
@@ -191,3 +191,5 @@ int do_unsuspend(User * u)
     return MOD_CONT;
 
 }
+
+MODULE_INIT("ns_suspend")
diff --git a/src/core/ns_update.c b/src/core/ns_update.c
index 140b2ed7f..6724cdafa 100644
--- a/src/core/ns_update.c
+++ b/src/core/ns_update.c
@@ -88,3 +88,5 @@ int do_nickupdate(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("ns_update")
diff --git a/src/core/os_admin.c b/src/core/os_admin.c
index 0d2c239db..6b7a9008b 100644
--- a/src/core/os_admin.c
+++ b/src/core/os_admin.c
@@ -242,3 +242,5 @@ int admin_list(int number, NickCore * nc, User * u, int *sent_header)
                 nc->display);
     return 1;
 }
+
+MODULE_INIT("os_admin")
diff --git a/src/core/os_akill.c b/src/core/os_akill.c
index 7c1ce828d..689e00b43 100644
--- a/src/core/os_akill.c
+++ b/src/core/os_akill.c
@@ -387,3 +387,5 @@ int akill_list(int number, Akill * ak, User * u, int *sent_header)
 
     return 1;
 }
+
+MODULE_INIT("os_akill")
diff --git a/src/core/os_chankill.c b/src/core/os_chankill.c
index 805c7d57f..40609440c 100644
--- a/src/core/os_chankill.c
+++ b/src/core/os_chankill.c
@@ -132,3 +132,5 @@ int do_chankill(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("os_chankill")
diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c
index 96285b827..56a12d53f 100644
--- a/src/core/os_chanlist.c
+++ b/src/core/os_chanlist.c
@@ -114,3 +114,5 @@ int do_chanlist(User * u)
     notice_lang(s_OperServ, u, OPER_CHANLIST_END);
     return MOD_CONT;
 }
+
+MODULE_INIT("os_chanlist")
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index aee4ebd34..d286c31f0 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -306,3 +306,5 @@ int do_clearmodes(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("os_clearmodes")
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c
index 1f926e720..4ba64c285 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.c
@@ -167,3 +167,5 @@ void defcon_sendlvls(User * u)
         notice_lang(s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_MEMOS);
     }
 }
+
+MODULE_INIT("os_defcon")
diff --git a/src/core/os_global.c b/src/core/os_global.c
index ccbabebb9..300b83867 100644
--- a/src/core/os_global.c
+++ b/src/core/os_global.c
@@ -80,3 +80,5 @@ int do_global(User * u)
     oper_global(u->nick, "%s", msg);
     return MOD_CONT;
 }
+
+MODULE_INIT("os_global")
diff --git a/src/core/os_help.c b/src/core/os_help.c
index 822d1dcd0..5842f888f 100644
--- a/src/core/os_help.c
+++ b/src/core/os_help.c
@@ -64,3 +64,5 @@ int do_help(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("os_help")
diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c
index 6ae5ad16f..ffac6b036 100644
--- a/src/core/os_ignore.c
+++ b/src/core/os_ignore.c
@@ -145,3 +145,5 @@ int do_ignorelist(User * u)
 }
 
 /* EOF */
+
+MODULE_INIT("os_ignore")
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index 5a3ff8a94..a666a02cf 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -86,3 +86,5 @@ int do_jupe(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("os_jupe")
diff --git a/src/core/os_kick.c b/src/core/os_kick.c
index 15a143746..14b352ffa 100644
--- a/src/core/os_kick.c
+++ b/src/core/os_kick.c
@@ -98,3 +98,5 @@ int do_os_kick(User * u)
     free((void *)argv[0]);
     return MOD_CONT;
 }
+
+MODULE_INIT("os_kick")
diff --git a/src/core/os_logonnews.c b/src/core/os_logonnews.c
index 20516c473..abcd1075d 100644
--- a/src/core/os_logonnews.c
+++ b/src/core/os_logonnews.c
@@ -96,3 +96,5 @@ int reload_config(int argc, char **argv) {
 }
 
 /* EOF */
+
+MODULE_INIT("os_logonnews")
diff --git a/src/core/os_mode.c b/src/core/os_mode.c
index 53729b2ff..386636a7c 100644
--- a/src/core/os_mode.c
+++ b/src/core/os_mode.c
@@ -100,3 +100,5 @@ int do_os_mode(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("os_mode")
diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c
index fde25f0a2..f3c73d8fb 100644
--- a/src/core/os_modinfo.c
+++ b/src/core/os_modinfo.c
@@ -137,3 +137,5 @@ int showModuleMsgLoaded(MessageHash * msgList, char *mod_name, User * u)
     }
     return display;
 }
+
+MODULE_INIT("os_modinfo")
diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c
index 8feddbea6..91f9f39e1 100644
--- a/src/core/os_modlist.c
+++ b/src/core/os_modlist.c
@@ -193,3 +193,5 @@ int do_modlist(User * u)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("os_modlist")
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index bcb70c551..926a2c2e4 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -81,3 +81,5 @@ int do_modload(User * u)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("os_modload")
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c
index a27c5ba6a..a18bc8e54 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.c
@@ -83,3 +83,5 @@ int do_modunload(User * u)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("os_modunload")
diff --git a/src/core/os_noop.c b/src/core/os_noop.c
index 1d2b19d0e..5b8c3002c 100644
--- a/src/core/os_noop.c
+++ b/src/core/os_noop.c
@@ -104,3 +104,5 @@ int do_noop(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("os_noop")
diff --git a/src/core/os_oline.c b/src/core/os_oline.c
index 8e8b18730..6ffb282f0 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.c
@@ -106,3 +106,5 @@ int do_operoline(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("os_oline")
diff --git a/src/core/os_oper.c b/src/core/os_oper.c
index 75ef6a0ad..8bdff9f0e 100644
--- a/src/core/os_oper.c
+++ b/src/core/os_oper.c
@@ -245,3 +245,5 @@ int oper_list_callback(SList * slist, int number, void *item, va_list args)
 
     return oper_list(number, (NickCore *)item, u, sent_header);
 }
+
+MODULE_INIT("os_oper")
diff --git a/src/core/os_opernews.c b/src/core/os_opernews.c
index dc9b3006a..a5cf0602c 100644
--- a/src/core/os_opernews.c
+++ b/src/core/os_opernews.c
@@ -95,3 +95,5 @@ int reload_config(int argc, char **argv) {
 }
 
 /* EOF */
+
+MODULE_INIT("os_opernews")
diff --git a/src/core/os_quit.c b/src/core/os_quit.c
index 82da33434..26c1b0021 100644
--- a/src/core/os_quit.c
+++ b/src/core/os_quit.c
@@ -80,3 +80,5 @@ int do_os_quit(User * u)
     quitting = 1;
     return MOD_CONT;
 }
+
+MODULE_INIT("os_quit")
diff --git a/src/core/os_randomnews.c b/src/core/os_randomnews.c
index e29cfc796..361a9937b 100644
--- a/src/core/os_randomnews.c
+++ b/src/core/os_randomnews.c
@@ -64,3 +64,5 @@ void myOperServHelp(User * u)
         notice_lang(s_OperServ, u, OPER_HELP_CMD_RANDOMNEWS);
     }
 }
+
+MODULE_INIT("os_randomnews")
diff --git a/src/core/os_raw.c b/src/core/os_raw.c
index 9832225dd..5ef92e082 100644
--- a/src/core/os_raw.c
+++ b/src/core/os_raw.c
@@ -76,3 +76,5 @@ int do_raw(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("os_raw")
diff --git a/src/core/os_reload.c b/src/core/os_reload.c
index 1961ed908..3eacf80c7 100644
--- a/src/core/os_reload.c
+++ b/src/core/os_reload.c
@@ -82,3 +82,5 @@ int do_reload(User * u)
     notice_lang(s_OperServ, u, OPER_RELOAD);
     return MOD_CONT;
 }
+
+MODULE_INIT("os_reload")
diff --git a/src/core/os_restart.c b/src/core/os_restart.c
index ff5cf2a5b..3233ca290 100644
--- a/src/core/os_restart.c
+++ b/src/core/os_restart.c
@@ -89,3 +89,5 @@ int do_restart(User * u)
 #endif
     return MOD_CONT;
 }
+
+MODULE_INIT("os_restart")
diff --git a/src/core/os_session.c b/src/core/os_session.c
index 9c9498a15..bec687ee5 100644
--- a/src/core/os_session.c
+++ b/src/core/os_session.c
@@ -66,3 +66,5 @@ void myOperServHelp(User * u)
         notice_lang(s_OperServ, u, OPER_HELP_CMD_EXCEPTION);
     }
 }
+
+MODULE_INIT("os_session")
diff --git a/src/core/os_set.c b/src/core/os_set.c
index 7b533b8f0..ba26c9eac 100644
--- a/src/core/os_set.c
+++ b/src/core/os_set.c
@@ -262,3 +262,5 @@ int do_set(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("os_set")
diff --git a/src/core/os_sgline.c b/src/core/os_sgline.c
index 1c6ec3890..34db555b8 100644
--- a/src/core/os_sgline.c
+++ b/src/core/os_sgline.c
@@ -360,3 +360,5 @@ int sgline_list_callback(SList * slist, int number, void *item,
 
     return sgline_list(number, (SXLine *)item, u, sent_header);
 }
+
+MODULE_INIT("os_sgline")
diff --git a/src/core/os_shutdown.c b/src/core/os_shutdown.c
index e9be72cff..e8403e299 100644
--- a/src/core/os_shutdown.c
+++ b/src/core/os_shutdown.c
@@ -81,3 +81,5 @@ int do_shutdown(User * u)
     delayed_quit = 1;
     return MOD_CONT;
 }
+
+MODULE_INIT("os_shutdown")
diff --git a/src/core/os_sqline.c b/src/core/os_sqline.c
index 0ed3d153e..d35982b0a 100644
--- a/src/core/os_sqline.c
+++ b/src/core/os_sqline.c
@@ -353,3 +353,5 @@ int sqline_list_callback(SList * slist, int number, void *item,
 
     return sqline_list(number, (SXLine *)item, u, sent_header);
 }
+
+MODULE_INIT("os_sqline")
diff --git a/src/core/os_staff.c b/src/core/os_staff.c
index 3ce5cffc2..d416a2d41 100644
--- a/src/core/os_staff.c
+++ b/src/core/os_staff.c
@@ -154,3 +154,5 @@ int opers_list(int number, NickCore * nc, User * u, char *level)
 
     return 1;
 }
+
+MODULE_INIT("os_staff")
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index 2ea620240..85bdd1c90 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -444,3 +444,5 @@ void get_operserv_stats(long *nrec, long *memuse)
     *nrec = count;
     *memuse = mem;
 }
+
+MODULE_INIT("os_stats")
diff --git a/src/core/os_svsnick.c b/src/core/os_svsnick.c
index c579d7588..fa0bb0903 100644
--- a/src/core/os_svsnick.c
+++ b/src/core/os_svsnick.c
@@ -123,3 +123,5 @@ int do_svsnick(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("os_svsnick")
diff --git a/src/core/os_szline.c b/src/core/os_szline.c
index 37c03947f..f4ad787f9 100644
--- a/src/core/os_szline.c
+++ b/src/core/os_szline.c
@@ -348,3 +348,5 @@ int szline_list(int number, SXLine * sx, User * u, int *sent_header)
 
     return 1;
 }
+
+MODULE_INIT("os_szline")
diff --git a/src/core/os_umode.c b/src/core/os_umode.c
index f81f49151..705120643 100644
--- a/src/core/os_umode.c
+++ b/src/core/os_umode.c
@@ -114,3 +114,5 @@ int do_operumodes(User * u)
     }
     return MOD_CONT;
 }
+
+MODULE_INIT("os_umode")
diff --git a/src/core/os_update.c b/src/core/os_update.c
index 5b15dbb93..5d1509475 100644
--- a/src/core/os_update.c
+++ b/src/core/os_update.c
@@ -72,3 +72,5 @@ int do_update(User * u)
     save_data = 1;
     return MOD_CONT;
 }
+
+MODULE_INIT("os_update")
diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c
index d0ca57a33..c65f3b3ce 100644
--- a/src/core/os_userlist.c
+++ b/src/core/os_userlist.c
@@ -119,3 +119,5 @@ int do_userlist(User * u)
     notice_lang(s_OperServ, u, OPER_USERLIST_END);
     return MOD_CONT;
 }
+
+MODULE_INIT("os_userlist")
diff --git a/src/init.c b/src/init.c
index da46d296b..c06428cdf 100644
--- a/src/init.c
+++ b/src/init.c
@@ -655,15 +655,24 @@ int init_secondary(int ac, char **av)
 	BotInfo *bi = findbot("NickServ");
 	if (!bi)
 	{
-		bi = new BotInfo(s_OperServ, ServiceUser, ServiceHost, desc_OperServ);
-		bi = new BotInfo(s_NickServ, ServiceUser, ServiceHost, desc_NickServ);
-		bi = new BotInfo(s_ChanServ, ServiceUser, ServiceHost, desc_ChanServ);
-		bi = new BotInfo(s_HostServ, ServiceUser, ServiceHost, desc_HostServ);
-		bi = new BotInfo(s_MemoServ, ServiceUser, ServiceHost, desc_MemoServ);
-		bi = new BotInfo(s_BotServ, ServiceUser, ServiceHost, desc_BotServ);
-		bi = new BotInfo(s_HelpServ, ServiceUser, ServiceHost, desc_HelpServ);
-		bi = new BotInfo(s_DevNull, ServiceUser, ServiceHost, desc_DevNull);
-		bi = new BotInfo(s_GlobalNoticer, ServiceUser, ServiceHost, desc_GlobalNoticer);
+		if (s_OperServ)
+			bi = new BotInfo(s_OperServ, ServiceUser, ServiceHost, desc_OperServ);
+		if (s_NickServ)
+			bi = new BotInfo(s_NickServ, ServiceUser, ServiceHost, desc_NickServ);
+		if (s_ChanServ)
+			bi = new BotInfo(s_ChanServ, ServiceUser, ServiceHost, desc_ChanServ);
+		if (s_HostServ)
+			bi = new BotInfo(s_HostServ, ServiceUser, ServiceHost, desc_HostServ);
+		if (s_MemoServ)
+			bi = new BotInfo(s_MemoServ, ServiceUser, ServiceHost, desc_MemoServ);
+		if (s_BotServ)
+			bi = new BotInfo(s_BotServ, ServiceUser, ServiceHost, desc_BotServ);
+		if (s_HelpServ)
+			bi = new BotInfo(s_HelpServ, ServiceUser, ServiceHost, desc_HelpServ);
+		if (s_DevNull)
+			bi = new BotInfo(s_DevNull, ServiceUser, ServiceHost, desc_DevNull);
+		if (s_GlobalNoticer)
+			bi = new BotInfo(s_GlobalNoticer, ServiceUser, ServiceHost, desc_GlobalNoticer);
 	}
 
     /* Save the databases back to file/mysql to reflect any changes */
diff --git a/src/modules.c b/src/modules.c
index 05f077331..18bfacc57 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -622,9 +622,9 @@ int loadModule(Module * m, User * u)
         return MOD_ERR_NOLOAD;
     }
     ano_modclearerr();
-    func = (int (*)(int, char **))ano_modsym(m->handle, "AnopeInit");
+    func = (int (*)(int, char **))ano_modsym(m->handle, "anope_modinit");
     if ( func == NULL && (err = ano_moderr()) != NULL) {
-		alog("No AnopeInit found, not an Anope module.");
+		alog("No magical anope_modinit() found, not an Anope module, or a very old module(?)");
         ano_modclose(m->handle);        /* If no AnopeInit - it isnt an Anope Module, close it */
         return MOD_ERR_NOLOAD;
     }
diff --git a/src/modules/bs_fantasy_unban.c b/src/modules/bs_fantasy_unban.c
index a17e06551..95307c92d 100644
--- a/src/modules/bs_fantasy_unban.c
+++ b/src/modules/bs_fantasy_unban.c
@@ -80,3 +80,5 @@ int do_fantasy(int argc, char **argv)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("bs_fantasy_unban")
diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c
index 7e0d27bb4..526478784 100644
--- a/src/modules/cs_appendtopic.c
+++ b/src/modules/cs_appendtopic.c
@@ -245,3 +245,5 @@ void my_add_languages(void)
 }
 
 /* EOF */
+
+MODULE_INIT("cs_appendtopic")
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c
index a4b81dd9a..c625d326d 100644
--- a/src/modules/cs_enforce.c
+++ b/src/modules/cs_enforce.c
@@ -477,3 +477,5 @@ void my_add_languages(void)
 }
 
 /* EOF */
+
+MODULE_INIT("cs_enforce")
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c
index f22f9aef5..691bfbf42 100644
--- a/src/modules/cs_tban.c
+++ b/src/modules/cs_tban.c
@@ -248,3 +248,5 @@ void mAddLanguages(void)
 
 
 /* EOF */
+
+MODULE_INIT("cs_tban")
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index 59404bd4e..3ee45cebd 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.c
@@ -985,3 +985,5 @@ void my_add_languages(void)
 }
 
 /* EOF */
+
+MODULE_INIT("hs_request")
diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c
index 04747ff5a..254e773ec 100644
--- a/src/modules/ns_maxemail.c
+++ b/src/modules/ns_maxemail.c
@@ -226,3 +226,5 @@ void my_add_languages(void)
 }
 
 /* EOF */
+
+MODULE_INIT("ns_maxemail")
diff --git a/src/modules/ns_noop_convert.c b/src/modules/ns_noop_convert.c
index 2858bef1e..81e3d50d5 100644
--- a/src/modules/ns_noop_convert.c
+++ b/src/modules/ns_noop_convert.c
@@ -171,3 +171,5 @@ int mLoadConfig(int argc, char **argv)
 /*************************************************************************/
 
 /* EOF */
+
+MODULE_INIT("ns_noop_convert")
diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index 0343f957e..251fb62d8 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -778,3 +778,5 @@ void mMainChanHelp(User * u)
 /*************************************************************************/
 
 /* EOF */
+
+MODULE_INIT("os_info")
diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c
index fbb67d791..5a751fd73 100644
--- a/src/protocol/bahamut.c
+++ b/src/protocol/bahamut.c
@@ -1383,3 +1383,5 @@ int AnopeInit(int argc, char **argv)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("bahamut")
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 095c9ab6c..63fe12577 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -1634,3 +1634,5 @@ void AnopeFini(void)
 }
 
 /* EOF */
+
+MODULE_INIT("charybdis")
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index a1200f578..9bbe41d6d 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -1615,4 +1615,4 @@ int AnopeInit(int argc, char **argv)
 	return MOD_CONT;
 }
 
-MODULE_INIT("inspircd11")
\ No newline at end of file
+MODULE_INIT("inspircd11")
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 3666f7ec3..b1e4d41d5 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -1490,3 +1490,5 @@ int AnopeInit(int argc, char **argv)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("ratbox")
diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c
index c43afaaa5..56b5f3e90 100644
--- a/src/protocol/unreal32.c
+++ b/src/protocol/unreal32.c
@@ -1926,3 +1926,5 @@ int AnopeInit(int argc, char **argv)
 
     return MOD_CONT;
 }
+
+MODULE_INIT("unreal32")
diff --git a/src/servers.c b/src/servers.c
index 9953b5b4e..f7c7588b6 100644
--- a/src/servers.c
+++ b/src/servers.c
@@ -607,6 +607,9 @@ void ts6_uid_increment(unsigned int slot)
 
 char *ts6_uid_retrieve(void)
 {
+	if (UseTS6 == 0)
+		return "";
+
     if (ts6_uid_initted != 1)
         ts6_uid_init();
 
diff --git a/src/users.c b/src/users.c
index 38fa5eee4..1ba88f426 100644
--- a/src/users.c
+++ b/src/users.c
@@ -31,7 +31,7 @@ User::User(const std::string &nick)
 {
 	User **list;
 	// XXX: we could do well to steal CoreException from insp
-	if (!nick.empty())
+	if (nick.empty())
 		throw "what the craq, empty nick passed to constructor";
 
 	// XXX: we should also duplicate-check here.