4 files changed, 11 insertions, 10 deletions
diff --git a/cpp/src/qpid/console/Event.h b/cpp/src/qpid/console/Event.h
index c212b72889..4c8d639a33 100644
--- a/cpp/src/qpid/console/Event.h
+++ b/cpp/src/qpid/console/Event.h
@@ -31,9 +31,9 @@ namespace framing {
 }
 namespace console {
 
-    class Broker;
-    class SchemaClass;
-    class ClassKey;
+    class  Broker;
+    struct SchemaClass;
+    class  ClassKey;
 
     /**
      *
diff --git a/cpp/src/qpid/console/Object.h b/cpp/src/qpid/console/Object.h
index 54a3e0f6e8..2c6993fc8a 100644
--- a/cpp/src/qpid/console/Object.h
+++ b/cpp/src/qpid/console/Object.h
@@ -35,12 +35,12 @@ namespace framing {
 }
 namespace console {
 
-    class Broker;
-    class SchemaClass;
-    class SchemaMethod;
-    class ObjectId;
-    class ClassKey;
-    class Value;
+    class  Broker;
+    struct SchemaClass;
+    struct SchemaMethod;
+    class  ObjectId;
+    class  ClassKey;
+    class  Value;
 
     /**
      * \ingroup qmfconsoleapi
diff --git a/cpp/src/qpid/console/Package.h b/cpp/src/qpid/console/Package.h
index a8679dff19..291980be57 100644
--- a/cpp/src/qpid/console/Package.h
+++ b/cpp/src/qpid/console/Package.h
@@ -26,7 +26,7 @@
 
 namespace qpid {
 namespace console {
-    class SchemaClass;
+    struct SchemaClass;
 
     /**
      *
diff --git a/cpp/src/qpid/console/Value.cpp b/cpp/src/qpid/console/Value.cpp
index 532709ab05..1a7f690baf 100644
--- a/cpp/src/qpid/console/Value.cpp
+++ b/cpp/src/qpid/console/Value.cpp
@@ -22,6 +22,7 @@
 #include "Value.h"
 #include "qpid/framing/Buffer.h"
 
+using namespace qpid;
 using namespace qpid::console;
 using namespace std;