6 files changed, 8 insertions, 8 deletions
diff --git a/cpp/test/unit/qpid/broker/ChannelTest.cpp b/cpp/test/unit/qpid/broker/ChannelTest.cpp
index 5052d4127d..796c949363 100644
--- a/cpp/test/unit/qpid/broker/ChannelTest.cpp
+++ b/cpp/test/unit/qpid/broker/ChannelTest.cpp
@@ -24,7 +24,7 @@
 using namespace boost;
 using namespace qpid::broker;
 using namespace qpid::framing;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 struct DummyHandler : OutputHandler{
     std::vector<AMQFrame*> frames; 
diff --git a/cpp/test/unit/qpid/broker/ExchangeTest.cpp b/cpp/test/unit/qpid/broker/ExchangeTest.cpp
index 14fb6fc097..d20b7c171a 100644
--- a/cpp/test/unit/qpid/broker/ExchangeTest.cpp
+++ b/cpp/test/unit/qpid/broker/ExchangeTest.cpp
@@ -25,7 +25,7 @@
 #include <iostream>
 
 using namespace qpid::broker;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 class ExchangeTest : public CppUnit::TestCase
 {
diff --git a/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp b/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp
index c432de7785..c04226647f 100644
--- a/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp
+++ b/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp
@@ -24,7 +24,7 @@
 using namespace boost;
 using namespace qpid::broker;
 using namespace qpid::framing;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 class MessageBuilderTest : public CppUnit::TestCase  
 {
diff --git a/cpp/test/unit/qpid/broker/MessageTest.cpp b/cpp/test/unit/qpid/broker/MessageTest.cpp
index 9b4040a8ca..1dbbeda827 100644
--- a/cpp/test/unit/qpid/broker/MessageTest.cpp
+++ b/cpp/test/unit/qpid/broker/MessageTest.cpp
@@ -15,14 +15,14 @@
  * limitations under the License.
  *
  */
-#include "qpid/concurrent/APRBase.h"
+#include "qpid/sys/APRBase.h"
 #include "qpid/broker/Message.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 
 using namespace qpid::broker;
 using namespace qpid::framing;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 class MessageTest : public CppUnit::TestCase  
 {
diff --git a/cpp/test/unit/qpid/broker/QueueTest.cpp b/cpp/test/unit/qpid/broker/QueueTest.cpp
index ba1427a087..ee64854dbb 100644
--- a/cpp/test/unit/qpid/broker/QueueTest.cpp
+++ b/cpp/test/unit/qpid/broker/QueueTest.cpp
@@ -21,7 +21,7 @@
 #include <iostream>
 
 using namespace qpid::broker;
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 
 class TestBinding : public virtual Binding{
diff --git a/cpp/test/unit/qpid/concurrent/APRBaseTest.cpp b/cpp/test/unit/qpid/sys/APRBaseTest.cpp
index 0b4fd94e10..fc0c7dd9e1 100644
--- a/cpp/test/unit/qpid/concurrent/APRBaseTest.cpp
+++ b/cpp/test/unit/qpid/sys/APRBaseTest.cpp
@@ -15,11 +15,11 @@
  * limitations under the License.
  *
  */
-#include "qpid/concurrent/APRBase.h"
+#include "qpid/sys/APRBase.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 
-using namespace qpid::concurrent;
+using namespace qpid::sys;
 
 class APRBaseTest : public CppUnit::TestCase  
 {