Add missing SWIFTEN_API annotations to public Swiften API

Test-Information: Tested build on Windows 8 with VS 2014 and ran unit tests. Change-Id: I3d8096df4801be6901f22564e36eecba0e7310c4
author: Tobias Markmann <tm@ayena.de> 2015-06-07 22:34:19 (GMT)
committer: Tobias Markmann <tm@ayena.de> 2015-06-08 09:37:53 (GMT)
commit: b6b0695643f932827add43b9de0e09ed74eb6799 (patch)
tree: 72456efba9fab6fbc6004a98f0a61b7a8167f791 /Swiften/Parser
parent: 3741c9ad5c0cc6f92e4ed913d67b3b530882334e (diff)
download: swift-b6b0695643f932827add43b9de0e09ed74eb6799.zip
swift-b6b0695643f932827add43b9de0e09ed74eb6799.tar.bz2
92 files changed, 361 insertions, 167 deletions
diff --git a/Swiften/Parser/AuthChallengeParser.h b/Swiften/Parser/AuthChallengeParser.h
index fbe5d7d..1278221 100644
--- a/Swiften/Parser/AuthChallengeParser.h
+++ b/Swiften/Parser/AuthChallengeParser.h
@@ -1,17 +1,18 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/AuthChallenge.h>
 #include <string>
 
 namespace Swift {
-	class AuthChallengeParser : public GenericElementParser<AuthChallenge> {
+	class SWIFTEN_API AuthChallengeParser : public GenericElementParser<AuthChallenge> {
 		public:
 			AuthChallengeParser();
 
diff --git a/Swiften/Parser/AuthFailureParser.h b/Swiften/Parser/AuthFailureParser.h
index 4d7ad63..a494ebe 100644
--- a/Swiften/Parser/AuthFailureParser.h
+++ b/Swiften/Parser/AuthFailureParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/AuthFailure.h>
 
 namespace Swift {
-	class AuthFailureParser : public GenericElementParser<AuthFailure> {
+	class SWIFTEN_API AuthFailureParser : public GenericElementParser<AuthFailure> {
 		public:
 			AuthFailureParser() : GenericElementParser<AuthFailure>() {}
 	};
diff --git a/Swiften/Parser/AuthRequestParser.h b/Swiften/Parser/AuthRequestParser.h
index 8ae8bc8..c6510c8 100644
--- a/Swiften/Parser/AuthRequestParser.h
+++ b/Swiften/Parser/AuthRequestParser.h
@@ -1,17 +1,18 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/AuthRequest.h>
 #include <string>
 
 namespace Swift {
-	class AuthRequestParser : public GenericElementParser<AuthRequest> {
+	class SWIFTEN_API AuthRequestParser : public GenericElementParser<AuthRequest> {
 		public:
 			AuthRequestParser();
 
diff --git a/Swiften/Parser/AuthResponseParser.h b/Swiften/Parser/AuthResponseParser.h
index e58361e..abb6585 100644
--- a/Swiften/Parser/AuthResponseParser.h
+++ b/Swiften/Parser/AuthResponseParser.h
@@ -1,17 +1,18 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/AuthResponse.h>
 #include <string>
 
 namespace Swift {
-	class AuthResponseParser : public GenericElementParser<AuthResponse> {
+	class SWIFTEN_API AuthResponseParser : public GenericElementParser<AuthResponse> {
 		public:
 			AuthResponseParser();
 
diff --git a/Swiften/Parser/AuthSuccessParser.h b/Swiften/Parser/AuthSuccessParser.h
index 2d06a1c..b16f80e 100644
--- a/Swiften/Parser/AuthSuccessParser.h
+++ b/Swiften/Parser/AuthSuccessParser.h
@@ -1,17 +1,18 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/AuthSuccess.h>
 #include <string>
 
 namespace Swift {
-	class AuthSuccessParser : public GenericElementParser<AuthSuccess> {
+	class SWIFTEN_API AuthSuccessParser : public GenericElementParser<AuthSuccess> {
 		public:
 			AuthSuccessParser();
 
diff --git a/Swiften/Parser/ComponentHandshakeParser.h b/Swiften/Parser/ComponentHandshakeParser.h
index 8f3a647..61739d9 100644
--- a/Swiften/Parser/ComponentHandshakeParser.h
+++ b/Swiften/Parser/ComponentHandshakeParser.h
@@ -1,17 +1,18 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/ComponentHandshake.h>
 #include <string>
 
 namespace Swift {
-	class ComponentHandshakeParser : public GenericElementParser<ComponentHandshake> {
+	class SWIFTEN_API ComponentHandshakeParser : public GenericElementParser<ComponentHandshake> {
 		public:
 			ComponentHandshakeParser();
 
diff --git a/Swiften/Parser/CompressFailureParser.h b/Swiften/Parser/CompressFailureParser.h
index ddb6eef..eca53aa 100644
--- a/Swiften/Parser/CompressFailureParser.h
+++ b/Swiften/Parser/CompressFailureParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/CompressFailure.h>
 
 namespace Swift {
-	class CompressFailureParser : public GenericElementParser<CompressFailure> {
+	class SWIFTEN_API CompressFailureParser : public GenericElementParser<CompressFailure> {
 		public:
 			CompressFailureParser() : GenericElementParser<CompressFailure>() {}
 	};
diff --git a/Swiften/Parser/CompressParser.h b/Swiften/Parser/CompressParser.h
index c9799a8..9b22db2 100644
--- a/Swiften/Parser/CompressParser.h
+++ b/Swiften/Parser/CompressParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,11 +7,12 @@
 #pragma once
 
 #include <string>
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/CompressRequest.h>
 
 namespace Swift {
-	class CompressParser : public GenericElementParser<CompressRequest> {
+	class SWIFTEN_API CompressParser : public GenericElementParser<CompressRequest> {
 		public:
 			CompressParser();
 
diff --git a/Swiften/Parser/CompressedParser.h b/Swiften/Parser/CompressedParser.h
index cad32bc..33f56b2 100644
--- a/Swiften/Parser/CompressedParser.h
+++ b/Swiften/Parser/CompressedParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/Compressed.h>
 
 namespace Swift {
-	class CompressedParser : public GenericElementParser<Compressed> {
+	class SWIFTEN_API CompressedParser : public GenericElementParser<Compressed> {
 		public:
 			CompressedParser() : GenericElementParser<Compressed>() {}
 	};
diff --git a/Swiften/Parser/EnableStreamManagementParser.h b/Swiften/Parser/EnableStreamManagementParser.h
index e323ced..54d8d40 100644
--- a/Swiften/Parser/EnableStreamManagementParser.h
+++ b/Swiften/Parser/EnableStreamManagementParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/EnableStreamManagement.h>
 
 namespace Swift {
-	class EnableStreamManagementParser : public GenericElementParser<EnableStreamManagement> {
+	class SWIFTEN_API EnableStreamManagementParser : public GenericElementParser<EnableStreamManagement> {
 		public:
 			EnableStreamManagementParser() : GenericElementParser<EnableStreamManagement>() {}
 	};
diff --git a/Swiften/Parser/GenericElementParser.h b/Swiften/Parser/GenericElementParser.h
index 274153f..9cdec23 100644
--- a/Swiften/Parser/GenericElementParser.h
+++ b/Swiften/Parser/GenericElementParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,6 +9,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/ElementParser.h>
 
 namespace Swift {
@@ -16,7 +17,7 @@ namespace Swift {
 	class PayloadParserFactoryCollection;
 
 	template<typename ElementType>
-	class GenericElementParser : public ElementParser {
+	class SWIFTEN_API GenericElementParser : public ElementParser {
 		public:
 			GenericElementParser() {
 				stanza_ = boost::make_shared<ElementType>();
diff --git a/Swiften/Parser/GenericPayloadParser.h b/Swiften/Parser/GenericPayloadParser.h
index d833378..7bc990a 100644
--- a/Swiften/Parser/GenericPayloadParser.h
+++ b/Swiften/Parser/GenericPayloadParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,6 +9,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/PayloadParser.h>
 
 namespace Swift {
@@ -22,7 +23,7 @@ namespace Swift {
 	 * payload.
 	 */
 	template<typename PAYLOAD_TYPE>
-	class GenericPayloadParser : public PayloadParser {
+	class SWIFTEN_API GenericPayloadParser : public PayloadParser {
 		public:
 			GenericPayloadParser() : PayloadParser() {
 				payload_ = boost::make_shared<PAYLOAD_TYPE>();
diff --git a/Swiften/Parser/GenericPayloadParserFactory.h b/Swiften/Parser/GenericPayloadParserFactory.h
index b9a0cfa..fd6d403 100644
--- a/Swiften/Parser/GenericPayloadParserFactory.h
+++ b/Swiften/Parser/GenericPayloadParserFactory.h
@@ -1,11 +1,12 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
 #include <string>
 
@@ -15,7 +16,7 @@ namespace Swift {
 	 * A generic class for PayloadParserFactories that parse a specific payload (given as the template parameter of the class).
 	 */
 	template<typename PARSER_TYPE>
-	class GenericPayloadParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API GenericPayloadParserFactory : public PayloadParserFactory {
 		public:
 			/**
 			 * Construct a parser factory that can parse the given top-level tag in the given namespace.
diff --git a/Swiften/Parser/GenericPayloadParserFactory2.h b/Swiften/Parser/GenericPayloadParserFactory2.h
index ee6d78c..09a2dbf 100644
--- a/Swiften/Parser/GenericPayloadParserFactory2.h
+++ b/Swiften/Parser/GenericPayloadParserFactory2.h
@@ -1,11 +1,12 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
 #include <string>
 
@@ -16,7 +17,7 @@ namespace Swift {
 	 * A generic class for PayloadParserFactories that parse a specific payload (given as the template parameter of the class).
 	 */
 	template<typename PARSER_TYPE>
-	class GenericPayloadParserFactory2 : public PayloadParserFactory {
+	class SWIFTEN_API GenericPayloadParserFactory2 : public PayloadParserFactory {
 		public:
 			/**
 			 * Construct a parser factory that can parse the given top-level tag in the given namespace.
diff --git a/Swiften/Parser/GenericPayloadTreeParser.h b/Swiften/Parser/GenericPayloadTreeParser.h
index bdac85f..d90903c 100644
--- a/Swiften/Parser/GenericPayloadTreeParser.h
+++ b/Swiften/Parser/GenericPayloadTreeParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,6 +11,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 #include <Swiften/Parser/Tree/ParserElement.h>
 
@@ -19,7 +20,7 @@ namespace Swift {
 	 * Generic parser offering something a bit like a DOM to work with.
 	 */
 	template<typename PAYLOAD_TYPE>
-	class GenericPayloadTreeParser : public GenericPayloadParser<PAYLOAD_TYPE> {
+	class SWIFTEN_API GenericPayloadTreeParser : public GenericPayloadParser<PAYLOAD_TYPE> {
 		public:
 			virtual void handleStartElement(const std::string& element, const std::string& xmlns, const AttributeMap& attributes) {
 				if (!root_) {
diff --git a/Swiften/Parser/GenericStanzaParser.h b/Swiften/Parser/GenericStanzaParser.h
index f446995..c9d7f70 100644
--- a/Swiften/Parser/GenericStanzaParser.h
+++ b/Swiften/Parser/GenericStanzaParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -9,6 +9,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/StanzaParser.h>
 
 namespace Swift {
@@ -16,7 +17,7 @@ namespace Swift {
 	class PayloadParserFactoryCollection;
 
 	template<typename STANZA_TYPE>
-	class GenericStanzaParser : public StanzaParser {
+	class SWIFTEN_API GenericStanzaParser : public StanzaParser {
 		public:
 			GenericStanzaParser(PayloadParserFactoryCollection* collection) : 
 						StanzaParser(collection) {
diff --git a/Swiften/Parser/PayloadParsers/BlockParser.h b/Swiften/Parser/PayloadParsers/BlockParser.h
index 0c4ac6a..2e615a5 100644
--- a/Swiften/Parser/PayloadParsers/BlockParser.h
+++ b/Swiften/Parser/PayloadParsers/BlockParser.h
@@ -1,18 +1,19 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/Nickname.h>
 #include <Swiften/JID/JID.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 	template<typename BLOCK_ELEMENT>
-	class BlockParser : public GenericPayloadParser<BLOCK_ELEMENT> {
+	class SWIFTEN_API BlockParser : public GenericPayloadParser<BLOCK_ELEMENT> {
 		public:
 			BlockParser() : GenericPayloadParser<BLOCK_ELEMENT>(), level(0) {
 			}
diff --git a/Swiften/Parser/PayloadParsers/BodyParser.h b/Swiften/Parser/PayloadParsers/BodyParser.h
index fa4d99f..6b6a206 100644
--- a/Swiften/Parser/PayloadParsers/BodyParser.h
+++ b/Swiften/Parser/PayloadParsers/BodyParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/Body.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class BodyParser : public GenericPayloadParser<Body> {
+	class SWIFTEN_API BodyParser : public GenericPayloadParser<Body> {
 		public:
 			BodyParser();
 
diff --git a/Swiften/Parser/PayloadParsers/BytestreamsParser.h b/Swiften/Parser/PayloadParsers/BytestreamsParser.h
index 3e44d15..4180ff9 100644
--- a/Swiften/Parser/PayloadParsers/BytestreamsParser.h
+++ b/Swiften/Parser/PayloadParsers/BytestreamsParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,11 +8,12 @@
 
 #include <boost/optional.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/Bytestreams.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class BytestreamsParser : public GenericPayloadParser<Bytestreams> {
+	class SWIFTEN_API BytestreamsParser : public GenericPayloadParser<Bytestreams> {
 		public:
 			BytestreamsParser();
 			~BytestreamsParser();
diff --git a/Swiften/Parser/PayloadParsers/CapsInfoParser.h b/Swiften/Parser/PayloadParsers/CapsInfoParser.h
index 27330ed..6e4610a 100644
--- a/Swiften/Parser/PayloadParsers/CapsInfoParser.h
+++ b/Swiften/Parser/PayloadParsers/CapsInfoParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/CapsInfo.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class CapsInfoParser : public GenericPayloadParser<CapsInfo> {
+	class SWIFTEN_API CapsInfoParser : public GenericPayloadParser<CapsInfo> {
 		public:
 			CapsInfoParser();
 
diff --git a/Swiften/Parser/PayloadParsers/ChatStateParser.h b/Swiften/Parser/PayloadParsers/ChatStateParser.h
index df8662f..e18e17b 100644
--- a/Swiften/Parser/PayloadParsers/ChatStateParser.h
+++ b/Swiften/Parser/PayloadParsers/ChatStateParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/ChatState.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class ChatStateParser : public GenericPayloadParser<ChatState> {
+	class SWIFTEN_API ChatStateParser : public GenericPayloadParser<ChatState> {
 		public:
 			ChatStateParser();
 
diff --git a/Swiften/Parser/PayloadParsers/ChatStateParserFactory.h b/Swiften/Parser/PayloadParsers/ChatStateParserFactory.h
index 017272c..ac1c14d 100644
--- a/Swiften/Parser/PayloadParsers/ChatStateParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/ChatStateParserFactory.h
@@ -1,18 +1,19 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/ChatStateParser.h>
 
 namespace Swift {
 	class PayloadParserFactoryCollection;
 
-	class ChatStateParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API ChatStateParserFactory : public PayloadParserFactory {
 		public:
 			ChatStateParserFactory() {
 			}
diff --git a/Swiften/Parser/PayloadParsers/CommandParser.h b/Swiften/Parser/PayloadParsers/CommandParser.h
index 61d9279..11badd4 100644
--- a/Swiften/Parser/PayloadParsers/CommandParser.h
+++ b/Swiften/Parser/PayloadParsers/CommandParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,6 +8,7 @@
 
 #include <boost/optional.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/Command.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -15,7 +16,7 @@ namespace Swift {
 	class FormParserFactory;
 	class FormParser;
 
-	class CommandParser : public GenericPayloadParser<Command> {
+	class SWIFTEN_API CommandParser : public GenericPayloadParser<Command> {
 		public:
 			CommandParser();
 			~CommandParser();
diff --git a/Swiften/Parser/PayloadParsers/DelayParser.h b/Swiften/Parser/PayloadParsers/DelayParser.h
index 3a45f90..d5fa58f 100644
--- a/Swiften/Parser/PayloadParsers/DelayParser.h
+++ b/Swiften/Parser/PayloadParsers/DelayParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/Delay.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class DelayParser : public GenericPayloadParser<Delay> {
+	class SWIFTEN_API DelayParser : public GenericPayloadParser<Delay> {
 		public:
 			DelayParser();
 
diff --git a/Swiften/Parser/PayloadParsers/DeliveryReceiptParser.h b/Swiften/Parser/PayloadParsers/DeliveryReceiptParser.h
index 90a0921..bcb73f3 100644
--- a/Swiften/Parser/PayloadParsers/DeliveryReceiptParser.h
+++ b/Swiften/Parser/PayloadParsers/DeliveryReceiptParser.h
@@ -4,13 +4,20 @@
  * See http://www.opensource.org/licenses/bsd-license.php for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/DeliveryReceipt.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class DeliveryReceiptParser : public GenericPayloadParser<DeliveryReceipt> {
+	class SWIFTEN_API DeliveryReceiptParser : public GenericPayloadParser<DeliveryReceipt> {
 		public:
 			DeliveryReceiptParser();
 
diff --git a/Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h b/Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h
index 259e04a..aa5d856 100644
--- a/Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/DeliveryReceiptParserFactory.h
@@ -4,15 +4,22 @@
  * See http://www.opensource.org/licenses/bsd-license.php for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/DeliveryReceiptParser.h>
 
 namespace Swift {
 	class PayloadParserFactoryCollection;
 
-	class DeliveryReceiptParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API DeliveryReceiptParserFactory : public PayloadParserFactory {
 		public:
 			DeliveryReceiptParserFactory() {
 			}
diff --git a/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParser.h b/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParser.h
index 55f7997..5bf27fa 100644
--- a/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParser.h
+++ b/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParser.h
@@ -4,13 +4,20 @@
  * See http://www.opensource.org/licenses/bsd-license.php for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/DeliveryReceiptRequest.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class DeliveryReceiptRequestParser : public GenericPayloadParser<DeliveryReceiptRequest> {
+	class SWIFTEN_API DeliveryReceiptRequestParser : public GenericPayloadParser<DeliveryReceiptRequest> {
 		public:
 			DeliveryReceiptRequestParser();
 
diff --git a/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h b/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h
index 9bd98c2..509db63 100644
--- a/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParserFactory.h
@@ -4,15 +4,22 @@
  * See http://www.opensource.org/licenses/bsd-license.php for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/DeliveryReceiptRequestParser.h>
 
 namespace Swift {
 	class PayloadParserFactoryCollection;
 
-	class DeliveryReceiptRequestParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API DeliveryReceiptRequestParserFactory : public PayloadParserFactory {
 		public:
 			DeliveryReceiptRequestParserFactory() {
 			}
diff --git a/Swiften/Parser/PayloadParsers/DiscoItemsParser.h b/Swiften/Parser/PayloadParsers/DiscoItemsParser.h
index c603938..b467ca1 100644
--- a/Swiften/Parser/PayloadParsers/DiscoItemsParser.h
+++ b/Swiften/Parser/PayloadParsers/DiscoItemsParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/DiscoItems.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class DiscoItemsParser : public GenericPayloadParser<DiscoItems> {
+	class SWIFTEN_API DiscoItemsParser : public GenericPayloadParser<DiscoItems> {
 		public:
 			DiscoItemsParser();
 
diff --git a/Swiften/Parser/PayloadParsers/ErrorParser.h b/Swiften/Parser/PayloadParsers/ErrorParser.h
index 513b503..fc4a5cb 100644
--- a/Swiften/Parser/PayloadParsers/ErrorParser.h
+++ b/Swiften/Parser/PayloadParsers/ErrorParser.h
@@ -1,17 +1,18 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/ErrorPayload.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 	class PayloadParserFactoryCollection;
-	class ErrorParser : public GenericPayloadParser<ErrorPayload> {
+	class SWIFTEN_API ErrorParser : public GenericPayloadParser<ErrorPayload> {
 		public:
 			ErrorParser(PayloadParserFactoryCollection* factories);
 
diff --git a/Swiften/Parser/PayloadParsers/ErrorParserFactory.h b/Swiften/Parser/PayloadParsers/ErrorParserFactory.h
index b7376fd..bcced8b 100644
--- a/Swiften/Parser/PayloadParsers/ErrorParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/ErrorParserFactory.h
@@ -1,18 +1,19 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/ErrorParser.h>
 
 namespace Swift {
 	class PayloadParserFactoryCollection;
 
-	class ErrorParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API ErrorParserFactory : public PayloadParserFactory {
 		public:
 			ErrorParserFactory(PayloadParserFactoryCollection* factories) : factories(factories) {
 			}
diff --git a/Swiften/Parser/PayloadParsers/FormParser.h b/Swiften/Parser/PayloadParsers/FormParser.h
index f865a38..a3b7556 100644
--- a/Swiften/Parser/PayloadParsers/FormParser.h
+++ b/Swiften/Parser/PayloadParsers/FormParser.h
@@ -6,11 +6,12 @@
 
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/Form.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class FormParser : public GenericPayloadParser<Form> {
+	class SWIFTEN_API FormParser : public GenericPayloadParser<Form> {
 		public:
 			FormParser();
 
diff --git a/Swiften/Parser/PayloadParsers/FormParserFactory.h b/Swiften/Parser/PayloadParsers/FormParserFactory.h
index 3551d08..74b2d35 100644
--- a/Swiften/Parser/PayloadParsers/FormParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/FormParserFactory.h
@@ -1,18 +1,19 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/FormParser.h>
 
 namespace Swift {
 	class PayloadParserFactoryCollection;
 
-	class FormParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API FormParserFactory : public PayloadParserFactory {
 		public:
 			FormParserFactory() {
 			}
diff --git a/Swiften/Parser/PayloadParsers/IBBParser.h b/Swiften/Parser/PayloadParsers/IBBParser.h
index 8c0f77a..95fe61a 100644
--- a/Swiften/Parser/PayloadParsers/IBBParser.h
+++ b/Swiften/Parser/PayloadParsers/IBBParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,11 +8,12 @@
 
 #include <boost/optional.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/IBB.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class IBBParser : public GenericPayloadParser<IBB> {
+	class SWIFTEN_API IBBParser : public GenericPayloadParser<IBB> {
 		public:
 			IBBParser();
 			~IBBParser();
diff --git a/Swiften/Parser/PayloadParsers/IdleParser.h b/Swiften/Parser/PayloadParsers/IdleParser.h
index 38001b2..e8bbcf6 100644
--- a/Swiften/Parser/PayloadParsers/IdleParser.h
+++ b/Swiften/Parser/PayloadParsers/IdleParser.h
@@ -4,13 +4,20 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
-#pragma once
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
 
+#pragma once
+ 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/Idle.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class IdleParser : public GenericPayloadParser<Idle> {
+	class SWIFTEN_API IdleParser : public GenericPayloadParser<Idle> {
 		public:
 			IdleParser();
 
diff --git a/Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.h b/Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.h
index 2cd061e..cd8c452 100644
--- a/Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.h
+++ b/Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,6 +8,7 @@
 
 #include <boost/optional.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/InBandRegistrationPayload.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -15,7 +16,7 @@ namespace Swift {
 	class FormParserFactory;
 	class FormParser;
 
-	class InBandRegistrationPayloadParser : public GenericPayloadParser<InBandRegistrationPayload> {
+	class SWIFTEN_API InBandRegistrationPayloadParser : public GenericPayloadParser<InBandRegistrationPayload> {
 		public:
 			InBandRegistrationPayloadParser();
 			~InBandRegistrationPayloadParser();
diff --git a/Swiften/Parser/PayloadParsers/JingleContentPayloadParser.h b/Swiften/Parser/PayloadParsers/JingleContentPayloadParser.h
index a871cc4..977d2eb 100644
--- a/Swiften/Parser/PayloadParsers/JingleContentPayloadParser.h
+++ b/Swiften/Parser/PayloadParsers/JingleContentPayloadParser.h
@@ -4,8 +4,15 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/JingleContentPayload.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -13,7 +20,7 @@ namespace Swift {
 
 class PayloadParserFactoryCollection;
 
-class JingleContentPayloadParser : public GenericPayloadParser<JingleContentPayload> {
+class SWIFTEN_API JingleContentPayloadParser : public GenericPayloadParser<JingleContentPayload> {
 	public:
 		JingleContentPayloadParser(PayloadParserFactoryCollection* factories);
 
diff --git a/Swiften/Parser/PayloadParsers/JingleContentPayloadParserFactory.h b/Swiften/Parser/PayloadParsers/JingleContentPayloadParserFactory.h
index 6d66e74..b343c24 100644
--- a/Swiften/Parser/PayloadParsers/JingleContentPayloadParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/JingleContentPayloadParserFactory.h
@@ -4,8 +4,15 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/GenericPayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/JingleContentPayloadParser.h>
 
@@ -13,7 +20,7 @@ namespace Swift {
 	
 	class PayloadParserFactoryCollection;
 
-	class JingleContentPayloadParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API JingleContentPayloadParserFactory : public PayloadParserFactory {
 		public:
 			JingleContentPayloadParserFactory(PayloadParserFactoryCollection* factories) : factories(factories) {
 			}
diff --git a/Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParser.h b/Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParser.h
index a1215c1..52dd232 100644
--- a/Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParser.h
+++ b/Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParser.h
@@ -5,13 +5,14 @@
  */
 
 /*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/JingleFileTransferDescription.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 #include <Swiften/Parser/PayloadParser.h>
@@ -20,7 +21,7 @@ namespace Swift {
 
 class PayloadParserFactoryCollection;
 
-class JingleFileTransferDescriptionParser : public GenericPayloadParser<JingleFileTransferDescription> {
+class SWIFTEN_API JingleFileTransferDescriptionParser : public GenericPayloadParser<JingleFileTransferDescription> {
 	public:
 		JingleFileTransferDescriptionParser(PayloadParserFactoryCollection* factories);
 
diff --git a/Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParserFactory.h b/Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParserFactory.h
index 7bd4b8a..f8a340c 100644
--- a/Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParserFactory.h
@@ -5,13 +5,14 @@
  */
 
 /*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/GenericPayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParser.h>
 
@@ -19,7 +20,7 @@ namespace Swift {
 	
 	class PayloadParserFactoryCollection;
 
-	class JingleFileTransferDescriptionParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API JingleFileTransferDescriptionParserFactory : public PayloadParserFactory {
 		public:
 			JingleFileTransferDescriptionParserFactory(PayloadParserFactoryCollection* factories) : factories(factories) {
 			}
diff --git a/Swiften/Parser/PayloadParsers/JingleFileTransferFileInfoParser.h b/Swiften/Parser/PayloadParsers/JingleFileTransferFileInfoParser.h
index eb6245c..e49ee69 100644
--- a/Swiften/Parser/PayloadParsers/JingleFileTransferFileInfoParser.h
+++ b/Swiften/Parser/PayloadParsers/JingleFileTransferFileInfoParser.h
@@ -1,17 +1,18 @@
 /*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/JingleFileTransferFileInfo.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 
-class JingleFileTransferFileInfoParser : public GenericPayloadParser<JingleFileTransferFileInfo> {
+class SWIFTEN_API JingleFileTransferFileInfoParser : public GenericPayloadParser<JingleFileTransferFileInfo> {
 	public:
 		JingleFileTransferFileInfoParser();
 
diff --git a/Swiften/Parser/PayloadParsers/JingleFileTransferHashParser.h b/Swiften/Parser/PayloadParsers/JingleFileTransferHashParser.h
index 5a7c6c5..15d3294 100644
--- a/Swiften/Parser/PayloadParsers/JingleFileTransferHashParser.h
+++ b/Swiften/Parser/PayloadParsers/JingleFileTransferHashParser.h
@@ -5,19 +5,20 @@
  */
 
 /*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/JingleFileTransferHash.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 
-class JingleFileTransferHashParser : public GenericPayloadParser<JingleFileTransferHash> {
+class SWIFTEN_API JingleFileTransferHashParser : public GenericPayloadParser<JingleFileTransferHash> {
 public:
 	JingleFileTransferHashParser();
 	
diff --git a/Swiften/Parser/PayloadParsers/JingleIBBTransportMethodPayloadParser.h b/Swiften/Parser/PayloadParsers/JingleIBBTransportMethodPayloadParser.h
index 311cc5b..4e22943 100644
--- a/Swiften/Parser/PayloadParsers/JingleIBBTransportMethodPayloadParser.h
+++ b/Swiften/Parser/PayloadParsers/JingleIBBTransportMethodPayloadParser.h
@@ -4,14 +4,21 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/JingleIBBTransportPayload.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 
-class JingleIBBTransportMethodPayloadParser : public GenericPayloadParser<JingleIBBTransportPayload> {
+class SWIFTEN_API JingleIBBTransportMethodPayloadParser : public GenericPayloadParser<JingleIBBTransportPayload> {
 	public:
 		JingleIBBTransportMethodPayloadParser();
 
diff --git a/Swiften/Parser/PayloadParsers/JingleParser.h b/Swiften/Parser/PayloadParsers/JingleParser.h
index c7bd58c..ad49e96 100644
--- a/Swiften/Parser/PayloadParsers/JingleParser.h
+++ b/Swiften/Parser/PayloadParsers/JingleParser.h
@@ -4,15 +4,22 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/JinglePayload.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 #include <Swiften/Parser/PayloadParserFactoryCollection.h>
 
 namespace Swift {
 
-class JingleParser : public GenericPayloadParser<JinglePayload> {
+class SWIFTEN_API JingleParser : public GenericPayloadParser<JinglePayload> {
 		public:
 			JingleParser(PayloadParserFactoryCollection* factories);
 
diff --git a/Swiften/Parser/PayloadParsers/JingleParserFactory.h b/Swiften/Parser/PayloadParsers/JingleParserFactory.h
index fa25aeb..73395fc 100644
--- a/Swiften/Parser/PayloadParsers/JingleParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/JingleParserFactory.h
@@ -4,8 +4,15 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/GenericPayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/JingleParser.h>
 
@@ -13,7 +20,7 @@ namespace Swift {
 	
 	class PayloadParserFactoryCollection;
 
-	class JingleParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API JingleParserFactory : public PayloadParserFactory {
 		public:
 			JingleParserFactory(PayloadParserFactoryCollection* factories) : factories(factories) {
 			}
diff --git a/Swiften/Parser/PayloadParsers/JingleReasonParser.h b/Swiften/Parser/PayloadParsers/JingleReasonParser.h
index 08af31a..4fe334e 100644
--- a/Swiften/Parser/PayloadParsers/JingleReasonParser.h
+++ b/Swiften/Parser/PayloadParsers/JingleReasonParser.h
@@ -4,14 +4,21 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/JinglePayload.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 
-class JingleReasonParser : public GenericPayloadParser<JinglePayload::Reason> {
+class SWIFTEN_API JingleReasonParser : public GenericPayloadParser<JinglePayload::Reason> {
 	public:
 		JingleReasonParser();
 
diff --git a/Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.h b/Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.h
index 1987d3f..ccf0b1b 100644
--- a/Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.h
+++ b/Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.h
@@ -4,14 +4,21 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/JingleS5BTransportPayload.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 
-class JingleS5BTransportMethodPayloadParser : public GenericPayloadParser<JingleS5BTransportPayload> {
+class SWIFTEN_API JingleS5BTransportMethodPayloadParser : public GenericPayloadParser<JingleS5BTransportPayload> {
 	public:
 		JingleS5BTransportMethodPayloadParser();
 
diff --git a/Swiften/Parser/PayloadParsers/LastParser.h b/Swiften/Parser/PayloadParsers/LastParser.h
index 1ccdf60..58cde22 100644
--- a/Swiften/Parser/PayloadParsers/LastParser.h
+++ b/Swiften/Parser/PayloadParsers/LastParser.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 <Swiften/Base/API.h>
 #include <Swiften/Elements/Last.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class LastParser : public GenericPayloadParser<Last> {
+	class SWIFTEN_API LastParser : public GenericPayloadParser<Last> {
 		public:
 			LastParser();
 
diff --git a/Swiften/Parser/PayloadParsers/MUCAdminPayloadParser.h b/Swiften/Parser/PayloadParsers/MUCAdminPayloadParser.h
index 2cef4d8..9174c7d 100644
--- a/Swiften/Parser/PayloadParsers/MUCAdminPayloadParser.h
+++ b/Swiften/Parser/PayloadParsers/MUCAdminPayloadParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,12 +8,13 @@
 
 #include <boost/optional.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/MUCAdminPayload.h>
 #include <Swiften/Parser/GenericPayloadTreeParser.h>
 #include <Swiften/Parser/PayloadParsers/MUCItemParser.h>
 
 namespace Swift {
-	class MUCAdminPayloadParser : public GenericPayloadTreeParser<MUCAdminPayload> {
+	class SWIFTEN_API MUCAdminPayloadParser : public GenericPayloadTreeParser<MUCAdminPayload> {
 		public:
 			virtual void handleTree(ParserElement::ref root);
 	};
diff --git a/Swiften/Parser/PayloadParsers/MUCDestroyPayloadParser.h b/Swiften/Parser/PayloadParsers/MUCDestroyPayloadParser.h
index 55d6ecd..1e5d545 100644
--- a/Swiften/Parser/PayloadParsers/MUCDestroyPayloadParser.h
+++ b/Swiften/Parser/PayloadParsers/MUCDestroyPayloadParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,11 +8,12 @@
 
 #include <boost/optional.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/MUCDestroyPayload.h>
 #include <Swiften/Parser/GenericPayloadTreeParser.h>
 
 namespace Swift {
-	class MUCDestroyPayloadParser : public GenericPayloadTreeParser<MUCDestroyPayload> {
+	class SWIFTEN_API MUCDestroyPayloadParser : public GenericPayloadTreeParser<MUCDestroyPayload> {
 		public:
 			virtual void handleTree(ParserElement::ref root);
 	};
diff --git a/Swiften/Parser/PayloadParsers/MUCInvitationPayloadParser.h b/Swiften/Parser/PayloadParsers/MUCInvitationPayloadParser.h
index df365e0..f79c971 100644
--- a/Swiften/Parser/PayloadParsers/MUCInvitationPayloadParser.h
+++ b/Swiften/Parser/PayloadParsers/MUCInvitationPayloadParser.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 <Swiften/Base/API.h>
 #include <Swiften/Elements/MUCInvitationPayload.h>
 #include <Swiften/Parser/GenericPayloadTreeParser.h>
 
 namespace Swift {
-	class MUCInvitationPayloadParser : public GenericPayloadTreeParser<MUCInvitationPayload> {
+	class SWIFTEN_API MUCInvitationPayloadParser : public GenericPayloadTreeParser<MUCInvitationPayload> {
 		public:
 			virtual void handleTree(ParserElement::ref root);
 	};
diff --git a/Swiften/Parser/PayloadParsers/MUCItemParser.h b/Swiften/Parser/PayloadParsers/MUCItemParser.h
index ccfc610..fc5d657 100644
--- a/Swiften/Parser/PayloadParsers/MUCItemParser.h
+++ b/Swiften/Parser/PayloadParsers/MUCItemParser.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 <Swiften/Base/API.h>
 #include <Swiften/Elements/MUCItem.h>
 #include <Swiften/Parser/GenericPayloadTreeParser.h>
 
 namespace Swift {
-	class MUCItemParser  {
+	class SWIFTEN_API MUCItemParser  {
 		public:
 			static MUCItem itemFromTree(ParserElement::ref root);
 		private:
diff --git a/Swiften/Parser/PayloadParsers/MUCOwnerPayloadParser.h b/Swiften/Parser/PayloadParsers/MUCOwnerPayloadParser.h
index 50d1aa6..85db82f 100644
--- a/Swiften/Parser/PayloadParsers/MUCOwnerPayloadParser.h
+++ b/Swiften/Parser/PayloadParsers/MUCOwnerPayloadParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,13 +8,14 @@
 
 #include <boost/optional.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/MUCOwnerPayload.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 	class PayloadParserFactoryCollection;
 
-	class MUCOwnerPayloadParser : public GenericPayloadParser<MUCOwnerPayload> {
+	class SWIFTEN_API MUCOwnerPayloadParser : public GenericPayloadParser<MUCOwnerPayload> {
 		public:
 		MUCOwnerPayloadParser(PayloadParserFactoryCollection* factories);
 
diff --git a/Swiften/Parser/PayloadParsers/MUCOwnerPayloadParserFactory.h b/Swiften/Parser/PayloadParsers/MUCOwnerPayloadParserFactory.h
index eb682ab..9270dc7 100644
--- a/Swiften/Parser/PayloadParsers/MUCOwnerPayloadParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/MUCOwnerPayloadParserFactory.h
@@ -1,18 +1,19 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/MUCOwnerPayloadParser.h>
 
 namespace Swift {
 	class PayloadParserFactoryCollection;
 
-	class MUCOwnerPayloadParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API MUCOwnerPayloadParserFactory : public PayloadParserFactory {
 		public:
 			MUCOwnerPayloadParserFactory(PayloadParserFactoryCollection* factories) : factories(factories) {
 			}
diff --git a/Swiften/Parser/PayloadParsers/MUCUserPayloadParser.h b/Swiften/Parser/PayloadParsers/MUCUserPayloadParser.h
index b940604..3d7a53b 100644
--- a/Swiften/Parser/PayloadParsers/MUCUserPayloadParser.h
+++ b/Swiften/Parser/PayloadParsers/MUCUserPayloadParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,13 +8,14 @@
 
 #include <boost/optional.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/MUCUserPayload.h>
 #include <Swiften/Parser/GenericPayloadTreeParser.h>
 #include <Swiften/Parser/PayloadParsers/MUCItemParser.h>
 
 namespace Swift {
 	class PayloadParserFactoryCollection;
-	class MUCUserPayloadParser : public GenericPayloadTreeParser<MUCUserPayload> {
+	class SWIFTEN_API MUCUserPayloadParser : public GenericPayloadTreeParser<MUCUserPayload> {
 		public:
 			MUCUserPayloadParser(PayloadParserFactoryCollection* collection) : factories(collection) {}
 			virtual void handleTree(ParserElement::ref root);
diff --git a/Swiften/Parser/PayloadParsers/MUCUserPayloadParserFactory.h b/Swiften/Parser/PayloadParsers/MUCUserPayloadParserFactory.h
index 4521ad6..4cc9134 100644
--- a/Swiften/Parser/PayloadParsers/MUCUserPayloadParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/MUCUserPayloadParserFactory.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericPayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/MUCUserPayloadParser.h>
 
 namespace Swift {
-	class MUCUserPayloadParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API MUCUserPayloadParserFactory : public PayloadParserFactory {
 		public:
 			MUCUserPayloadParserFactory(PayloadParserFactoryCollection* factories) : factories(factories) {
 			}
diff --git a/Swiften/Parser/PayloadParsers/NicknameParser.h b/Swiften/Parser/PayloadParsers/NicknameParser.h
index 653ff27..d8ac5b5 100644
--- a/Swiften/Parser/PayloadParsers/NicknameParser.h
+++ b/Swiften/Parser/PayloadParsers/NicknameParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/Nickname.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class NicknameParser : public GenericPayloadParser<Nickname> {
+	class SWIFTEN_API NicknameParser : public GenericPayloadParser<Nickname> {
 		public:
 			NicknameParser();
 
diff --git a/Swiften/Parser/PayloadParsers/PriorityParser.h b/Swiften/Parser/PayloadParsers/PriorityParser.h
index d84d961..6c34e3b 100644
--- a/Swiften/Parser/PayloadParsers/PriorityParser.h
+++ b/Swiften/Parser/PayloadParsers/PriorityParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/Priority.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class PriorityParser : public GenericPayloadParser<Priority> {
+	class SWIFTEN_API PriorityParser : public GenericPayloadParser<Priority> {
 		public:
 			PriorityParser();
 
diff --git a/Swiften/Parser/PayloadParsers/PrivateStorageParser.h b/Swiften/Parser/PayloadParsers/PrivateStorageParser.h
index eb10594..57e4136 100644
--- a/Swiften/Parser/PayloadParsers/PrivateStorageParser.h
+++ b/Swiften/Parser/PayloadParsers/PrivateStorageParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,13 +8,14 @@
 
 #include <boost/optional.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/PrivateStorage.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 	class PayloadParserFactoryCollection;
 
-	class PrivateStorageParser : public GenericPayloadParser<PrivateStorage> {
+	class SWIFTEN_API PrivateStorageParser : public GenericPayloadParser<PrivateStorage> {
 		public:
 			PrivateStorageParser(PayloadParserFactoryCollection* factories);
 
diff --git a/Swiften/Parser/PayloadParsers/PrivateStorageParserFactory.h b/Swiften/Parser/PayloadParsers/PrivateStorageParserFactory.h
index 6e7c1d2..e8db9af 100644
--- a/Swiften/Parser/PayloadParsers/PrivateStorageParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/PrivateStorageParserFactory.h
@@ -1,18 +1,19 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/PrivateStorageParser.h>
 
 namespace Swift {
 	class PayloadParserFactoryCollection;
 
-	class PrivateStorageParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API PrivateStorageParserFactory : public PayloadParserFactory {
 		public:
 			PrivateStorageParserFactory(PayloadParserFactoryCollection* factories) : factories(factories) {
 			}
diff --git a/Swiften/Parser/PayloadParsers/PubSubErrorParserFactory.h b/Swiften/Parser/PayloadParsers/PubSubErrorParserFactory.h
index 2d2b443..e421581 100644
--- a/Swiften/Parser/PayloadParsers/PubSubErrorParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/PubSubErrorParserFactory.h
@@ -1,16 +1,17 @@
 /*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/PubSubErrorParser.h>
 
 namespace Swift {
-	class PubSubErrorParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API PubSubErrorParserFactory : public PayloadParserFactory {
 		public:
 			PubSubErrorParserFactory() {
 			}
diff --git a/Swiften/Parser/PayloadParsers/RawXMLPayloadParserFactory.h b/Swiften/Parser/PayloadParsers/RawXMLPayloadParserFactory.h
index 7b9a32f..a363098 100644
--- a/Swiften/Parser/PayloadParsers/RawXMLPayloadParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/RawXMLPayloadParserFactory.h
@@ -1,17 +1,18 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/PayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/RawXMLPayloadParser.h>
 #include <string>
 
 namespace Swift {
-	class RawXMLPayloadParserFactory : public PayloadParserFactory {
+	class SWIFTEN_API RawXMLPayloadParserFactory : public PayloadParserFactory {
 		public:
 			RawXMLPayloadParserFactory() {}
 
diff --git a/Swiften/Parser/PayloadParsers/ReplaceParser.h b/Swiften/Parser/PayloadParsers/ReplaceParser.h
index 4d73459..3c1fbbc 100644
--- a/Swiften/Parser/PayloadParsers/ReplaceParser.h
+++ b/Swiften/Parser/PayloadParsers/ReplaceParser.h
@@ -4,13 +4,20 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/Replace.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class ReplaceParser : public GenericPayloadParser<Replace> {
+	class SWIFTEN_API ReplaceParser : public GenericPayloadParser<Replace> {
 		public:
 			ReplaceParser();
 			virtual void handleStartElement(const std::string& element, const std::string&, const AttributeMap& attributes);
diff --git a/Swiften/Parser/PayloadParsers/ResourceBindParser.h b/Swiften/Parser/PayloadParsers/ResourceBindParser.h
index fd9cf73..134bf14 100644
--- a/Swiften/Parser/PayloadParsers/ResourceBindParser.h
+++ b/Swiften/Parser/PayloadParsers/ResourceBindParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/ResourceBind.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class ResourceBindParser : public GenericPayloadParser<ResourceBind> {
+	class SWIFTEN_API ResourceBindParser : public GenericPayloadParser<ResourceBind> {
 		public:
 			ResourceBindParser();
 
diff --git a/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h b/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h
index 5652b94..bf3dace 100644
--- a/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h
+++ b/Swiften/Parser/PayloadParsers/RosterItemExchangeParser.h
@@ -4,15 +4,22 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/RosterItemExchangePayload.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 	class SerializingParser;
 
-	class RosterItemExchangeParser : public GenericPayloadParser<RosterItemExchangePayload> {
+	class SWIFTEN_API RosterItemExchangeParser : public GenericPayloadParser<RosterItemExchangePayload> {
 		public:
 			RosterItemExchangeParser();
 
diff --git a/Swiften/Parser/PayloadParsers/S5BProxyRequestParser.h b/Swiften/Parser/PayloadParsers/S5BProxyRequestParser.h
index 0bf1a26..408bb5a 100644
--- a/Swiften/Parser/PayloadParsers/S5BProxyRequestParser.h
+++ b/Swiften/Parser/PayloadParsers/S5BProxyRequestParser.h
@@ -4,16 +4,23 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
 #include <string>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/S5BProxyRequest.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 
-class S5BProxyRequestParser : public GenericPayloadParser<S5BProxyRequest> {
+class SWIFTEN_API S5BProxyRequestParser : public GenericPayloadParser<S5BProxyRequest> {
 public:
 	S5BProxyRequestParser();
 	virtual ~S5BProxyRequestParser();
diff --git a/Swiften/Parser/PayloadParsers/SearchPayloadParser.h b/Swiften/Parser/PayloadParsers/SearchPayloadParser.h
index 75e64c7..bfcb86d 100644
--- a/Swiften/Parser/PayloadParsers/SearchPayloadParser.h
+++ b/Swiften/Parser/PayloadParsers/SearchPayloadParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,6 +8,7 @@
 
 #include <boost/optional.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/SearchPayload.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -15,7 +16,7 @@ namespace Swift {
 	class FormParserFactory;
 	class FormParser;
 
-	class SearchPayloadParser : public GenericPayloadParser<SearchPayload> {
+	class SWIFTEN_API SearchPayloadParser : public GenericPayloadParser<SearchPayload> {
 		public:
 			SearchPayloadParser();
 			~SearchPayloadParser();
diff --git a/Swiften/Parser/PayloadParsers/SecurityLabelParser.h b/Swiften/Parser/PayloadParsers/SecurityLabelParser.h
index 0933fa6..857df6a 100644
--- a/Swiften/Parser/PayloadParsers/SecurityLabelParser.h
+++ b/Swiften/Parser/PayloadParsers/SecurityLabelParser.h
@@ -1,18 +1,19 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/SecurityLabel.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 	class SerializingParser;
 
-	class SecurityLabelParser : public GenericPayloadParser<SecurityLabel> {
+	class SWIFTEN_API SecurityLabelParser : public GenericPayloadParser<SecurityLabel> {
 		public:
 			SecurityLabelParser();
 
diff --git a/Swiften/Parser/PayloadParsers/SecurityLabelParserFactory.h b/Swiften/Parser/PayloadParsers/SecurityLabelParserFactory.h
index fe7f889..1eabb07 100644
--- a/Swiften/Parser/PayloadParsers/SecurityLabelParserFactory.h
+++ b/Swiften/Parser/PayloadParsers/SecurityLabelParserFactory.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericPayloadParserFactory.h>
 #include <Swiften/Parser/PayloadParsers/SecurityLabelParser.h>
 
 namespace Swift {
-	class SecurityLabelParserFactory : public GenericPayloadParserFactory<SecurityLabelParser> {
+	class SWIFTEN_API SecurityLabelParserFactory : public GenericPayloadParserFactory<SecurityLabelParser> {
 		public:
 			SecurityLabelParserFactory() : GenericPayloadParserFactory<SecurityLabelParser>("securitylabel", "urn:xmpp:sec-label:0") {}
 	};
diff --git a/Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.h b/Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.h
index fc66379..689ebb8 100644
--- a/Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.h
+++ b/Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.h
@@ -1,11 +1,12 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/SecurityLabelsCatalog.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -13,7 +14,7 @@ namespace Swift {
 	class SecurityLabelParserFactory;
 	class SecurityLabelParser;
 
-	class SecurityLabelsCatalogParser : public GenericPayloadParser<SecurityLabelsCatalog> {
+	class SWIFTEN_API SecurityLabelsCatalogParser : public GenericPayloadParser<SecurityLabelsCatalog> {
 		public:
 			SecurityLabelsCatalogParser();
 			~SecurityLabelsCatalogParser();
diff --git a/Swiften/Parser/PayloadParsers/SoftwareVersionParser.h b/Swiften/Parser/PayloadParsers/SoftwareVersionParser.h
index 1f4310b..a66dd1a 100644
--- a/Swiften/Parser/PayloadParsers/SoftwareVersionParser.h
+++ b/Swiften/Parser/PayloadParsers/SoftwareVersionParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/SoftwareVersion.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class SoftwareVersionParser : public GenericPayloadParser<SoftwareVersion> {
+	class SWIFTEN_API SoftwareVersionParser : public GenericPayloadParser<SoftwareVersion> {
 		public:
 			SoftwareVersionParser();
 
diff --git a/Swiften/Parser/PayloadParsers/StartSessionParser.h b/Swiften/Parser/PayloadParsers/StartSessionParser.h
index ae8a4fa..d5a9c2e 100644
--- a/Swiften/Parser/PayloadParsers/StartSessionParser.h
+++ b/Swiften/Parser/PayloadParsers/StartSessionParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/StartSession.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class StartSessionParser : public GenericPayloadParser<StartSession> {
+	class SWIFTEN_API StartSessionParser : public GenericPayloadParser<StartSession> {
 		public:
 			StartSessionParser() {}
 
diff --git a/Swiften/Parser/PayloadParsers/StatusParser.h b/Swiften/Parser/PayloadParsers/StatusParser.h
index 4929f20..689897b 100644
--- a/Swiften/Parser/PayloadParsers/StatusParser.h
+++ b/Swiften/Parser/PayloadParsers/StatusParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/Status.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class StatusParser : public GenericPayloadParser<Status> {
+	class SWIFTEN_API StatusParser : public GenericPayloadParser<Status> {
 		public:
 			StatusParser();
 
diff --git a/Swiften/Parser/PayloadParsers/StatusShowParser.h b/Swiften/Parser/PayloadParsers/StatusShowParser.h
index f442ab7..2bdcd56 100644
--- a/Swiften/Parser/PayloadParsers/StatusShowParser.h
+++ b/Swiften/Parser/PayloadParsers/StatusShowParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/StatusShow.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class StatusShowParser : public GenericPayloadParser<StatusShow> {
+	class SWIFTEN_API StatusShowParser : public GenericPayloadParser<StatusShow> {
 		public:
 			StatusShowParser();
 
diff --git a/Swiften/Parser/PayloadParsers/StorageParser.h b/Swiften/Parser/PayloadParsers/StorageParser.h
index 0cbf288..0fea4c9 100644
--- a/Swiften/Parser/PayloadParsers/StorageParser.h
+++ b/Swiften/Parser/PayloadParsers/StorageParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,11 +8,12 @@
 
 #include <boost/optional.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/Storage.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class StorageParser : public GenericPayloadParser<Storage> {
+	class SWIFTEN_API StorageParser : public GenericPayloadParser<Storage> {
 		public:
 			StorageParser();
 
diff --git a/Swiften/Parser/PayloadParsers/StreamInitiationFileInfoParser.h b/Swiften/Parser/PayloadParsers/StreamInitiationFileInfoParser.h
index 6d3591d..722797d 100644
--- a/Swiften/Parser/PayloadParsers/StreamInitiationFileInfoParser.h
+++ b/Swiften/Parser/PayloadParsers/StreamInitiationFileInfoParser.h
@@ -4,14 +4,21 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/StreamInitiationFileInfo.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 
-class StreamInitiationFileInfoParser : public GenericPayloadParser<StreamInitiationFileInfo> {
+class SWIFTEN_API StreamInitiationFileInfoParser : public GenericPayloadParser<StreamInitiationFileInfo> {
 	public:
 		StreamInitiationFileInfoParser();
 
diff --git a/Swiften/Parser/PayloadParsers/StreamInitiationParser.h b/Swiften/Parser/PayloadParsers/StreamInitiationParser.h
index 51adf44..66ce778 100644
--- a/Swiften/Parser/PayloadParsers/StreamInitiationParser.h
+++ b/Swiften/Parser/PayloadParsers/StreamInitiationParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,6 +8,7 @@
 
 #include <boost/optional.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/StreamInitiation.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
@@ -15,7 +16,7 @@ namespace Swift {
 	class FormParserFactory;
 	class FormParser;
 
-	class StreamInitiationParser : public GenericPayloadParser<StreamInitiation> {
+	class SWIFTEN_API StreamInitiationParser : public GenericPayloadParser<StreamInitiation> {
 		public:
 			StreamInitiationParser();
 			~StreamInitiationParser();
diff --git a/Swiften/Parser/PayloadParsers/SubjectParser.h b/Swiften/Parser/PayloadParsers/SubjectParser.h
index 8edfe40..804c50b 100644
--- a/Swiften/Parser/PayloadParsers/SubjectParser.h
+++ b/Swiften/Parser/PayloadParsers/SubjectParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/Subject.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
-	class SubjectParser : public GenericPayloadParser<Subject> {
+	class SWIFTEN_API SubjectParser : public GenericPayloadParser<Subject> {
 		public:
 			SubjectParser();
 
diff --git a/Swiften/Parser/PayloadParsers/VCardUpdateParser.h b/Swiften/Parser/PayloadParsers/VCardUpdateParser.h
index 931213b..cbd08e7 100644
--- a/Swiften/Parser/PayloadParsers/VCardUpdateParser.h
+++ b/Swiften/Parser/PayloadParsers/VCardUpdateParser.h
@@ -1,18 +1,19 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/VCardUpdate.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 
 namespace Swift {
 	class SerializingParser;
 
-	class VCardUpdateParser : public GenericPayloadParser<VCardUpdate> {
+	class SWIFTEN_API VCardUpdateParser : public GenericPayloadParser<VCardUpdate> {
 		public:
 			VCardUpdateParser();
 
diff --git a/Swiften/Parser/PayloadParsers/WhiteboardParser.h b/Swiften/Parser/PayloadParsers/WhiteboardParser.h
index 0368c7c..89848b5 100644
--- a/Swiften/Parser/PayloadParsers/WhiteboardParser.h
+++ b/Swiften/Parser/PayloadParsers/WhiteboardParser.h
@@ -4,15 +4,22 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Elements/WhiteboardPayload.h>
 #include <Swiften/Parser/GenericPayloadParser.h>
 #include <Swiften/Elements/Whiteboard/WhiteboardElement.h>
 #include <Swiften/Elements/Whiteboard/WhiteboardOperation.h>
 
 namespace Swift {
-	class WhiteboardParser : public Swift::GenericPayloadParser<WhiteboardPayload> {
+	class SWIFTEN_API WhiteboardParser : public Swift::GenericPayloadParser<WhiteboardPayload> {
 	public:
 		WhiteboardParser();
 
diff --git a/Swiften/Parser/StanzaAckRequestParser.h b/Swiften/Parser/StanzaAckRequestParser.h
index 8b55704..039cf26 100644
--- a/Swiften/Parser/StanzaAckRequestParser.h
+++ b/Swiften/Parser/StanzaAckRequestParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/StanzaAckRequest.h>
 
 namespace Swift {
-	class StanzaAckRequestParser : public GenericElementParser<StanzaAckRequest> {
+	class SWIFTEN_API StanzaAckRequestParser : public GenericElementParser<StanzaAckRequest> {
 		public:
 			StanzaAckRequestParser() : GenericElementParser<StanzaAckRequest>() {}
 	};
diff --git a/Swiften/Parser/StartTLSFailureParser.h b/Swiften/Parser/StartTLSFailureParser.h
index 46a4966..216449c 100644
--- a/Swiften/Parser/StartTLSFailureParser.h
+++ b/Swiften/Parser/StartTLSFailureParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/StartTLSFailure.h>
 
 namespace Swift {
-	class StartTLSFailureParser : public GenericElementParser<StartTLSFailure> {
+	class SWIFTEN_API StartTLSFailureParser : public GenericElementParser<StartTLSFailure> {
 		public:
 			StartTLSFailureParser() : GenericElementParser<StartTLSFailure>() {}
 	};
diff --git a/Swiften/Parser/StartTLSParser.h b/Swiften/Parser/StartTLSParser.h
index 7a84c1a..0282456 100644
--- a/Swiften/Parser/StartTLSParser.h
+++ b/Swiften/Parser/StartTLSParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/StartTLSRequest.h>
 
 namespace Swift {
-	class StartTLSParser : public GenericElementParser<StartTLSRequest> {
+	class SWIFTEN_API StartTLSParser : public GenericElementParser<StartTLSRequest> {
 		public:
 			StartTLSParser() : GenericElementParser<StartTLSRequest>() {}
 	};
diff --git a/Swiften/Parser/StreamErrorParser.h b/Swiften/Parser/StreamErrorParser.h
index f8d1159..74f9127 100644
--- a/Swiften/Parser/StreamErrorParser.h
+++ b/Swiften/Parser/StreamErrorParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Elements/StreamError.h>
 #include <Swiften/Parser/GenericElementParser.h>
 
 namespace Swift {
-	class StreamErrorParser : public GenericElementParser<StreamError> {
+	class SWIFTEN_API StreamErrorParser : public GenericElementParser<StreamError> {
 		public:
 			StreamErrorParser();
 
diff --git a/Swiften/Parser/StreamManagementFailedParser.h b/Swiften/Parser/StreamManagementFailedParser.h
index 5c30184..af490b7 100644
--- a/Swiften/Parser/StreamManagementFailedParser.h
+++ b/Swiften/Parser/StreamManagementFailedParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/StreamManagementFailed.h>
 
 namespace Swift {
-	class StreamManagementFailedParser : public GenericElementParser<StreamManagementFailed> {
+	class SWIFTEN_API StreamManagementFailedParser : public GenericElementParser<StreamManagementFailed> {
 		public:
 			StreamManagementFailedParser() : GenericElementParser<StreamManagementFailed>() {}
 	};
diff --git a/Swiften/Parser/StreamResumeParser.h b/Swiften/Parser/StreamResumeParser.h
index 4b9b7f9..a8659c1 100644
--- a/Swiften/Parser/StreamResumeParser.h
+++ b/Swiften/Parser/StreamResumeParser.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 <Swiften/Base/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/StreamResume.h>
 
 namespace Swift {
-	class StreamResumeParser : public GenericElementParser<StreamResume> {
+	class SWIFTEN_API StreamResumeParser : public GenericElementParser<StreamResume> {
 		public:
 			StreamResumeParser();
 			~StreamResumeParser();
diff --git a/Swiften/Parser/StreamResumedParser.h b/Swiften/Parser/StreamResumedParser.h
index f4698fa..66722bf 100644
--- a/Swiften/Parser/StreamResumedParser.h
+++ b/Swiften/Parser/StreamResumedParser.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 <Swiften/Base/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/StreamResumed.h>
 
 namespace Swift {
-	class StreamResumedParser : public GenericElementParser<StreamResumed> {
+	class SWIFTEN_API StreamResumedParser : public GenericElementParser<StreamResumed> {
 		public:
 			StreamResumedParser();
 			~StreamResumedParser();
diff --git a/Swiften/Parser/TLSProceedParser.h b/Swiften/Parser/TLSProceedParser.h
index 549d2f6..6c6464f 100644
--- a/Swiften/Parser/TLSProceedParser.h
+++ b/Swiften/Parser/TLSProceedParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/TLSProceed.h>
 
 namespace Swift {
-	class TLSProceedParser : public GenericElementParser<TLSProceed> {
+	class SWIFTEN_API TLSProceedParser : public GenericElementParser<TLSProceed> {
 		public:
 			TLSProceedParser() : GenericElementParser<TLSProceed>() {}
 	};
diff --git a/Swiften/Parser/Tree/NullParserElement.h b/Swiften/Parser/Tree/NullParserElement.h
index d844567..60d8353 100644
--- a/Swiften/Parser/Tree/NullParserElement.h
+++ b/Swiften/Parser/Tree/NullParserElement.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -7,10 +7,11 @@
 #pragma once
 
 #include <string>
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/Tree/ParserElement.h>
 
 namespace Swift {
-	class NullParserElement : public ParserElement {
+	class SWIFTEN_API NullParserElement : public ParserElement {
 		public:
 			NullParserElement() : ParserElement("", "", AttributeMap()) {}
 
diff --git a/Swiften/Parser/Tree/TreeReparser.h b/Swiften/Parser/Tree/TreeReparser.h
index 8342000..80a326b 100644
--- a/Swiften/Parser/Tree/TreeReparser.h
+++ b/Swiften/Parser/Tree/TreeReparser.h
@@ -1,17 +1,18 @@
 /*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #pragma once
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/GenericPayloadTreeParser.h>
 #include <Swiften/Parser/PayloadParsers/MUCItemParser.h>
 
 namespace Swift {
 	class PayloadParserFactoryCollection;
-	class TreeReparser {
+	class SWIFTEN_API TreeReparser {
 		public:
 			static boost::shared_ptr<Payload> parseTree(ParserElement::ref root, PayloadParserFactoryCollection* collection);
 
diff --git a/Swiften/Parser/UnknownElementParser.h b/Swiften/Parser/UnknownElementParser.h
index 89c3175..ac9cc79 100644
--- a/Swiften/Parser/UnknownElementParser.h
+++ b/Swiften/Parser/UnknownElementParser.h
@@ -1,16 +1,17 @@
 /*
- * 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/API.h>
 #include <Swiften/Parser/GenericElementParser.h>
 #include <Swiften/Elements/UnknownElement.h>
 
 namespace Swift {
-	class UnknownElementParser : public GenericElementParser<UnknownElement> {
+	class SWIFTEN_API UnknownElementParser : public GenericElementParser<UnknownElement> {
 		public:
 			UnknownElementParser() : GenericElementParser<UnknownElement>() {}
 	};
diff --git a/Swiften/Parser/UnknownPayloadParser.h b/Swiften/Parser/UnknownPayloadParser.h
index 366b16a..96e7b77 100644
--- a/Swiften/Parser/UnknownPayloadParser.h
+++ b/Swiften/Parser/UnknownPayloadParser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -8,10 +8,11 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include <Swiften/Base/API.h>
 #include <Swiften/Parser/PayloadParser.h>
 
 namespace Swift {
-	class UnknownPayloadParser : public PayloadParser {
+	class SWIFTEN_API UnknownPayloadParser : public PayloadParser {
 		public:
 			UnknownPayloadParser() {}
author	Tobias Markmann <tm@ayena.de>	2015-06-07 22:34:19 (GMT)
committer	Tobias Markmann <tm@ayena.de>	2015-06-08 09:37:53 (GMT)
commit	b6b0695643f932827add43b9de0e09ed74eb6799 (patch)
tree	72456efba9fab6fbc6004a98f0a61b7a8167f791 /Swiften/Parser
parent	3741c9ad5c0cc6f92e4ed913d67b3b530882334e (diff)
download	swift-b6b0695643f932827add43b9de0e09ed74eb6799.zip swift-b6b0695643f932827add43b9de0e09ed74eb6799.tar.bz2