--- a/UnitTestsSources/MultiThreadingTests.cpp	Tue Jun 02 10:55:32 2015 +0200
+++ b/UnitTestsSources/MultiThreadingTests.cpp	Tue Jun 02 11:07:20 2015 +0200
@@ -30,15 +30,14 @@
  **/
 
 
-#include "../Core/MultiThreading/ThreadedCommandProcessor.h"
-#include "../Core/MultiThreading/ArrayFilledByThreads.h"
+#include "../CppClient/ThreadedCommandProcessor.h"
+#include "../CppClient/ArrayFilledByThreads.h"
 
-
-using namespace Orthanc;
+#include <gtest/gtest.h>
 
 namespace
 {
-  class DynamicInteger : public ICommand
+  class DynamicInteger : public Orthanc::ICommand
   {
   private:
     int value_;
@@ -64,7 +63,7 @@
     }
   };
 
-  class MyFiller : public ArrayFilledByThreads::IFiller
+  class MyFiller : public OrthancClient::ArrayFilledByThreads::IFiller
   {
   private:
     int size_;
@@ -81,7 +80,7 @@
       return size_;
     }
 
-    virtual IDynamicObject* GetFillerItem(size_t index)
+    virtual Orthanc::IDynamicObject* GetFillerItem(size_t index)
     {
       static boost::mutex mutex;
       boost::mutex::scoped_lock lock(mutex);
@@ -106,7 +105,7 @@
 TEST(MultiThreading, ArrayFilledByThreadEmpty)
 {
   MyFiller f(0);
-  ArrayFilledByThreads a(f);
+  OrthancClient::ArrayFilledByThreads a(f);
   a.SetThreadCount(1);
   ASSERT_EQ(0, a.GetSize());
 }
@@ -115,7 +114,7 @@
 TEST(MultiThreading, ArrayFilledByThread1)
 {
   MyFiller f(100);
-  ArrayFilledByThreads a(f);
+  OrthancClient::ArrayFilledByThreads a(f);
   a.SetThreadCount(1);
   ASSERT_EQ(100, a.GetSize());
   for (size_t i = 0; i < a.GetSize(); i++)
@@ -128,7 +127,7 @@
 TEST(MultiThreading, ArrayFilledByThread4)
 {
   MyFiller f(100);
-  ArrayFilledByThreads a(f);
+  OrthancClient::ArrayFilledByThreads a(f);
   a.SetThreadCount(4);
   ASSERT_EQ(100, a.GetSize());
   for (size_t i = 0; i < a.GetSize(); i++)
@@ -156,7 +155,7 @@
 
 TEST(MultiThreading, CommandProcessor)
 {
-  ThreadedCommandProcessor p(4);
+  OrthancClient::ThreadedCommandProcessor p(4);
 
   std::set<int> s;