10 files changed, 12 insertions, 25 deletions
diff --git a/src/core/cs_identify.c b/src/core/cs_identify.c
index 0df40f127..33091c01a 100644
--- a/src/core/cs_identify.c
+++ b/src/core/cs_identify.c
@@ -17,7 +17,9 @@
 
 int do_identify(User * u);
 void myChanServHelp(User * u);
+#ifdef _WIN32
 extern MDE int check_password(const char *plaintext, const char *password);
+#endif
 
 /**
  * Create the command, and tell anope about it.
diff --git a/src/core/os_chanlist.c b/src/core/os_chanlist.c
index 6a25c3bc9..36d86b769 100644
--- a/src/core/os_chanlist.c
+++ b/src/core/os_chanlist.c
@@ -17,7 +17,9 @@
 
 int do_chanlist(User * u);
 void myOperServHelp(User * u);
+#ifdef _WIN32
 extern MDE int anope_get_private_mode();
+#endif
 
 /**
  * Create the command, and tell anope about it.
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c
index 3517f32d3..ad1247189 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.c
@@ -15,8 +15,10 @@
 
 #include "module.h"
 
+#ifdef _WIN32
 extern MDE time_t DefContimer;
 extern MDE void runDefCon(void);
+#endif
 int do_defcon(User * u);
 void defcon_sendlvls(User * u);
 
diff --git a/src/core/os_modinfo.c b/src/core/os_modinfo.c
index c8bba7f92..fc34102be 100644
--- a/src/core/os_modinfo.c
+++ b/src/core/os_modinfo.c
@@ -19,12 +19,6 @@ int do_modinfo(User * u);
 void myOperServHelp(User * u);
 int showModuleMsgLoaded(MessageHash * msgList, char *mod_name, User * u);
 int showModuleCmdLoaded(CommandHash * cmdList, char *mod_name, User * u);
-extern MDE Module *findModule(char *name);
-
-extern MDE Module *mod_current_module;
-extern MDE int mod_current_op;
-extern MDE User *mod_current_user;
-extern MDE ModuleHash *MODULE_HASH[MAX_CMD_HASH];
 
 /**
  * Create the command, and tell anope about it.
diff --git a/src/core/os_modlist.c b/src/core/os_modlist.c
index 2a56983ea..11aee77ed 100644
--- a/src/core/os_modlist.c
+++ b/src/core/os_modlist.c
@@ -15,13 +15,6 @@
 
 #include "module.h"
 
-extern MDE Module *mod_current_module;
-extern MDE int mod_current_op;
-extern MDE User *mod_current_user;
-extern MDE ModuleHash *MODULE_HASH[MAX_CMD_HASH];
-
-extern MDE Module *createModule(char *filename);
-
 int do_modlist(User * u);
 void myOperServHelp(User * u);
 
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index 9aef94948..065b260ee 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -15,13 +15,6 @@
 
 #include "module.h"
 
-extern MDE Module *mod_current_module;
-extern MDE int mod_current_op;
-extern MDE User *mod_current_user;
-extern MDE ModuleHash *MODULE_HASH[MAX_CMD_HASH];
-
-extern MDE Module *createModule(char *filename);
-
 int do_modload(User * u);
 void myOperServHelp(User * u);
 
diff --git a/src/core/os_modunload.c b/src/core/os_modunload.c
index 8724811e1..81e877978 100644
--- a/src/core/os_modunload.c
+++ b/src/core/os_modunload.c
@@ -15,11 +15,6 @@
 
 #include "module.h"
 
-extern MDE Module *mod_current_module;
-extern MDE int mod_current_op;
-extern MDE User *mod_current_user;
-extern MDE ModuleHash *MODULE_HASH[MAX_CMD_HASH];
-
 int do_modunload(User * u);
 
 void myOperServHelp(User * u);
diff --git a/src/core/os_restart.c b/src/core/os_restart.c
index eb4bd7e2c..8f2af8a5a 100644
--- a/src/core/os_restart.c
+++ b/src/core/os_restart.c
@@ -15,8 +15,10 @@
 
 #include "module.h"
 
+#ifdef _WIN32
 /* OperServ restart needs access to this if were gonna avoid sending ourself a signal */
 extern MDE void do_restart_services(void);
+#endif
 
 int do_restart(User * u);
 void myOperServHelp(User * u);
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index a4e4f05bf..e359c35f2 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -21,8 +21,10 @@ int do_stats(User * u);
 void get_operserv_stats(long *nrec, long *memuse);
 void myOperServHelp(User * u);
 
+#ifdef _WIN32
 extern MDE struct clone clonelist[CLONE_DETECT_SIZE];
 extern MDE struct clone warnings[CLONE_DETECT_SIZE];
+#endif
 
 /**
  * Create the command, and tell anope about it.
diff --git a/src/core/os_userlist.c b/src/core/os_userlist.c
index 7d7b75bc1..215128ff4 100644
--- a/src/core/os_userlist.c
+++ b/src/core/os_userlist.c
@@ -15,8 +15,10 @@
 
 #include "module.h"
 
+#ifdef _WIN32
 extern MDE int anope_get_invite_mode();
 extern MDE int anope_get_invis_mode();
+#endif
 
 int do_userlist(User * u);
 void myOperServHelp(User * u);