6 files changed, 8 insertions, 6 deletions
diff --git a/Swiften/Client/MemoryStorages.cpp b/Swiften/Client/MemoryStorages.cpp
index f0f1493..fc65cd5 100644
--- a/Swiften/Client/MemoryStorages.cpp
+++ b/Swiften/Client/MemoryStorages.cpp
@@ -1,18 +1,20 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Client/MemoryStorages.h>
 #include <Swiften/VCards/VCardMemoryStorage.h>
 #include <Swiften/Avatars/AvatarMemoryStorage.h>
 #include <Swiften/Disco/CapsMemoryStorage.h>
 #include <Swiften/Roster/RosterMemoryStorage.h>
+#ifdef SWIFT_EXPERIMENTAL_HISTORY
 #include <Swiften/History/SQLiteHistoryStorage.h>
+#endif
 
 namespace Swift {
 
 MemoryStorages::MemoryStorages(CryptoProvider* crypto) {
 	vcardStorage = new VCardMemoryStorage(crypto);
 	capsStorage = new CapsMemoryStorage();
diff --git a/Swiften/Parser/GenericPayloadParser.h b/Swiften/Parser/GenericPayloadParser.h
index 7bc990a..b6cd2d7 100644
--- a/Swiften/Parser/GenericPayloadParser.h
+++ b/Swiften/Parser/GenericPayloadParser.h
@@ -20,13 +20,13 @@ namespace Swift {
 	 * A generic payload parser for payloads of the given type.
 	 *
 	 * This class provides getPayloadInternal() for retrieving the actual
 	 * payload.
 	 */
 	template<typename PAYLOAD_TYPE>
-	class SWIFTEN_API GenericPayloadParser : public PayloadParser {
+	class GenericPayloadParser : public PayloadParser {
 		public:
 			GenericPayloadParser() : PayloadParser() {
 				payload_ = boost::make_shared<PAYLOAD_TYPE>();
 			}
 
 			virtual boost::shared_ptr<Payload> getPayload() const {
diff --git a/Swiften/Parser/GenericPayloadParserFactory.h b/Swiften/Parser/GenericPayloadParserFactory.h
index fd6d403..8e476c0 100644
--- a/Swiften/Parser/GenericPayloadParserFactory.h
+++ b/Swiften/Parser/GenericPayloadParserFactory.h
@@ -13,13 +13,13 @@
 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 SWIFTEN_API GenericPayloadParserFactory : public PayloadParserFactory {
+	class GenericPayloadParserFactory : public PayloadParserFactory {
 		public:
 			/**
 			 * Construct a parser factory that can parse the given top-level tag in the given namespace.
 			 */
 			GenericPayloadParserFactory(const std::string& tag, const std::string& xmlns = "") : tag_(tag), xmlns_(xmlns) {}
 
diff --git a/Swiften/Parser/GenericPayloadParserFactory2.h b/Swiften/Parser/GenericPayloadParserFactory2.h
index 09a2dbf..633050e 100644
--- a/Swiften/Parser/GenericPayloadParserFactory2.h
+++ b/Swiften/Parser/GenericPayloadParserFactory2.h
@@ -14,13 +14,13 @@ namespace Swift {
 	class PayloadParserFactoryCollection;
 
 	/**
 	 * A generic class for PayloadParserFactories that parse a specific payload (given as the template parameter of the class).
 	 */
 	template<typename PARSER_TYPE>
-	class SWIFTEN_API GenericPayloadParserFactory2 : public PayloadParserFactory {
+	class GenericPayloadParserFactory2 : public PayloadParserFactory {
 		public:
 			/**
 			 * Construct a parser factory that can parse the given top-level tag in the given namespace.
 			 */
 			GenericPayloadParserFactory2(const std::string& tag, const std::string& xmlns, PayloadParserFactoryCollection* parsers) : tag_(tag), xmlns_(xmlns), parsers_(parsers) {}
 
diff --git a/Swiften/Parser/GenericPayloadTreeParser.h b/Swiften/Parser/GenericPayloadTreeParser.h
index d90903c..37505ac 100644
--- a/Swiften/Parser/GenericPayloadTreeParser.h
+++ b/Swiften/Parser/GenericPayloadTreeParser.h
@@ -17,13 +17,13 @@
 
 namespace Swift {
 	/**
 	 * Generic parser offering something a bit like a DOM to work with.
 	 */
 	template<typename PAYLOAD_TYPE>
-	class SWIFTEN_API GenericPayloadTreeParser : public GenericPayloadParser<PAYLOAD_TYPE> {
+	class GenericPayloadTreeParser : public GenericPayloadParser<PAYLOAD_TYPE> {
 		public:
 			virtual void handleStartElement(const std::string& element, const std::string& xmlns, const AttributeMap& attributes) {
 				if (!root_) {
 					root_ = boost::make_shared<ParserElement>(element, xmlns, attributes);
 					elementStack_.push_back(root_);
 				} 
diff --git a/Swiften/Serializer/GenericPayloadSerializer.h b/Swiften/Serializer/GenericPayloadSerializer.h
index e964d80..f02ccda 100644
--- a/Swiften/Serializer/GenericPayloadSerializer.h
+++ b/Swiften/Serializer/GenericPayloadSerializer.h
@@ -10,13 +10,13 @@
 
 #include <Swiften/Base/API.h>
 #include <Swiften/Serializer/PayloadSerializer.h>
 
 namespace Swift {
 	template<typename PAYLOAD_TYPE>
-	class SWIFTEN_API GenericPayloadSerializer : public PayloadSerializer {
+	class GenericPayloadSerializer : public PayloadSerializer {
 		public:
 			virtual std::string serialize(boost::shared_ptr<Payload> element)  const {
 				return serializePayload(boost::dynamic_pointer_cast<PAYLOAD_TYPE>(element));
 			}
 
 			virtual bool canSerialize(boost::shared_ptr<Payload> element) const {