5 files changed, 6 insertions, 7 deletions
diff --git a/cpp/src/qpid/client/Connection.h b/cpp/src/qpid/client/Connection.h
index 999a09490f..6d33f0af22 100644
--- a/cpp/src/qpid/client/Connection.h
+++ b/cpp/src/qpid/client/Connection.h
@@ -27,7 +27,7 @@
 
 namespace qpid {
 
-class Url;
+struct Url;
 
 namespace client {
 
diff --git a/cpp/src/qpid/client/ConnectionHandler.cpp b/cpp/src/qpid/client/ConnectionHandler.cpp
index 34bf8708cb..c957ac0fc5 100644
--- a/cpp/src/qpid/client/ConnectionHandler.cpp
+++ b/cpp/src/qpid/client/ConnectionHandler.cpp
@@ -30,7 +30,6 @@
 
 using namespace qpid::client;
 using namespace qpid::framing;
-using namespace boost;
 
 namespace {
 const std::string OK("OK");
@@ -43,7 +42,7 @@ const std::string INVALID_STATE_OPEN_OK("open-ok received in invalid state");
 const std::string INVALID_STATE_CLOSE_OK("close-ok received in invalid state");
 }
 
-ConnectionHandler::ConnectionHandler(const ConnectionSettings& s, framing::ProtocolVersion& v) 
+ConnectionHandler::ConnectionHandler(const ConnectionSettings& s, ProtocolVersion& v) 
     : StateManager(NOT_STARTED), ConnectionSettings(s), outHandler(*this), proxy(outHandler), errorCode(200), version(v)
 {    
     insist = true;
@@ -158,7 +157,7 @@ void ConnectionHandler::tune(uint16_t maxChannelsProposed, uint16_t maxFrameSize
     proxy.open(virtualhost, capabilities, insist);
 }
 
-void ConnectionHandler::openOk ( const framing::Array& knownBrokers )
+void ConnectionHandler::openOk ( const Array& knownBrokers )
 {
     checkState(OPENING, INVALID_STATE_OPEN_OK);
     knownBrokersUrls.clear();
diff --git a/cpp/src/qpid/client/FailoverConnection.h b/cpp/src/qpid/client/FailoverConnection.h
index a84f0c2189..4a8780afa2 100644
--- a/cpp/src/qpid/client/FailoverConnection.h
+++ b/cpp/src/qpid/client/FailoverConnection.h
@@ -35,7 +35,7 @@
 namespace qpid {
 namespace client {
 
-class ConnectionSettings;
+struct ConnectionSettings;
 
 
 class FailoverConnection
diff --git a/cpp/src/qpid/client/FailoverListener.cpp b/cpp/src/qpid/client/FailoverListener.cpp
index 8311e713a4..772d9a4197 100644
--- a/cpp/src/qpid/client/FailoverListener.cpp
+++ b/cpp/src/qpid/client/FailoverListener.cpp
@@ -66,7 +66,7 @@ FailoverListener::FailoverListener(const boost::shared_ptr<ConnectionImpl>& c, c
 
 FailoverListener::~FailoverListener() {
     try { stop(); }
-    catch (const std::exception& e) {}
+    catch (const std::exception& /*e*/) {}
 }
 
 void FailoverListener::stop() {
diff --git a/cpp/src/qpid/client/Results.cpp b/cpp/src/qpid/client/Results.cpp
index 7a2d0b6f71..1b98d6c98a 100644
--- a/cpp/src/qpid/client/Results.cpp
+++ b/cpp/src/qpid/client/Results.cpp
@@ -32,7 +32,7 @@ namespace client {
 Results::Results() {}
 
 Results::~Results() {
-    try { close(); } catch (const std::exception& e) { assert(0); }
+  try { close(); } catch (const std::exception& /*e*/) { assert(0); }
 }
 
 void Results::close()