7 files changed, 16 insertions, 11 deletions
diff --git a/cpp/src/tests/Address.cpp b/cpp/src/tests/Address.cpp
index f25a27d231..01d8683efe 100644
--- a/cpp/src/tests/Address.cpp
+++ b/cpp/src/tests/Address.cpp
@@ -20,11 +20,12 @@
  */
 #include <iostream>
 #include "qpid/messaging/Address.h"
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
 
 #include "unit_test.h"
 
 using namespace qpid::messaging;
+using namespace qpid::types;
 
 namespace qpid {
 namespace tests {
diff --git a/cpp/src/tests/MessagingSessionTests.cpp b/cpp/src/tests/MessagingSessionTests.cpp
index ef0685a508..56e86d101f 100644
--- a/cpp/src/tests/MessagingSessionTests.cpp
+++ b/cpp/src/tests/MessagingSessionTests.cpp
@@ -48,6 +48,7 @@ namespace tests {
 QPID_AUTO_TEST_SUITE(MessagingSessionTests)
 
 using namespace qpid::messaging;
+using namespace qpid::types;
 using namespace qpid;
 using qpid::broker::Broker;
 using qpid::framing::Uuid;
diff --git a/cpp/src/tests/Uuid.cpp b/cpp/src/tests/Uuid.cpp
index 6d6c07169f..4c6505b139 100644
--- a/cpp/src/tests/Uuid.cpp
+++ b/cpp/src/tests/Uuid.cpp
@@ -18,7 +18,7 @@
 
 #include "qpid/framing/Uuid.h"
 #include "qpid/framing/Buffer.h"
-#include "qpid/messaging/Uuid.h"
+#include "qpid/types/Uuid.h"
 #include "qpid/sys/alloca.h"
 
 #include "unit_test.h"
@@ -80,15 +80,15 @@ QPID_AUTO_TEST_CASE(testUuidEncodeDecode) {
                       string(decoded.begin(), decoded.end()));
 }
 
-QPID_AUTO_TEST_CASE(testMessagingUuid)
+QPID_AUTO_TEST_CASE(testTypesUuid)
 {
-    //tests for the Uuid class in the messaging namespace (introduced
+    //tests for the Uuid class in the types namespace (introduced
     //to avoid pulling in dependencies from framing)
-    messaging::Uuid a;
-    messaging::Uuid b(true);
-    messaging::Uuid c(true);
-    messaging::Uuid d(b);
-    messaging::Uuid e;
+    types::Uuid a;
+    types::Uuid b(true);
+    types::Uuid c(true);
+    types::Uuid d(b);
+    types::Uuid e;
     e = c;
 
     BOOST_CHECK(!a);
diff --git a/cpp/src/tests/Variant.cpp b/cpp/src/tests/Variant.cpp
index db9e419eab..0d456bc493 100644
--- a/cpp/src/tests/Variant.cpp
+++ b/cpp/src/tests/Variant.cpp
@@ -19,11 +19,11 @@
  *
  */
 #include <iostream>
-#include "qpid/messaging/Variant.h"
+#include "qpid/types/Variant.h"
 
 #include "unit_test.h"
 
-using namespace qpid::messaging;
+using namespace qpid::types;
 
 namespace qpid {
 namespace tests {
diff --git a/cpp/src/tests/qpid_recv.cpp b/cpp/src/tests/qpid_recv.cpp
index 10738578ed..3ee8208a0b 100644
--- a/cpp/src/tests/qpid_recv.cpp
+++ b/cpp/src/tests/qpid_recv.cpp
@@ -34,6 +34,7 @@
 #include <memory>
 
 using namespace qpid::messaging;
+using namespace qpid::types;
 using qpid::client::amqp0_10::FailoverUpdates;
 
 using namespace std;
diff --git a/cpp/src/tests/qpid_send.cpp b/cpp/src/tests/qpid_send.cpp
index a8b0241a1d..eabcbdae21 100644
--- a/cpp/src/tests/qpid_send.cpp
+++ b/cpp/src/tests/qpid_send.cpp
@@ -33,6 +33,7 @@
 #include <memory>
 
 using namespace qpid::messaging;
+using namespace qpid::types;
 using qpid::client::amqp0_10::FailoverUpdates;
 
 typedef std::vector<std::string> string_vector;
diff --git a/cpp/src/tests/qpid_stream.cpp b/cpp/src/tests/qpid_stream.cpp
index 5ed7f84492..e451198ef4 100644
--- a/cpp/src/tests/qpid_stream.cpp
+++ b/cpp/src/tests/qpid_stream.cpp
@@ -32,6 +32,7 @@
 #include <string>
 
 using namespace qpid::messaging;
+using namespace qpid::types;
 
 namespace qpid {
 namespace tests {