3 files changed, 12 insertions, 5 deletions
diff --git a/cpp/src/client.vcproj b/cpp/src/client.vcproj
index 28b7ec73dc..8e8842f3c0 100644
--- a/cpp/src/client.vcproj
+++ b/cpp/src/client.vcproj
@@ -393,6 +393,9 @@
 				RelativePath="qpid\client\Bounds.cpp">
 			</File>
 			<File
+				RelativePath="qpid\client\Completion.cpp">
+			</File>
+			<File
 				RelativePath="qpid\client\Connection.cpp">
 			</File>
 			<File
@@ -444,6 +447,9 @@
 				RelativePath="qpid\client\Message.cpp">
 			</File>
 			<File
+				RelativePath="qpid\client\MessageImpl.cpp">
+			</File>
+			<File
 				RelativePath="qpid\client\MessageListener.cpp">
 			</File>
 			<File
@@ -571,6 +577,9 @@
 				RelativePath="qpid\client\Message.h">
 			</File>
 			<File
+				RelativePath="qpid\client\MessageImpl.h">
+			</File>
+			<File
 				RelativePath="qpid\client\MessageListener.h">
 			</File>
 			<File
diff --git a/cpp/src/qpid/client/Dispatcher.cpp b/cpp/src/qpid/client/Dispatcher.cpp
index 5156031748..9efc205b23 100644
--- a/cpp/src/qpid/client/Dispatcher.cpp
+++ b/cpp/src/qpid/client/Dispatcher.cpp
@@ -48,10 +48,7 @@ Dispatcher::Dispatcher(const Session& s, const std::string& q)
     queue = q.empty() ? 
         session.getExecution().getDemux().getDefault() : 
         session.getExecution().getDemux().get(q); 
-}
-
-Dispatcher::~Dispatcher() {}
-    
+}    
 
 void Dispatcher::start()
 {
diff --git a/cpp/src/qpid/client/Dispatcher.h b/cpp/src/qpid/client/Dispatcher.h
index 4dbb75dcf2..197d3591aa 100644
--- a/cpp/src/qpid/client/Dispatcher.h
+++ b/cpp/src/qpid/client/Dispatcher.h
@@ -30,6 +30,7 @@
 #include "qpid/sys/Runnable.h"
 #include "qpid/sys/Thread.h"
 #include "MessageListener.h"
+#include "SubscriptionImpl.h"
 
 namespace qpid {
 namespace client {
@@ -60,7 +61,7 @@ class Dispatcher : public sys::Runnable
 
 public:
     Dispatcher(const Session& session, const std::string& queue = "");
-    ~Dispatcher();
+    ~Dispatcher() {}
 
     void start();
     void wait();