diff --git a/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h b/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h
index 17e7fc5823111f514d4eb14833ed0fe44d5c0ad5..7cef426f68a88f05ec0b8569246c91968a154507 100644
--- a/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h
+++ b/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h
@@ -1,55 +1,58 @@
-/*
- * Copyright (c) 2011 Tobias Markmann
- * Licensed under the simplified BSD license.
- * See Documentation/Licenses/BSD-simplified.txt for more information.
- */
-
-#pragma once
-
-#include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
-
-#include <Swiften/JID/JID.h>
-
-#include "transport/presenceoracle.h"
-
-namespace Swift {
-
-class JingleSessionManager;
-class IQRouter;
-class EntityCapsProvider;
-class RemoteJingleTransportCandidateSelectorFactory;
-class LocalJingleTransportCandidateGeneratorFactory;
-class OutgoingFileTransfer;
-class JID;
-class IDGenerator;
-class ReadBytestream;
-class StreamInitiationFileInfo;
-class SOCKS5BytestreamRegistry;
-class SOCKS5BytestreamProxy;
-class SOCKS5BytestreamServer;
-class PresenceOracle;
-
-class CombinedOutgoingFileTransferManager {
-public:
-	CombinedOutgoingFileTransferManager(JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, RemoteJingleTransportCandidateSelectorFactory* remoteFactory, LocalJingleTransportCandidateGeneratorFactory* localFactory, SOCKS5BytestreamRegistry* bytestreamRegistry, SOCKS5BytestreamProxy* bytestreamProxy, Transport::PresenceOracle* presOracle, SOCKS5BytestreamServer *server);
-	~CombinedOutgoingFileTransferManager();
-	
-	boost::shared_ptr<OutgoingFileTransfer> createOutgoingFileTransfer(const JID& from, const JID& to, boost::shared_ptr<ReadBytestream>, const StreamInitiationFileInfo&);
-
-private:
-	boost::optional<JID> highestPriorityJIDSupportingJingle(const JID& bareJID);
-	boost::optional<JID> highestPriorityJIDSupportingSI(const JID& bareJID);
-	JingleSessionManager* jsManager;
-	IQRouter* iqRouter;
-	EntityCapsProvider* capsProvider;
-	RemoteJingleTransportCandidateSelectorFactory* remoteFactory;
-	LocalJingleTransportCandidateGeneratorFactory* localFactory;
-	IDGenerator *idGenerator;
-	SOCKS5BytestreamRegistry* bytestreamRegistry;
-	SOCKS5BytestreamProxy* bytestreamProxy;
-	Transport::PresenceOracle* presenceOracle;
-	SOCKS5BytestreamServer *bytestreamServer;
-};
-
-}
+/*
+ * Copyright (c) 2011 Tobias Markmann
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
+ */
+
+#pragma once
+
+#include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp>
+
+#include <Swiften/JID/JID.h>
+
+#include "transport/presenceoracle.h"
+#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
+#include <Swiften/Version.h>
+#define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+
+namespace Swift {
+
+class JingleSessionManager;
+class IQRouter;
+class EntityCapsProvider;
+class RemoteJingleTransportCandidateSelectorFactory;
+class LocalJingleTransportCandidateGeneratorFactory;
+class OutgoingFileTransfer;
+class JID;
+class IDGenerator;
+class ReadBytestream;
+class StreamInitiationFileInfo;
+class SOCKS5BytestreamRegistry;
+class SOCKS5BytestreamProxy;
+class SOCKS5BytestreamServer;
+class PresenceOracle;
+
+class CombinedOutgoingFileTransferManager {
+public:
+	CombinedOutgoingFileTransferManager(JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, RemoteJingleTransportCandidateSelectorFactory* remoteFactory, LocalJingleTransportCandidateGeneratorFactory* localFactory, SOCKS5BytestreamRegistry* bytestreamRegistry, SOCKS5BytestreamProxy* bytestreamProxy, Transport::PresenceOracle* presOracle, SOCKS5BytestreamServer *server);
+	~CombinedOutgoingFileTransferManager();
+	
+	boost::shared_ptr<OutgoingFileTransfer> createOutgoingFileTransfer(const JID& from, const JID& to, boost::shared_ptr<ReadBytestream>, const StreamInitiationFileInfo&);
+
+private:
+	boost::optional<JID> highestPriorityJIDSupportingJingle(const JID& bareJID);
+	boost::optional<JID> highestPriorityJIDSupportingSI(const JID& bareJID);
+	JingleSessionManager* jsManager;
+	IQRouter* iqRouter;
+	EntityCapsProvider* capsProvider;
+	RemoteJingleTransportCandidateSelectorFactory* remoteFactory;
+	LocalJingleTransportCandidateGeneratorFactory* localFactory;
+	IDGenerator *idGenerator;
+	SOCKS5BytestreamRegistry* bytestreamRegistry;
+	SOCKS5BytestreamProxy* bytestreamProxy;
+	Transport::PresenceOracle* presenceOracle;
+	SOCKS5BytestreamServer *bytestreamServer;
+};
+
+}