6 files changed, 5 insertions, 3 deletions
diff --git a/cpp/examples/messaging/drain.cpp b/cpp/examples/messaging/drain.cpp
index 38f6bdbb98..807b361aaf 100644
--- a/cpp/examples/messaging/drain.cpp
+++ b/cpp/examples/messaging/drain.cpp
@@ -32,6 +32,7 @@
 #include <iostream>
 
 using namespace qpid::messaging;
+using namespace qpid::types;
 
 struct Options : public qpid::Options
 {
diff --git a/cpp/examples/messaging/map_receiver.cpp b/cpp/examples/messaging/map_receiver.cpp
index cdbae6007e..cdbb931299 100644
--- a/cpp/examples/messaging/map_receiver.cpp
+++ b/cpp/examples/messaging/map_receiver.cpp
@@ -31,6 +31,7 @@
 #include <sstream>
 
 using namespace qpid::messaging;
+using namespace qpid::types;
 
 using std::stringstream;
 using std::string;
diff --git a/cpp/examples/messaging/map_sender.cpp b/cpp/examples/messaging/map_sender.cpp
index 037bb55201..dec918e836 100644
--- a/cpp/examples/messaging/map_sender.cpp
+++ b/cpp/examples/messaging/map_sender.cpp
@@ -31,6 +31,7 @@
 #include <sstream>
 
 using namespace qpid::messaging;
+using namespace qpid::types;
 
 using std::stringstream;
 using std::string;
diff --git a/cpp/examples/messaging/server.cpp b/cpp/examples/messaging/server.cpp
index 046a209e2f..837e5b7103 100644
--- a/cpp/examples/messaging/server.cpp
+++ b/cpp/examples/messaging/server.cpp
@@ -25,7 +25,6 @@
 #include <qpid/messaging/Receiver.h>
 #include <qpid/messaging/Sender.h>
 #include <qpid/messaging/Session.h>
-#include <qpid/messaging/Variant.h>
 
 #include <algorithm>
 #include <cstdlib>
diff --git a/cpp/examples/messaging/spout.cpp b/cpp/examples/messaging/spout.cpp
index 4819c6bc00..e9a6987f5c 100644
--- a/cpp/examples/messaging/spout.cpp
+++ b/cpp/examples/messaging/spout.cpp
@@ -25,7 +25,7 @@
 #include <qpid/messaging/Message.h>
 #include <qpid/messaging/Sender.h>
 #include <qpid/messaging/Session.h>
-#include <qpid/messaging/Variant.h>
+#include <qpid/types/Variant.h>
 #include <qpid/Exception.h>
 #include <qpid/Options.h>
 #include <qpid/log/Logger.h>
@@ -38,6 +38,7 @@
 #include <boost/format.hpp>
 
 using namespace qpid::messaging;
+using namespace qpid::types;
 using qpid::sys::AbsTime;
 using qpid::sys::now;
 using qpid::sys::TIME_INFINITE;
diff --git a/cpp/examples/messaging/topic_receiver.cpp b/cpp/examples/messaging/topic_receiver.cpp
index 9e0264a4c3..54a7e82dfc 100644
--- a/cpp/examples/messaging/topic_receiver.cpp
+++ b/cpp/examples/messaging/topic_receiver.cpp
@@ -23,7 +23,6 @@
 #include <qpid/messaging/Message.h>
 #include <qpid/messaging/Receiver.h>
 #include <qpid/messaging/Session.h>
-#include <qpid/messaging/Variant.h>
 
 #include <cstdlib>
 #include <iostream>