Made all module functions static to fix OSX's linker from linking

modules with similar function names to each other which causes
complete and total chaos.

9 files changed, 176 insertions, 176 deletions

diff --git a/src/modules/bs_fantasy_unban.c b/src/modules/bs_fantasy_unban.c
index 50710071d..8d01e0a50 100644
--- a/src/modules/bs_fantasy_unban.c
+++ b/src/modules/bs_fantasy_unban.c
@@ -14,7 +14,7 @@
 
 #include "module.h"
 
-int do_fantasy(int argc, char **argv);
+static int do_fantasy(int argc, char **argv);
 
 /**
  * Create the hook, and tell anope about it.
@@ -51,7 +51,7 @@ void AnopeFini(void)
  * @param argv Argument list
  * @return MOD_CONT or MOD_STOP
  **/
-int do_fantasy(int argc, char **argv)
+static int do_fantasy(int argc, char **argv)
 {
     User *u;
     ChannelInfo *ci;
diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c
index 7868430fe..13d232105 100644
--- a/src/modules/cs_appendtopic.c
+++ b/src/modules/cs_appendtopic.c
@@ -48,10 +48,10 @@
 #define LNG_CHAN_HELP_APPENDTOPIC	1
 #define LNG_APPENDTOPIC_SYNTAX		2
 
-int my_cs_appendtopic(User * u);
-void my_cs_help(User * u);
-int my_cs_help_appendtopic(User * u);
-void my_add_languages(void);
+static int my_cs_appendtopic(User * u);
+static void my_cs_help(User * u);
+static int my_cs_help_appendtopic(User * u);
+static void my_add_languages(void);
 
 int AnopeInit(int argc, char **argv)
 {
@@ -84,12 +84,12 @@ void AnopeFini(void)
     alog("[cs_appendtopic] Unloaded successfully");
 }
 
-void my_cs_help(User * u)
+static void my_cs_help(User * u)
 {
     moduleNoticeLang(s_ChanServ, u, LNG_CHAN_HELP);
 }
 
-int my_cs_help_appendtopic(User * u)
+static int my_cs_help_appendtopic(User * u)
 {
     moduleNoticeLang(s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX);
     notice(s_ChanServ, u->nick, " ");
@@ -97,7 +97,7 @@ int my_cs_help_appendtopic(User * u)
     return MOD_STOP;
 }
 
-int my_cs_appendtopic(User * u)
+static int my_cs_appendtopic(User * u)
 {
     char *cur_buffer;
     char *chan;
@@ -161,7 +161,7 @@ int my_cs_appendtopic(User * u)
     return MOD_CONT;
 }
 
-void my_add_languages(void)
+static void my_add_languages(void)
 {
     /* English (US) */
     char *langtable_en_us[] = {
diff --git a/src/modules/cs_enforce.c b/src/modules/cs_enforce.c
index 30370d925..542676cfd 100644
--- a/src/modules/cs_enforce.c
+++ b/src/modules/cs_enforce.c
@@ -18,10 +18,10 @@
 #define AUTHOR "Anope"
 #define VERSION VERSION_STRING
 
-int my_cs_enforce(User * u);
-void my_cs_help(User * u);
-int my_cs_help_enforce(User * u);
-void my_add_languages(void);
+static int my_cs_enforce(User * u);
+static void my_cs_help(User * u);
+static int my_cs_help_enforce(User * u);
+static void my_add_languages(void);
 
 #define LNG_NUM_STRINGS    6
 
@@ -61,7 +61,7 @@ void AnopeFini(void)
 }
 
 /* Enforcing functions */
-void do_enforce_secureops(Channel * c)
+static void do_enforce_secureops(Channel * c)
 {
     struct c_userlist *user;
     struct c_userlist *next;
@@ -90,7 +90,7 @@ void do_enforce_secureops(Channel * c)
     ci->flags = flags;
 }
 
-void do_enforce_restricted(Channel * c)
+static void do_enforce_restricted(Channel * c)
 {
     struct c_userlist *user;
     struct c_userlist *next;
@@ -131,7 +131,7 @@ void do_enforce_restricted(Channel * c)
     ci->levels[CA_NOJOIN] = old_nojoin_level;
 }
 
-void do_enforce_cmode_R(Channel * c)
+static void do_enforce_cmode_R(Channel * c)
 {
     struct c_userlist *user;
     struct c_userlist *next;
@@ -169,7 +169,7 @@ void do_enforce_cmode_R(Channel * c)
 }
 
 /* Enforcing Group Functions */
-void do_enforce_set(Channel * c)
+static void do_enforce_set(Channel * c)
 {
     ChannelInfo *ci;
 
@@ -182,7 +182,7 @@ void do_enforce_set(Channel * c)
         do_enforce_restricted(c);
 }
 
-void do_enforce_modes(Channel * c)
+static void do_enforce_modes(Channel * c)
 {
     CBMode *cbm;
 
@@ -192,7 +192,7 @@ void do_enforce_modes(Channel * c)
 
 /* End of enforcing functions */
 
-int my_cs_enforce(User * u)
+static int my_cs_enforce(User * u)
 {
     char *cur_buffer;
     char *chan=NULL;
@@ -242,12 +242,12 @@ int my_cs_enforce(User * u)
 }
 
 /* Language and response stuff */
-void my_cs_help(User * u)
+static void my_cs_help(User * u)
 {
     moduleNoticeLang(s_ChanServ, u, LNG_CHAN_HELP);
 }
 
-int my_cs_help_enforce(User * u)
+static int my_cs_help_enforce(User * u)
 {
     moduleNoticeLang(s_ChanServ, u, LNG_ENFORCE_SYNTAX);
     notice(s_ChanServ, u->nick, " ");
@@ -261,7 +261,7 @@ int my_cs_help_enforce(User * u)
     return MOD_STOP;
 }
 
-void my_add_languages(void)
+static void my_add_languages(void)
 {
     /* English (US) */
     char *langtable_en_us[] = {
diff --git a/src/modules/cs_tban.c b/src/modules/cs_tban.c
index e086da1c5..da152ce6d 100644
--- a/src/modules/cs_tban.c
+++ b/src/modules/cs_tban.c
@@ -21,17 +21,17 @@
 #define AUTHOR "Rob"
 #define VERSION VERSION_STRING
 
-void myHelp(User * u);
-void myFullHelpSyntax(User * u);
-int myFullHelp(User * u);
-void mySendResponse(User * u, char *channel, char *mask, char *time);
+static void myHelp(User * u);
+static void myFullHelpSyntax(User * u);
+static int myFullHelp(User * u);
+static void mySendResponse(User * u, char *channel, char *mask, char *time);
 
-int do_tban(User * u);
-void addBan(Channel * c, time_t timeout, char *banmask);
-int delBan(int argc, char **argv);
-int canBanUser(Channel * c, User * u, User * u2);
+static int do_tban(User * u);
+static void addBan(Channel * c, time_t timeout, char *banmask);
+static int delBan(int argc, char **argv);
+static int canBanUser(Channel * c, User * u, User * u2);
 
-void mAddLanguages(void);
+static void mAddLanguages(void);
 
 #define LANG_NUM_STRINGS    4
 #define TBAN_HELP           0
@@ -66,17 +66,17 @@ void AnopeFini(void)
     /* module is unloading */
 }
 
-void myHelp(User * u)
+static void myHelp(User * u)
 {
     moduleNoticeLang(s_ChanServ, u, TBAN_HELP);
 }
 
-void myFullHelpSyntax(User * u)
+static void myFullHelpSyntax(User * u)
 {
     moduleNoticeLang(s_ChanServ, u, TBAN_SYNTAX);
 }
 
-int myFullHelp(User * u)
+static int myFullHelp(User * u)
 {
     myFullHelpSyntax(u);
     notice(s_ChanServ, u->nick, "");
@@ -84,12 +84,12 @@ int myFullHelp(User * u)
     return MOD_CONT;
 }
 
-void mySendResponse(User * u, char *channel, char *mask, char *time)
+static void mySendResponse(User * u, char *channel, char *mask, char *time)
 {
     moduleNoticeLang(s_ChanServ, u, TBAN_RESPONSE, mask, channel, time);
 }
 
-int do_tban(User * u)
+static int do_tban(User * u)
 {
     char mask[BUFSIZE];
     Channel *c;
@@ -130,7 +130,7 @@ int do_tban(User * u)
     return MOD_CONT;
 }
 
-void addBan(Channel * c, time_t timeout, char *banmask)
+static void addBan(Channel * c, time_t timeout, char *banmask)
 {
     char *av[3];
     char *cb[2];
@@ -148,7 +148,7 @@ void addBan(Channel * c, time_t timeout, char *banmask)
     moduleAddCallback("tban", time(NULL) + timeout, delBan, 2, cb);
 }
 
-int delBan(int argc, char **argv)
+static int delBan(int argc, char **argv)
 {
     char *av[3];
     Channel *c;
@@ -166,7 +166,7 @@ int delBan(int argc, char **argv)
     return MOD_CONT;
 }
 
-int canBanUser(Channel * c, User * u, User * u2)
+static int canBanUser(Channel * c, User * u, User * u2)
 {
     ChannelInfo *ci;
     int ok = 0;
@@ -188,7 +188,7 @@ int canBanUser(Channel * c, User * u, User * u2)
 }
 
 
-void mAddLanguages(void)
+static void mAddLanguages(void)
 {
     char *langtable_en_us[] = {
         "    TBAN       Bans the user for a given length of time",
diff --git a/src/modules/hs_request.c b/src/modules/hs_request.c
index 1a9327b58..250fb3c14 100644
--- a/src/modules/hs_request.c
+++ b/src/modules/hs_request.c
@@ -21,9 +21,9 @@
 #define VERSION VERSION_STRING
 
 /* Configuration variables */
-int HSRequestMemoUser = 0;
-int HSRequestMemoOper = 0;
-int HSRequestMemoSetters = 0;
+static int HSRequestMemoUser = 0;
+static int HSRequestMemoOper = 0;
+static int HSRequestMemoSetters = 0;
 char *HSRequestDBName = NULL;
 
 #define HSREQ_DEFAULT_DBNAME "hs_request.db"
@@ -53,33 +53,33 @@ char *HSRequestDBName = NULL;
 #define LNG_WAITING_SYNTAX		19
 #define LNG_HELP_WAITING		20
 
-int hs_do_request(User * u);
-int hs_do_activate(User * u);
-int hs_do_reject(User * u);
-int hs_do_list_out(User * u);
+static int hs_do_request(User * u);
+static int hs_do_activate(User * u);
+static int hs_do_reject(User * u);
+static int hs_do_list_out(User * u);
 
-int hs_help_request(User * u);
-int hs_help_activate(User * u);
-int hs_help_reject(User * u);
-int hs_help_waiting(User * u);
-void hs_help(User * u);
+static int hs_help_request(User * u);
+static int hs_help_activate(User * u);
+static int hs_help_reject(User * u);
+static int hs_help_waiting(User * u);
+static void hs_help(User * u);
 
-void my_add_host_request(char *nick, char *vIdent, char *vhost,
+static void my_add_host_request(char *nick, char *vIdent, char *vhost,
                          char *creator, int32 tmp_time);
-int my_isvalidchar(const char c);
-void my_memo_lang(User * u, char *name, int z, char *source, int number, ...);
-void req_send_memos(User * u, char *vHost);
-void show_list(User * u);
-int hs_do_waiting(User * u);
-int hsreqevt_nick_dropped(int argc, char **argv);
+static int my_isvalidchar(const char c);
+static void my_memo_lang(User * u, char *name, int z, char *source, int number, ...);
+static void req_send_memos(User * u, char *vHost);
+static void show_list(User * u);
+static int hs_do_waiting(User * u);
+static int hsreqevt_nick_dropped(int argc, char **argv);
 
-void hsreq_save_db(void);
-void hsreq_load_db(void);
-int hsreqevt_db_saving(int argc, char **argv);
-int hsreqevt_db_backup(int argc, char **argv);
+static void hsreq_save_db(void);
+static void hsreq_load_db(void);
+static int hsreqevt_db_saving(int argc, char **argv);
+static int hsreqevt_db_backup(int argc, char **argv);
 
-void my_load_config(void);
-void my_add_languages(void);
+static void my_load_config(void);
+static void my_add_languages(void);
 
 HostCore *hs_request_head;
 
@@ -154,7 +154,7 @@ void AnopeFini(void)
     alog("hs_request un-loaded");
 }
 
-int hs_do_request(User * u)
+static int hs_do_request(User * u)
 {
     char *cur_buffer;
     char *nick;
@@ -255,7 +255,7 @@ int hs_do_request(User * u)
     return MOD_CONT;
 }
 
-void my_memo_lang(User * u, char *name, int z, char *source, int number, ...)
+static void my_memo_lang(User * u, char *name, int z, char *source, int number, ...)
 {
     va_list va;
     char buffer[4096], outbuf[4096];
@@ -306,7 +306,7 @@ void my_memo_lang(User * u, char *name, int z, char *source, int number, ...)
 }
 
 
-void req_send_memos(User * u, char *vHost)
+static void req_send_memos(User * u, char *vHost)
 {
     int i;
     int z = 2;
@@ -334,7 +334,7 @@ void req_send_memos(User * u, char *vHost)
     }
 }
 
-int hsreqevt_nick_dropped(int argc, char **argv)
+static int hsreqevt_nick_dropped(int argc, char **argv)
 {
     HostCore *tmp;
     boolean found = false;
@@ -349,7 +349,7 @@ int hsreqevt_nick_dropped(int argc, char **argv)
     return MOD_CONT;
 }
 
-int hs_do_reject(User * u)
+static int hs_do_reject(User * u)
 {
     char *cur_buffer;
     char *nick;
@@ -398,7 +398,7 @@ int hs_do_reject(User * u)
     return MOD_CONT;
 }
 
-int hs_do_activate(User * u)
+static int hs_do_activate(User * u)
 {
     char *cur_buffer;
     char *nick;
@@ -443,7 +443,7 @@ int hs_do_activate(User * u)
 }
 
 
-void my_add_host_request(char *nick, char *vIdent, char *vhost,
+static void my_add_host_request(char *nick, char *vIdent, char *vhost,
                          char *creator, int32 tmp_time)
 {
     HostCore *tmp;
@@ -466,7 +466,7 @@ void my_add_host_request(char *nick, char *vIdent, char *vhost,
     }
 }
 
-int my_isvalidchar(const char c)
+static int my_isvalidchar(const char c)
 {
     if (((c >= 'A') && (c <= 'Z')) || ((c >= 'a') && (c <= 'z'))
         || ((c >= '0') && (c <= '9')) || (c == '.') || (c == '-'))
@@ -475,7 +475,7 @@ int my_isvalidchar(const char c)
         return 0;
 }
 
-int hs_do_list_out(User * u)
+static int hs_do_list_out(User * u)
 {
     char *key;
 
@@ -491,14 +491,14 @@ int hs_do_list_out(User * u)
     return MOD_CONT;
 }
 
-int hs_do_waiting(User * u)
+static int hs_do_waiting(User * u)
 {
     show_list(u);
 
     return MOD_CONT;
 }
 
-void show_list(User * u)
+static void show_list(User * u)
 {
     struct tm *tm;
     char buf[BUFSIZE];
@@ -531,7 +531,7 @@ void show_list(User * u)
     notice_lang(s_HostServ, u, HOST_LIST_FOOTER, display_counter);
 }
 
-int hs_help_request(User * u)
+static int hs_help_request(User * u)
 {
     moduleNoticeLang(s_HostServ, u, LNG_REQUEST_SYNTAX);
     notice(s_HostServ, u->nick, " ");
@@ -540,7 +540,7 @@ int hs_help_request(User * u)
     return MOD_CONT;
 }
 
-int hs_help_activate(User * u)
+static int hs_help_activate(User * u)
 {
     if (is_host_setter(u)) {
         moduleNoticeLang(s_HostServ, u, LNG_ACTIVATE_SYNTAX);
@@ -555,7 +555,7 @@ int hs_help_activate(User * u)
     return MOD_CONT;
 }
 
-int hs_help_reject(User * u)
+static int hs_help_reject(User * u)
 {
     if (is_host_setter(u)) {
         moduleNoticeLang(s_HostServ, u, LNG_REJECT_SYNTAX);
@@ -570,7 +570,7 @@ int hs_help_reject(User * u)
     return MOD_CONT;
 }
 
-int hs_help_waiting(User * u)
+static int hs_help_waiting(User * u)
 {
     if (is_host_setter(u)) {
         moduleNoticeLang(s_HostServ, u, LNG_WAITING_SYNTAX);
@@ -583,13 +583,13 @@ int hs_help_waiting(User * u)
     return MOD_CONT;
 }
 
-void hs_help(User * u)
+static void hs_help(User * u)
 {
     moduleNoticeLang(s_HostServ, u, LNG_HELP);
     if (is_host_setter(u))
         moduleNoticeLang(s_HostServ, u, LNG_HELP_SETTER);
 }
-void hsreq_load_db(void)
+static void hsreq_load_db(void)
 {
     FILE *fp;
     char *filename;
@@ -648,7 +648,7 @@ void hsreq_load_db(void)
         alog("[hs_request] Succesfully loaded database");
 }
 
-void hsreq_save_db(void)
+static void hsreq_save_db(void)
 {
     FILE *fp;
     char *filename;
@@ -681,7 +681,7 @@ void hsreq_save_db(void)
         alog("[hs_request] Succesfully saved database");
 }
 
-int hsreqevt_db_saving(int argc, char **argv)
+static int hsreqevt_db_saving(int argc, char **argv)
 {
     if ((argc >= 1) && (stricmp(argv[0], EVENT_START) == 0))
         hsreq_save_db();
@@ -689,7 +689,7 @@ int hsreqevt_db_saving(int argc, char **argv)
     return MOD_CONT;
 }
 
-int hsreqevt_db_backup(int argc, char **argv)
+static int hsreqevt_db_backup(int argc, char **argv)
 {
     if ((argc >= 1) && (stricmp(argv[0], EVENT_START) == 0)) {
 	    if (HSRequestDBName)
@@ -701,7 +701,7 @@ int hsreqevt_db_backup(int argc, char **argv)
     return MOD_CONT;
 }
 
-void my_load_config(void)
+static void my_load_config(void)
 {
     int i;
     char *tmp = NULL;
@@ -731,7 +731,7 @@ void my_load_config(void)
         alog("debug: [hs_request] Set config vars: MemoUser=%d MemoOper=%d MemoSetters=%d DBName='%s'", HSRequestMemoUser, HSRequestMemoOper, HSRequestMemoSetters, HSRequestDBName);
 }
 
-void my_add_languages(void)
+static void my_add_languages(void)
 {
     char *langtable_en_us[] = {
         /* LNG_REQUEST_SYNTAX */
diff --git a/src/modules/ns_maxemail.c b/src/modules/ns_maxemail.c
index f0ed118a0..3f009f5f5 100644
--- a/src/modules/ns_maxemail.c
+++ b/src/modules/ns_maxemail.c
@@ -18,16 +18,16 @@
 #define AUTHOR "Anope"
 #define VERSION VERSION_STRING
 
-void my_load_config(void);
-void my_add_languages(void);
-int my_ns_register(User * u);
-int my_ns_set(User * u);
-int my_event_reload(int argc, char **argv);
-int my_event_addcommand(int argc, char **argv);
-int my_event_delcommand(int argc, char **argv);
+static void my_load_config(void);
+static void my_add_languages(void);
+static int my_ns_register(User * u);
+static int my_ns_set(User * u);
+static int my_event_reload(int argc, char **argv);
+static int my_event_addcommand(int argc, char **argv);
+static int my_event_delcommand(int argc, char **argv);
 
-int NSEmailMax = 0;
-int added_register = 0;
+static int NSEmailMax = 0;
+static int added_register = 0;
 
 #define LNG_NUM_STRINGS		2
 #define LNG_NSEMAILMAX_REACHED		0
@@ -94,7 +94,7 @@ void AnopeFini(void)
     /* Nothing to do while unloading */
 }
 
-int count_email_in_use(char *email, User * u)
+static int count_email_in_use(char *email, User * u)
 {
     NickCore *nc;
     int i;
@@ -113,7 +113,7 @@ int count_email_in_use(char *email, User * u)
     return count;
 }
 
-int check_email_limit_reached(char *email, User * u)
+static int check_email_limit_reached(char *email, User * u)
 {
     if ((NSEmailMax < 1) || !email || is_services_admin(u))
         return MOD_CONT;
@@ -130,7 +130,7 @@ int check_email_limit_reached(char *email, User * u)
     return MOD_STOP;
 }
 
-int my_ns_register(User * u)
+static int my_ns_register(User * u)
 {
     char *cur_buffer;
     char *email;
@@ -147,7 +147,7 @@ int my_ns_register(User * u)
     return ret;
 }
 
-int my_ns_set(User * u)
+static int my_ns_set(User * u)
 {
     char *cur_buffer;
     char *set;
@@ -176,7 +176,7 @@ int my_ns_set(User * u)
     return ret;
 }
 
-int my_event_reload(int argc, char **argv)
+static int my_event_reload(int argc, char **argv)
 {
     if ((argc > 0) && (stricmp(argv[0], EVENT_START) == 0))
         my_load_config();
@@ -184,7 +184,7 @@ int my_event_reload(int argc, char **argv)
     return MOD_CONT;
 }
 
-int my_event_addcommand(int argc, char **argv)
+static int my_event_addcommand(int argc, char **argv)
 {
     Command *c;
     int status;
@@ -204,7 +204,7 @@ int my_event_addcommand(int argc, char **argv)
     return MOD_CONT;
 }
 
-int my_event_delcommand(int argc, char **argv)
+static int my_event_delcommand(int argc, char **argv)
 {
     if (argc == 2 && stricmp(argv[0], "ns_maxemail")
             && !stricmp(argv[1], "REGISTER") && added_register) {
@@ -215,7 +215,7 @@ int my_event_delcommand(int argc, char **argv)
     return MOD_CONT;
 }
 
-void my_load_config(void)
+static void my_load_config(void)
 {
     Directive confvalues[] = {
         {"NSEmailMax", {{PARAM_INT, PARAM_RELOAD, &NSEmailMax}}}
@@ -227,7 +227,7 @@ void my_load_config(void)
         alog("debug: [ns_maxemail] NSEmailMax set to %d", NSEmailMax);
 }
 
-void my_add_languages(void)
+static void my_add_languages(void)
 {
     char *langtable_en_us[] = {
         /* LNG_NSEMAILMAX_REACHED */
diff --git a/src/modules/ns_noop_convert.c b/src/modules/ns_noop_convert.c
index 6ed49b75a..39dc7227b 100644
--- a/src/modules/ns_noop_convert.c
+++ b/src/modules/ns_noop_convert.c
@@ -39,23 +39,23 @@
 /*************************************************************************/
 
 User *currentUser;
-int m_isIRCop = 0;
+static int m_isIRCop = 0;
 
 char *NSAutoOPDBName;
 
-int myNickServAutoOpHelp(User * u);
-void myNickServHelp(User * u);
+static int myNickServAutoOpHelp(User * u);
+static void myNickServHelp(User * u);
 
-int noop(User * u);
-int mEventJoin(int argc, char **argv);
-int setAutoOp(User * u);
-int UnsetAutoOp(User * u);
+static int noop(User * u);
+static int mEventJoin(int argc, char **argv);
+static int setAutoOp(User * u);
+static int UnsetAutoOp(User * u);
 
-int mLoadData(void);
-int mSaveData(int argc, char **argv);
-int mLoadConfig(int argc, char **argv);
+static int mLoadData(void);
+static int mSaveData(int argc, char **argv);
+static int mLoadConfig(int argc, char **argv);
 
-void m_AddLanguages(void);
+static void m_AddLanguages(void);
 
 /*************************************************************************/
 
@@ -99,7 +99,7 @@ void AnopeFini(void)
  * Load data from the db file, and populate the autoop setting
  * @return 0 for success
  **/
-int mLoadData(void)
+static int mLoadData(void)
 {
     int ret = 0;
     int len = 0;
@@ -138,7 +138,7 @@ int mLoadData(void)
  * Load the configuration directives from Services configuration file.
  * @return 0 for success
  **/
-int mLoadConfig(int argc, char **argv)
+static int mLoadConfig(int argc, char **argv)
 {
     char *tmp = NULL;
 
diff --git a/src/modules/os_ignore_db.c b/src/modules/os_ignore_db.c
index 04e84f146..58513f712 100644
--- a/src/modules/os_ignore_db.c
+++ b/src/modules/os_ignore_db.c
@@ -59,20 +59,20 @@ struct db_file_ {
 char *IgnoreDB;
 
 /* Functions */
-int new_open_db_read(DBFile *dbptr, char **key, char **value);
-int new_open_db_write(DBFile *dbptr);
-void new_close_db(FILE *fptr, char **key, char **value);
-int new_read_db_entry(char **key, char **value, FILE * fptr);
-int new_write_db_entry(const char *key, DBFile *dbptr, const char *fmt, ...);
-int new_write_db_endofblock(DBFile *dbptr);
-void fill_db_ptr(DBFile *dbptr, int version, int core_version, char service[256], char filename[256]);
-
-int save_ignoredb(int argc, char **argv);
-int backup_ignoredb(int argc, char **argv);
-void load_ignore_db(void);
-void save_ignore_db(void);
-void load_config(void);
-int reload_config(int argc, char **argv);
+static int new_open_db_read(DBFile *dbptr, char **key, char **value);
+static int new_open_db_write(DBFile *dbptr);
+static void new_close_db(FILE *fptr, char **key, char **value);
+static int new_read_db_entry(char **key, char **value, FILE * fptr);
+static int new_write_db_entry(const char *key, DBFile *dbptr, const char *fmt, ...);
+static int new_write_db_endofblock(DBFile *dbptr);
+static void fill_db_ptr(DBFile *dbptr, int version, int core_version, char service[256], char filename[256]);
+
+static int save_ignoredb(int argc, char **argv);
+static int backup_ignoredb(int argc, char **argv);
+static void load_ignore_db(void);
+static void save_ignore_db(void);
+static void load_config(void);
+static int reload_config(int argc, char **argv);
 
 /* ------------------------------------------------------------------------------- */
 
@@ -128,7 +128,7 @@ void AnopeFini(void) {
 
 /* ------------------------------------------------------------------------------- */
 
-void load_config(void) {
+static void load_config(void) {
 	int i;
 
 	Directive confvalues[][1] = {
@@ -152,7 +152,7 @@ void load_config(void) {
 /**
  * Upon /os reload call the routines for reloading the configuration directives
  **/
-int reload_config(int argc, char **argv) {
+static int reload_config(int argc, char **argv) {
 	if (argc >= 1) {
 		if (!stricmp(argv[0], EVENT_START)) {
 			load_config();
@@ -164,7 +164,7 @@ int reload_config(int argc, char **argv) {
 /**
  * When anope saves her databases, we do the same.
  **/
-int save_ignoredb(int argc, char **argv) {
+static int save_ignoredb(int argc, char **argv) {
 	if ((argc >= 1) && (!stricmp(argv[0], EVENT_STOP)))
 		save_ignore_db();
 
@@ -175,7 +175,7 @@ int save_ignoredb(int argc, char **argv) {
 /**
  * When anope backs her databases up, we do the same.
  **/
-int backup_ignoredb(int argc, char **argv) {
+static int backup_ignoredb(int argc, char **argv) {
 	if ((argc >= 1) && (!stricmp(argv[0], EVENT_STOP))) {
 		if (debug)
 			alog("[os_ignore_db] debug: Backing up %s database...", IgnoreDB);
@@ -190,7 +190,7 @@ int backup_ignoredb(int argc, char **argv) {
  *                DataBase Handling
  **************************************************************************/
 
-void load_ignore_db(void) {
+static void load_ignore_db(void) {
 	DBFile *dbptr = scalloc(1, sizeof(DBFile));
 	char *key, *value, *mask = NULL;
 	int retval = 0;
@@ -284,7 +284,7 @@ void load_ignore_db(void) {
 }
 
 
-void save_ignore_db(void) {
+static void save_ignore_db(void) {
 	DBFile *dbptr = scalloc(1, sizeof(DBFile));
 	time_t now;
 	IgnoreData *ign, *next;
@@ -345,7 +345,7 @@ void save_ignore_db(void) {
  **************************************************************************/
 
 
-int new_open_db_read(DBFile *dbptr, char **key, char **value) {
+static int new_open_db_read(DBFile *dbptr, char **key, char **value) {
 	*key = malloc(MAXKEYLEN);
 	*value = malloc(MAXVALLEN);
 
@@ -396,7 +396,7 @@ int new_open_db_read(DBFile *dbptr, char **key, char **value) {
 }
 
 
-int new_open_db_write(DBFile *dbptr) {
+static int new_open_db_write(DBFile *dbptr) {
 	if (!(dbptr->fptr = fopen(dbptr->filename, "wb"))) {
 		if (debug) {
 			alog("debug: %s Can't open %s database for writing", dbptr->service, dbptr->filename);
@@ -417,7 +417,7 @@ int new_open_db_write(DBFile *dbptr) {
 }
 
 
-void new_close_db(FILE *fptr, char **key, char **value) {
+static void new_close_db(FILE *fptr, char **key, char **value) {
 	if (key && *key) {
 		free(*key);
 		*key = NULL;
@@ -433,7 +433,7 @@ void new_close_db(FILE *fptr, char **key, char **value) {
 }
 
 
-int new_read_db_entry(char **key, char **value, FILE *fptr) {
+static int new_read_db_entry(char **key, char **value, FILE *fptr) {
 	char *string = *key;
 	int character;
 	int i = 0;
@@ -473,7 +473,7 @@ int new_read_db_entry(char **key, char **value, FILE *fptr) {
 }
 
 
-int new_write_db_entry(const char *key, DBFile *dbptr, const char *fmt, ...) {
+static int new_write_db_entry(const char *key, DBFile *dbptr, const char *fmt, ...) {
 	char string[MAXKEYLEN + MAXVALLEN + 2], value[MAXVALLEN];   /* safety byte :P */
 	va_list ap;
 	unsigned int length;
@@ -512,7 +512,7 @@ int new_write_db_entry(const char *key, DBFile *dbptr, const char *fmt, ...) {
 }
 
 
-int new_write_db_endofblock(DBFile *dbptr) {
+static int new_write_db_endofblock(DBFile *dbptr) {
 	if (!dbptr) {
 		return DB_WRITE_ERROR;
 	}
@@ -528,7 +528,7 @@ int new_write_db_endofblock(DBFile *dbptr) {
 
 
 
-void fill_db_ptr(DBFile *dbptr, int version, int core_version,
+static void fill_db_ptr(DBFile *dbptr, int version, int core_version,
 				char service[256], char filename[256]) {
 	dbptr->db_version = version;
 	dbptr->core_db_version = core_version;
diff --git a/src/modules/os_info.c b/src/modules/os_info.c
index abb721c20..7d131daea 100644
--- a/src/modules/os_info.c
+++ b/src/modules/os_info.c
@@ -42,22 +42,22 @@
 
 char *OSInfoDBName = NULL;
 
-int myAddNickInfo(User * u);
-int myAddChanInfo(User * u);
-int myNickInfo(User * u);
-int myChanInfo(User * u);
-
-int mNickHelp(User * u);
-int mChanHelp(User * u);
-void mMainChanHelp(User * u);
-void mMainNickHelp(User * u);
-void m_AddLanguages(void);
-
-int mLoadData(void);
-int mSaveData(int argc, char **argv);
-int mBackupData(int argc, char **argv);
-int mLoadConfig();
-int mEventReload(int argc, char **argv);
+static int myAddNickInfo(User * u);
+static int myAddChanInfo(User * u);
+static int myNickInfo(User * u);
+static int myChanInfo(User * u);
+
+static int mNickHelp(User * u);
+static int mChanHelp(User * u);
+static void mMainChanHelp(User * u);
+static void mMainNickHelp(User * u);
+static void m_AddLanguages(void);
+
+static int mLoadData(void);
+static int mSaveData(int argc, char **argv);
+static int mBackupData(int argc, char **argv);
+static int mLoadConfig();
+static int mEventReload(int argc, char **argv);
 
 /*************************************************************************/
 
@@ -142,7 +142,7 @@ void AnopeFini(void)
  * @return MOD_CONT if we want to process other commands in this command
  * stack, MOD_STOP if we dont
  **/
-int myAddNickInfo(User * u)
+static int myAddNickInfo(User * u)
 {
     char *text = NULL;
     char *cmd = NULL;
@@ -214,7 +214,7 @@ int myAddNickInfo(User * u)
  * @return MOD_CONT if we want to process other commands in this command
  * stack, MOD_STOP if we dont
  **/
-int myAddChanInfo(User * u)
+static int myAddChanInfo(User * u)
 {
     char *text = NULL;
     char *cmd = NULL;
@@ -281,7 +281,7 @@ int myAddChanInfo(User * u)
  * @param u The user who requested info
  * @return MOD_CONT to continue processing commands or MOD_STOP to stop
  **/
-int myNickInfo(User * u)
+static int myNickInfo(User * u)
 {
     char *text = NULL;
     char *nick = NULL;
@@ -318,7 +318,7 @@ int myNickInfo(User * u)
  * @param u The user who requested info
  * @return MOD_CONT to continue processing commands or MOD_STOP to stop
  **/
-int myChanInfo(User * u)
+static int myChanInfo(User * u)
 {
     char *text = NULL;
     char *chan = NULL;
@@ -352,7 +352,7 @@ int myChanInfo(User * u)
  * Load data from the db file, and populate our OperInfo lines
  * @return 0 for success
  **/
-int mLoadData(void)
+static int mLoadData(void)
 {
     int ret = 0;
     FILE *in;
@@ -411,7 +411,7 @@ int mLoadData(void)
  * Next do the same again for ChannelInfos
  * @return 0 for success
  **/
-int mSaveData(int argc, char **argv)
+static int mSaveData(int argc, char **argv)
 {
     ChannelInfo *ci = NULL;
     NickCore *nc = NULL;
@@ -462,7 +462,7 @@ int mSaveData(int argc, char **argv)
  * Backup our databases using the commands provided by Anope
  * @return MOD_CONT
  **/
-int mBackupData(int argc, char **argv)
+static int mBackupData(int argc, char **argv)
 {
 	if (argc >= 1 && !stricmp(argv[0], EVENT_START))
 		ModuleDatabaseBackup(OSInfoDBName);
@@ -474,7 +474,7 @@ int mBackupData(int argc, char **argv)
  * Load the configuration directives from Services configuration file.
  * @return 0 for success
  **/
-int mLoadConfig(void)
+static int mLoadConfig(void)
 {
     char *tmp = NULL;
 
@@ -504,7 +504,7 @@ int mLoadConfig(void)
  * Manage the RELOAD EVENT
  * @return MOD_CONT
  **/
-int mEventReload(int argc, char **argv)
+static int mEventReload(int argc, char **argv)
 {
     int ret = 0;
     if (argc >= 1) {
@@ -527,7 +527,7 @@ int mEventReload(int argc, char **argv)
 /**
  * manages the multilanguage stuff
  **/
-void m_AddLanguages(void)
+static void m_AddLanguages(void)
 {
     char *langtable_en_us[] = {
         /* OINFO_SYNTAX */
@@ -745,7 +745,7 @@ void m_AddLanguages(void)
 
 /*************************************************************************/
 
-int mNickHelp(User * u)
+static int mNickHelp(User * u)
 {
     if (is_oper(u)) {
         moduleNoticeLang(s_NickServ, u, OINFO_HELP);
@@ -755,7 +755,7 @@ int mNickHelp(User * u)
     return MOD_CONT;
 }
 
-int mChanHelp(User * u)
+static int mChanHelp(User * u)
 {
     if (is_oper(u)) {
         moduleNoticeLang(s_ChanServ, u, OCINFO_HELP);
@@ -766,7 +766,7 @@ int mChanHelp(User * u)
 }
 
 /* This help will be added to the main NickServ list */
-void mMainNickHelp(User * u)
+static void mMainNickHelp(User * u)
 {
     if (is_oper(u)) {
         moduleNoticeLang(s_NickServ, u, OINFO_HELP_CMD);
@@ -774,7 +774,7 @@ void mMainNickHelp(User * u)
 }
 
 /* This help will be added to the main NickServ list */
-void mMainChanHelp(User * u)
+static void mMainChanHelp(User * u)
 {
     if (is_oper(u)) {
         moduleNoticeLang(s_ChanServ, u, OCINFO_HELP_CMD);