3 files changed, 4 insertions, 4 deletions
diff --git a/src/Common/AuthManager.cpp b/src/Common/AuthManager.cpp
index 82fbda5..d21909d 100644
--- a/src/Common/AuthManager.cpp
+++ b/src/Common/AuthManager.cpp
@@ -18,9 +18,10 @@
  */
 
 #include "AuthManager.h"
-
 #include "AuthBackend.h"
 
+#include <boost/thread/locks.hpp>
+
 namespace Mad {
 namespace Common {
 
diff --git a/src/Common/ClientConnection.cpp b/src/Common/ClientConnection.cpp
index 51b23fa..4182806 100644
--- a/src/Common/ClientConnection.cpp
+++ b/src/Common/ClientConnection.cpp
@@ -24,7 +24,7 @@
 namespace Mad {
 namespace Common {
 
-ClientConnection::ClientConnection(Core::Application *application) : Connection(application), connection(new Net::ClientConnection(application)) {
+ClientConnection::ClientConnection(Core::Application *application) : Connection(application), connection(Net::ClientConnection::create(application)) {
   connection->connectSignalReceive(boost::bind(&ClientConnection::receive, this, _1));
 }
 
diff --git a/src/Common/ClientConnection.h b/src/Common/ClientConnection.h
index b50f163..a02c461 100644
--- a/src/Common/ClientConnection.h
+++ b/src/Common/ClientConnection.h
@@ -37,14 +37,13 @@ namespace Common {
 
 class MAD_COMMON_EXPORT ClientConnection : public Connection {
   private:
-    Net::ClientConnection *connection;
+    boost::shared_ptr<Net::ClientConnection> connection;
 
   protected:
     virtual bool send(const Net::Packet &packet);
 
   public:
     ClientConnection(Core::Application *application);
-    virtual ~ClientConnection() {}
 
     void connect(const boost::asio::ip::tcp::endpoint &address) throw(Core::Exception);