diff --git a/src/common/subsystemrunner.hpp b/src/common/subsystemrunner.hpp
index 840e35728..ca81d1686 100644
--- a/src/common/subsystemrunner.hpp
+++ b/src/common/subsystemrunner.hpp
@@ -27,7 +27,7 @@
 #include "include/error.hpp"
 #include "lib/util.hpp"
 #include "common/subsys.hpp"
-#include "lib/multithread.hpp"
+#include "lib/concurrency.hpp"
 
 #include <tr1/functional>
 #include <vector>
diff --git a/tests/common/concurrency-locking-test.cpp b/tests/lib/concurrency-locking-test.cpp
similarity index 98%
rename from tests/common/concurrency-locking-test.cpp
rename to tests/lib/concurrency-locking-test.cpp
index 2bc7065b1..86087e1c5 100644
--- a/tests/common/concurrency-locking-test.cpp
+++ b/tests/lib/concurrency-locking-test.cpp
@@ -21,11 +21,11 @@
 * *****************************************************/
 
 
-#include "common/test/run.hpp"
+#include "lib/test/run.hpp"
 //#include "common/util.hpp"
-#include "common/error.hpp"
+#include "include/error.hpp"
 
-#include "common/concurrency.hpp"
+#include "lib/concurrency.hpp"
 
 #include <glibmm.h>