3 files changed, 7 insertions, 10 deletions
diff --git a/Swiften/Queries/RawRequest.h b/Swiften/Queries/RawRequest.h
index 477952f..e5b3a1d 100644
--- a/Swiften/Queries/RawRequest.h
+++ b/Swiften/Queries/RawRequest.h
@@ -31,7 +31,7 @@ namespace Swift {
 			RawRequest(IQ::Type type, const JID& receiver, const std::string& data, IQRouter* router) : Request(type, receiver, boost::make_shared<RawXMLPayload>(data), router) {
 			}
 
-			virtual void handleResponse(Payload::ref payload, ErrorPayload::ref error) {
+			virtual void handleResponse(boost::shared_ptr<Payload> payload, ErrorPayload::ref error) {
 				if (error) {
 					onResponse(ErrorSerializer().serializePayload(error));
 				}
diff --git a/Swiften/Queries/Request.h b/Swiften/Queries/Request.h
index eee89e9..88eda63 100644
--- a/Swiften/Queries/Request.h
+++ b/Swiften/Queries/Request.h
@@ -4,8 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#ifndef SWIFTEN_Request_H
-#define SWIFTEN_Request_H
+#pragma once
 
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
@@ -48,15 +47,15 @@ namespace Swift {
 					const JID& receiver, 
 					IQRouter* router);
 
-			virtual void setPayload(Payload::ref payload) {
+			virtual void setPayload(boost::shared_ptr<Payload> payload) {
 				payload_ = payload;
 			}
 
-			Payload::ref getPayload() const {
+			boost::shared_ptr<Payload> getPayload() const {
 				return payload_;
 			}
 
-			virtual void handleResponse(Payload::ref, ErrorPayload::ref) = 0;
+			virtual void handleResponse(boost::shared_ptr<Payload>, boost::shared_ptr<ErrorPayload>) = 0;
 
 		private:
 			bool handleIQ(boost::shared_ptr<IQ>);
@@ -70,5 +69,3 @@ namespace Swift {
 			bool sent_;
 	};
 }
-
-#endif
diff --git a/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h b/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h
index 0700c65..5dd19b5 100644
--- a/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h
+++ b/Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h
@@ -26,11 +26,11 @@ namespace Swift {
 			SetInBandRegistrationRequest(const JID& to, InBandRegistrationPayload::ref payload, IQRouter* router) : Request(IQ::Set, to, InBandRegistrationPayload::ref(payload), router) {
 			}
 
-			virtual void handleResponse(Payload::ref payload, ErrorPayload::ref error) {
+			virtual void handleResponse(boost::shared_ptr<Payload> payload, ErrorPayload::ref error) {
 				onResponse(payload, error);
 			}
 
 		public:
-			boost::signal<void (Payload::ref, ErrorPayload::ref)> onResponse;
+			boost::signal<void (boost::shared_ptr<Payload>, ErrorPayload::ref)> onResponse;
 	};
 }