9 files changed, 13 insertions, 7 deletions
diff --git a/cpp/src/qpid/console/Broker.cpp b/cpp/src/qpid/console/Broker.cpp
index c6b1be1d31..1a3172fff6 100644
--- a/cpp/src/qpid/console/Broker.cpp
+++ b/cpp/src/qpid/console/Broker.cpp
@@ -66,7 +66,7 @@ string Broker::getUrl() const
     return url.str();
 }
 
-void Broker::encodeHeader(framing::Buffer& buf, uint8_t opcode, uint32_t seq) const
+void Broker::encodeHeader(Buffer& buf, uint8_t opcode, uint32_t seq) const
 {
     buf.putOctet('A');
     buf.putOctet('M');
@@ -75,7 +75,7 @@ void Broker::encodeHeader(framing::Buffer& buf, uint8_t opcode, uint32_t seq) co
     buf.putLong (seq);
 }
 
-bool Broker::checkHeader(framing::Buffer& buf, uint8_t *opcode, uint32_t *seq) const
+bool Broker::checkHeader(Buffer& buf, uint8_t *opcode, uint32_t *seq) const
 {
     if (buf.getSize() < 8)
         return false;
@@ -90,7 +90,7 @@ bool Broker::checkHeader(framing::Buffer& buf, uint8_t *opcode, uint32_t *seq) c
     return h1 == 'A' && h2 == 'M' && h3 == '2';
 }
 
-void Broker::received(client::Message& msg)
+void Broker::received(qpid::client::Message& msg)
 {
     string   data = msg.getData();
     Buffer   inBuffer(const_cast<char*>(data.c_str()), data.size());
diff --git a/cpp/src/qpid/console/ClassKey.cpp b/cpp/src/qpid/console/ClassKey.cpp
index 6aa2bcb117..1780b03f94 100644
--- a/cpp/src/qpid/console/ClassKey.cpp
+++ b/cpp/src/qpid/console/ClassKey.cpp
@@ -90,7 +90,7 @@ bool ClassKey::operator>=(const ClassKey& other) const
     return !(*this < other);
 }
 
-void ClassKey::encode(framing::Buffer& buffer) const
+void ClassKey::encode(qpid::framing::Buffer& buffer) const
 {
     buffer.putShortString(package);
     buffer.putShortString(name);
diff --git a/cpp/src/qpid/console/Event.cpp b/cpp/src/qpid/console/Event.cpp
index 51f043159c..b7fdde1487 100644
--- a/cpp/src/qpid/console/Event.cpp
+++ b/cpp/src/qpid/console/Event.cpp
@@ -32,7 +32,7 @@ using namespace std;
 using qpid::framing::Uuid;
 using qpid::framing::FieldTable;
 
-Event::Event(Broker* _broker, SchemaClass* _schema, framing::Buffer& buffer) :
+Event::Event(Broker* _broker, SchemaClass* _schema, qpid::framing::Buffer& buffer) :
     broker(_broker), schema(_schema)
 {
     timestamp = buffer.getLongLong();
diff --git a/cpp/src/qpid/console/Object.cpp b/cpp/src/qpid/console/Object.cpp
index da8ab962e0..9d04c074ea 100644
--- a/cpp/src/qpid/console/Object.cpp
+++ b/cpp/src/qpid/console/Object.cpp
@@ -30,6 +30,7 @@
 
 using namespace qpid::console;
 using namespace qpid::sys;
+using namespace qpid;
 using namespace std;
 using qpid::framing::Uuid;
 using qpid::framing::FieldTable;
@@ -79,12 +80,12 @@ void Object::AttributeMap::addDouble(const string& key, double val)
     (*this)[key] = Value::Ptr(new DoubleValue(val));
 }
 
-void Object::AttributeMap::addUuid(const string& key, const framing::Uuid& val)
+void Object::AttributeMap::addUuid(const string& key, const Uuid& val)
 {
     (*this)[key] = Value::Ptr(new UuidValue(val));
 }
 
-void Object::AttributeMap::addMap(const string& key, const framing::FieldTable& val)
+void Object::AttributeMap::addMap(const string& key, const FieldTable& val)
 {
     (*this)[key] = Value::Ptr(new MapValue(val));
 }
diff --git a/cpp/src/qpid/console/ObjectId.cpp b/cpp/src/qpid/console/ObjectId.cpp
index 535e59e88d..25de9411f6 100644
--- a/cpp/src/qpid/console/ObjectId.cpp
+++ b/cpp/src/qpid/console/ObjectId.cpp
@@ -23,6 +23,7 @@
 #include "qpid/framing/Buffer.h"
 
 using namespace qpid::console;
+using namespace qpid;
 using namespace std;
 
 ObjectId::ObjectId(framing::Buffer& buffer)
diff --git a/cpp/src/qpid/console/ObjectId.h b/cpp/src/qpid/console/ObjectId.h
index c9c2fc852a..7d0399e51c 100644
--- a/cpp/src/qpid/console/ObjectId.h
+++ b/cpp/src/qpid/console/ObjectId.h
@@ -22,6 +22,7 @@
 #define _QPID_CONSOLE_OBJECTID_H
 
 #include <iostream>
+#include "qpid/sys/IntegerTypes.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/qpid/console/Package.h b/cpp/src/qpid/console/Package.h
index 291980be57..18203cb807 100644
--- a/cpp/src/qpid/console/Package.h
+++ b/cpp/src/qpid/console/Package.h
@@ -23,6 +23,7 @@
 
 #include <string>
 #include <map>
+#include "qpid/sys/IntegerTypes.h"
 
 namespace qpid {
 namespace console {
diff --git a/cpp/src/qpid/console/Schema.cpp b/cpp/src/qpid/console/Schema.cpp
index 31d947cdd5..9b4312d11f 100644
--- a/cpp/src/qpid/console/Schema.cpp
+++ b/cpp/src/qpid/console/Schema.cpp
@@ -24,6 +24,7 @@
 #include "qpid/framing/FieldTable.h"
 
 using namespace qpid::console;
+using namespace qpid;
 using std::string;
 using std::vector;
 
diff --git a/cpp/src/qpid/console/SessionManager.cpp b/cpp/src/qpid/console/SessionManager.cpp
index 6aa347e051..336f429c5d 100644
--- a/cpp/src/qpid/console/SessionManager.cpp
+++ b/cpp/src/qpid/console/SessionManager.cpp
@@ -30,6 +30,7 @@
 
 using namespace qpid::console;
 using namespace qpid::sys;
+using namespace qpid;
 using namespace std;
 using qpid::framing::Buffer;
 using qpid::framing::FieldTable;