diff --git a/include/Swiften/SwiftenCompat.h b/include/Swiften/SwiftenCompat.h
index 7e31baea..e97d6f35 100644
--- a/include/Swiften/SwiftenCompat.h
+++ b/include/Swiften/SwiftenCompat.h
@@ -36,10 +36,12 @@
  */
 
 #if (SWIFTEN_VERSION >= 0x040000)
+#define SWIFTEN_UNQPTR std::unique_ptr
 #define SWIFTEN_SHRPTR_NAMESPACE std
 #define SWIFTEN_SIGNAL_NAMESPACE boost::signals2
 #define SWIFT_HOSTADDRESS(x) *(Swift::HostAddress::fromString(x))
 #else
+#define SWIFTEN_UNQPTR std::auto_ptr
 #define SWIFTEN_SHRPTR_NAMESPACE boost
 #define SWIFTEN_SIGNAL_NAMESPACE boost::signals
 #define SWIFT_HOSTADDRESS(x) Swift::HostAddress(x)
diff --git a/spectrum/src/frontends/xmpp/storageparser.h b/spectrum/src/frontends/xmpp/storageparser.h
index 7e5dea0a..3efc1a7c 100644
--- a/spectrum/src/frontends/xmpp/storageparser.h
+++ b/spectrum/src/frontends/xmpp/storageparser.h
@@ -2,6 +2,7 @@
 
 #include <boost/optional.hpp>
 
+#include "Swiften/SwiftenCompat.h"
 #include "Swiften/Elements/PrivateStorage.h"
 #include "Swiften/Parser/GenericPayloadParser.h"
 
@@ -18,6 +19,6 @@ namespace Transport {
 
 		private:
 			int level;
-			std::unique_ptr<Swift::PayloadParser> currentPayloadParser;
+			SWIFTEN_UNIQUE_PTR<Swift::PayloadParser> currentPayloadParser;
 	};
 }