1 files changed, 7 insertions, 6 deletions
diff --git a/cpp/src/qpid/broker/MessageBuilder.h b/cpp/src/qpid/broker/MessageBuilder.h
index b99b8efee6..5ca6fa0c66 100644
--- a/cpp/src/qpid/broker/MessageBuilder.h
+++ b/cpp/src/qpid/broker/MessageBuilder.h
@@ -30,21 +30,22 @@
 
 namespace qpid {
     namespace broker {
-        class Message;
-        class MessageStore;
+        namespace amqp_0_10 {
+        class MessageTransfer;
+        }
 
         class QPID_BROKER_CLASS_EXTERN MessageBuilder : public framing::FrameHandler{
         public:
-            QPID_BROKER_EXTERN MessageBuilder(MessageStore* const store);
+            QPID_BROKER_EXTERN MessageBuilder();
             QPID_BROKER_EXTERN void handle(framing::AMQFrame& frame);
-            boost::intrusive_ptr<Message> getMessage() { return message; }
+            boost::intrusive_ptr<qpid::broker::amqp_0_10::MessageTransfer> getMessage();
             QPID_BROKER_EXTERN void start(const framing::SequenceNumber& id);
             void end();
         private:
             enum State {DORMANT, METHOD, HEADER, CONTENT};
             State state;
-            boost::intrusive_ptr<Message> message;
-            MessageStore* const store;
+            boost::intrusive_ptr<qpid::broker::amqp_0_10::MessageTransfer> message;
+            std::string exchange;
 
             void checkType(uint8_t expected, uint8_t actual);
         };