7 files changed, 23 insertions, 16 deletions
diff --git a/Swiften/Client/BlockList.h b/Swiften/Client/BlockList.h
index 2cf4aaf..eeb6c10 100644
--- a/Swiften/Client/BlockList.h
+++ b/Swiften/Client/BlockList.h
@@ -1,21 +1,22 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <vector>
 
 #include <Swiften/JID/JID.h>
 #include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Base/API.h>
 
 namespace Swift {
-	class BlockList {
+	class SWIFTEN_API BlockList {
 		public:
 			enum State {
 				Init,
 				Requesting,
 				Available,
 				Error
diff --git a/Swiften/Client/ClientBlockListManager.h b/Swiften/Client/ClientBlockListManager.h
index d3498a7..fb30eee 100644
--- a/Swiften/Client/ClientBlockListManager.h
+++ b/Swiften/Client/ClientBlockListManager.h
@@ -1,16 +1,17 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <boost/shared_ptr.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/BlockPayload.h>
 #include <Swiften/Elements/BlockListPayload.h>
 #include <Swiften/Elements/UnblockPayload.h>
 #include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Queries/SetResponder.h>
@@ -18,13 +19,13 @@
 #include <Swiften/Client/BlockList.h>
 #include <Swiften/Client/BlockListImpl.h>
 
 namespace Swift {
 	class IQRouter;
 
-	class ClientBlockListManager {
+	class SWIFTEN_API ClientBlockListManager {
 		public:
 			ClientBlockListManager(IQRouter *iqRouter);
 			~ClientBlockListManager();
 
 			/**
 			 * Returns the blocklist.
diff --git a/Swiften/Client/ClientOptions.h b/Swiften/Client/ClientOptions.h
index 20e7443..4aac609 100644
--- a/Swiften/Client/ClientOptions.h
+++ b/Swiften/Client/ClientOptions.h
@@ -5,19 +5,20 @@
  */
 
 #pragma once
 
 #include <boost/shared_ptr.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Base/URL.h>
 #include <Swiften/Base/SafeString.h>
 
 namespace Swift {
 	class HTTPTrafficFilter;
 
-	struct ClientOptions {
+	struct SWIFTEN_API ClientOptions {
 		enum UseTLS {
 			NeverUseTLS,
 			UseTLSWhenAvailable,
 			RequireTLS
 		};
 
diff --git a/Swiften/Client/ClientSessionStanzaChannel.h b/Swiften/Client/ClientSessionStanzaChannel.h
index 4e2f842..1104416 100644
--- a/Swiften/Client/ClientSessionStanzaChannel.h
+++ b/Swiften/Client/ClientSessionStanzaChannel.h
@@ -1,28 +1,29 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <boost/shared_ptr.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Base/IDGenerator.h>
 #include <Swiften/Client/ClientSession.h>
 #include <Swiften/Client/StanzaChannel.h>
 #include <Swiften/Elements/Message.h>
 #include <Swiften/Elements/IQ.h>
 #include <Swiften/Elements/Presence.h>
 
 namespace Swift {
 	/**
 	 * StanzaChannel implementation around a ClientSession.
 	 */
-	class ClientSessionStanzaChannel : public StanzaChannel {
+	class SWIFTEN_API ClientSessionStanzaChannel : public StanzaChannel {
 		public:
 			void setSession(boost::shared_ptr<ClientSession> session);
 
 			void sendIQ(boost::shared_ptr<IQ> iq);
 			void sendMessage(boost::shared_ptr<Message> message);
 			void sendPresence(boost::shared_ptr<Presence> presence);
diff --git a/Swiften/Client/MemoryStorages.h b/Swiften/Client/MemoryStorages.h
index 137e77b..e341a37 100644
--- a/Swiften/Client/MemoryStorages.h
+++ b/Swiften/Client/MemoryStorages.h
@@ -1,25 +1,26 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Client/Storages.h>
 
 namespace Swift {
 	class VCardMemoryStorage;
 	class CryptoProvider;
 
 	/**
 	 * An implementation of Storages for storing all
 	 * controller data in memory.
 	 */
-	class MemoryStorages : public Storages {
+	class SWIFTEN_API MemoryStorages : public Storages {
 		public:
 			MemoryStorages(CryptoProvider*);
 			~MemoryStorages();
 
 			virtual VCardStorage* getVCardStorage() const;
 			virtual AvatarStorage* getAvatarStorage() const;
diff --git a/Swiften/Client/StanzaChannel.h b/Swiften/Client/StanzaChannel.h
index a299cd8..c7c0971 100644
--- a/Swiften/Client/StanzaChannel.h
+++ b/Swiften/Client/StanzaChannel.h
@@ -1,24 +1,25 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <Swiften/Base/boost_bsignals.h>
 #include <boost/shared_ptr.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Queries/IQChannel.h>
 #include <Swiften/Elements/Message.h>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/TLS/Certificate.h>
 
 namespace Swift {
-	class StanzaChannel : public IQChannel {
+	class SWIFTEN_API StanzaChannel : public IQChannel {
 		public:
 			virtual void sendMessage(boost::shared_ptr<Message>) = 0;
 			virtual void sendPresence(boost::shared_ptr<Presence>) = 0;
 			virtual bool isAvailable() const = 0;
 			virtual bool getStreamManagementEnabled() const = 0;
 			virtual std::vector<Certificate::ref> getPeerCertificateChain() const = 0;
diff --git a/Swiften/Client/XMLBeautifier.h b/Swiften/Client/XMLBeautifier.h
index af35be4..f8dccc5 100644
--- a/Swiften/Client/XMLBeautifier.h
+++ b/Swiften/Client/XMLBeautifier.h
@@ -2,31 +2,32 @@
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
-* Copyright (c) 2014 Isode Limited.
-* All rights reserved.
-* See the COPYING file for more information.
-*/
+ * Copyright (c) 2014-2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
 
 #pragma once
 
 #include <sstream>
 #include <string>
 #include <stack>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Parser/XMLParserFactory.h>
 #include <Swiften/Parser/XMLParserClient.h>
 #include <Swiften/Parser/XMLParser.h>
 
 namespace Swift {
 
-class XMLBeautifier : public XMLParserClient {
+class SWIFTEN_API XMLBeautifier : public XMLParserClient {
 public:
 	XMLBeautifier(bool indention, bool coloring);
 	virtual ~XMLBeautifier();
 
 	std::string beautify(const std::string&);