Windows fixes

10 files changed, 26 insertions, 21 deletions

diff --git a/include/account.h b/include/account.h
index 23b09b7de..7b98525e4 100644
--- a/include/account.h
+++ b/include/account.h
@@ -306,7 +306,7 @@ class CoreExport NickCore : public Serializable, public Extensible, public Flags
 	void ClearCert();
 };
 
-class IdentifyRequest
+class CoreExport IdentifyRequest
 {
 	Module *owner;
 	Anope::string account;
diff --git a/include/commands.h b/include/commands.h
index 59e8f5f1c..08fb85d41 100644
--- a/include/commands.h
+++ b/include/commands.h
@@ -14,6 +14,7 @@
 
 #include "service.h"
 #include "anope.h"
+#include "channels.h"
 
 enum CommandFlag
 {
diff --git a/include/defs.h b/include/defs.h
index c08d683a0..ed6795142 100644
--- a/include/defs.h
+++ b/include/defs.h
@@ -33,6 +33,7 @@ class Log;
 class LogInfo;
 class Memo;
 class Message;
+class MessageSource;
 class Module;
 class NickAlias;
 class NickCore;
@@ -50,7 +51,6 @@ struct BadWord;
 struct DNSQuery;
 struct Exception;
 struct MemoInfo;
-struct MessageSource;
 struct ModeLock;
 struct Oper;
 
diff --git a/include/dns.h b/include/dns.h
index 9ba14cc37..64067107b 100644
--- a/include/dns.h
+++ b/include/dns.h
@@ -260,7 +260,7 @@ class CoreExport DNSManager : public Timer
 	static DNSQuery BlockingQuery(const Anope::string &mask, QueryType qt);
 };
 
-extern DNSManager *DNSEngine;
+extern CoreExport DNSManager *DNSEngine;
 
 #endif // DNS_H
 
diff --git a/include/messages.h b/include/messages.h
index a754c529b..1a577ae85 100644
--- a/include/messages.h
+++ b/include/messages.h
@@ -5,119 +5,119 @@
  * as they see fit.
  */
 
-struct CoreIRCDMessageAway : IRCDMessage
+struct CoreExport CoreIRCDMessageAway : IRCDMessage
 {
 	CoreIRCDMessageAway(const Anope::string &mname = "AWAY") : IRCDMessage(mname, 0) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessageCapab : IRCDMessage
+struct CoreExport CoreIRCDMessageCapab : IRCDMessage
 {
 	CoreIRCDMessageCapab(const Anope::string &mname = "CAPAB") : IRCDMessage(mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessageError : IRCDMessage
+struct CoreExport CoreIRCDMessageError : IRCDMessage
 {
 	CoreIRCDMessageError(const Anope::string &mname = "ERROR") : IRCDMessage(mname, 1) { }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessageJoin : IRCDMessage
+struct CoreExport CoreIRCDMessageJoin : IRCDMessage
 {
 	CoreIRCDMessageJoin(const Anope::string &mname = "JOIN") : IRCDMessage(mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessageKick : IRCDMessage
+struct CoreExport CoreIRCDMessageKick : IRCDMessage
 {
 	CoreIRCDMessageKick(const Anope::string &mname = "KICK") : IRCDMessage(mname, 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessageKill : IRCDMessage
+struct CoreExport CoreIRCDMessageKill : IRCDMessage
 {
 	CoreIRCDMessageKill(const Anope::string &mname = "KILL") : IRCDMessage(mname, 2) { }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessageMOTD : IRCDMessage
+struct CoreExport CoreIRCDMessageMOTD : IRCDMessage
 {
 	CoreIRCDMessageMOTD(const Anope::string &mname = "MOTD") : IRCDMessage(mname, 1) { }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessagePart : IRCDMessage
+struct CoreExport CoreIRCDMessagePart : IRCDMessage
 {
 	CoreIRCDMessagePart(const Anope::string &mname = "PART") : IRCDMessage(mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessagePing : IRCDMessage
+struct CoreExport CoreIRCDMessagePing : IRCDMessage
 {
 	CoreIRCDMessagePing(const Anope::string &mname = "PING") : IRCDMessage(mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessagePrivmsg : IRCDMessage
+struct CoreExport CoreIRCDMessagePrivmsg : IRCDMessage
 {
 	CoreIRCDMessagePrivmsg(const Anope::string &mname = "PRIVMSG") : IRCDMessage(mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessageQuit : IRCDMessage
+struct CoreExport CoreIRCDMessageQuit : IRCDMessage
 {
 	CoreIRCDMessageQuit(const Anope::string &mname = "QUIT") : IRCDMessage(mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessageSQuit : IRCDMessage
+struct CoreExport CoreIRCDMessageSQuit : IRCDMessage
 {
 	CoreIRCDMessageSQuit(const Anope::string &mname = "SQUIT") : IRCDMessage(mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessageStats : IRCDMessage
+struct CoreExport CoreIRCDMessageStats : IRCDMessage
 {
 	CoreIRCDMessageStats(const Anope::string &mname = "STATS") : IRCDMessage(mname, 1) { SetFlag(IRCDMESSAGE_REQUIRE_USER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessageTime : IRCDMessage
+struct CoreExport CoreIRCDMessageTime : IRCDMessage
 {
 	CoreIRCDMessageTime(const Anope::string &mname = "TIME") : IRCDMessage(mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessageTopic : IRCDMessage
+struct CoreExport CoreIRCDMessageTopic : IRCDMessage
 {
 	CoreIRCDMessageTopic(const Anope::string &mname = "TOPIC") : IRCDMessage(mname, 2) { SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessageVersion : IRCDMessage
+struct CoreExport CoreIRCDMessageVersion : IRCDMessage
 {
 	CoreIRCDMessageVersion(const Anope::string &mname = "VERSION") : IRCDMessage(mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
 	bool Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override;
 };
 
-struct CoreIRCDMessageWhois : IRCDMessage
+struct CoreExport CoreIRCDMessageWhois : IRCDMessage
 {
 	CoreIRCDMessageWhois(const Anope::string &mname = "WHOIS") : IRCDMessage(mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
 
diff --git a/src/memoserv.cpp b/src/memoserv.cpp
index 61ea73b72..13d4d04d6 100644
--- a/src/memoserv.cpp
+++ b/src/memoserv.cpp
@@ -17,6 +17,7 @@
 #include "memo.h"
 #include "users.h"
 #include "account.h"
+#include "regchannel.h"
 
 Memo::Memo() : Flags<MemoFlag>(MemoFlagStrings), Serializable("Memo") { }
 
diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
index 473e46a0f..360a0d34b 100644
--- a/src/modulemanager.cpp
+++ b/src/modulemanager.cpp
@@ -10,6 +10,7 @@
 #include "modules.h"
 #include "extern.h"
 #include "users.h"
+#include "regchannel.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/nickserv.cpp b/src/nickserv.cpp
index b6455447a..8b5c41df9 100644
--- a/src/nickserv.cpp
+++ b/src/nickserv.cpp
@@ -14,6 +14,7 @@
 #include "modules.h"
 #include "users.h"
 #include "protocol.h"
+#include "regchannel.h"
 
 NickAlias* findnick(const Anope::string &nick)
 {
diff --git a/src/process.cpp b/src/process.cpp
index 69017f63b..dfc4f5563 100644
--- a/src/process.cpp
+++ b/src/process.cpp
@@ -15,6 +15,7 @@
 #include "protocol.h"
 #include "servers.h"
 #include "users.h"
+#include "regchannel.h"
 
 /** Main process routine
  * @param buffer A raw line from the uplink to do things with
diff --git a/src/socketengines/pipeengine_pipe.cpp b/src/socketengines/pipeengine_pipe.cpp
index ac3a9cb2c..e15f0274d 100644
--- a/src/socketengines/pipeengine_pipe.cpp
+++ b/src/socketengines/pipeengine_pipe.cpp
@@ -27,7 +27,7 @@ Pipe::Pipe() : Socket(-1), WritePipe(-1)
 	flags = fcntl(fds[1], F_GETFL, 0);
 	fcntl(fds[1], F_SETFL, flags | O_NONBLOCK);
 
-	this->~Socket();
+	this->~Pipe();
 
 	this->Sock = fds[0];
 	this->WritePipe = fds[1];