3 files changed, 13 insertions, 6 deletions
diff --git a/Swiften/FileTransfer/BytestreamsRequest.h b/Swiften/FileTransfer/BytestreamsRequest.h
index 71b93ec..9757bfa 100644
--- a/Swiften/FileTransfer/BytestreamsRequest.h
+++ b/Swiften/FileTransfer/BytestreamsRequest.h
@@ -6,13 +6,16 @@
 
 #pragma once
 
+#include <boost/shared_ptr.hpp>
+
 #include "Swiften/Queries/GenericRequest.h"
 #include "Swiften/Elements/Bytestreams.h"
-#include "Swiften/Base/Shared.h"
 
 namespace Swift {
-	class BytestreamsRequest : public GenericRequest<Bytestreams>, public Shared<BytestreamsRequest> {
+	class BytestreamsRequest : public GenericRequest<Bytestreams> {
 		public:
+			typedef boost::shared_ptr<BytestreamsRequest> ref;
+
 			static ref create(const JID& jid, boost::shared_ptr<Bytestreams> payload, IQRouter* router) {
 				return ref(new BytestreamsRequest(jid, payload, router));
 			}
diff --git a/Swiften/FileTransfer/IBBRequest.h b/Swiften/FileTransfer/IBBRequest.h
index 7269362..f104277 100644
--- a/Swiften/FileTransfer/IBBRequest.h
+++ b/Swiften/FileTransfer/IBBRequest.h
@@ -8,11 +8,13 @@
 
 #include "Swiften/Queries/GenericRequest.h"
 #include "Swiften/Elements/IBB.h"
-#include "Swiften/Base/Shared.h"
+
 
 namespace Swift {
-	class IBBRequest : public GenericRequest<IBB>, public Shared<IBBRequest> {
+	class IBBRequest : public GenericRequest<IBB> {
 		public:
+			typedef boost::shared_ptr<IBBRequest> ref;
+
 			static ref create(const JID& jid, boost::shared_ptr<IBB> payload, IQRouter* router) {
 				return ref(new IBBRequest(jid, payload, router));
 			}
diff --git a/Swiften/FileTransfer/StreamInitiationRequest.h b/Swiften/FileTransfer/StreamInitiationRequest.h
index 64f51f2..f516d4b 100644
--- a/Swiften/FileTransfer/StreamInitiationRequest.h
+++ b/Swiften/FileTransfer/StreamInitiationRequest.h
@@ -8,11 +8,13 @@
 
 #include "Swiften/Queries/GenericRequest.h"
 #include "Swiften/Elements/StreamInitiation.h"
-#include "Swiften/Base/Shared.h"
+
 
 namespace Swift {
-	class StreamInitiationRequest : public GenericRequest<StreamInitiation>, public Shared<StreamInitiationRequest> {
+	class StreamInitiationRequest : public GenericRequest<StreamInitiation> {
 		public:
+			typedef boost::shared_ptr<StreamInitiationRequest> ref;
+
 			static ref create(const JID& jid, boost::shared_ptr<StreamInitiation> payload, IQRouter* router) {
 				return ref(new StreamInitiationRequest(jid, payload, router));
 			}