diff --git a/cvmfs/CMakeLists.txt b/cvmfs/CMakeLists.txt
index d544774b042171759b69e8c26ea6011d2ced97b9..6fcacfbbfeee0d69cc471eff46a6ac65815ed82c 100644
--- a/cvmfs/CMakeLists.txt
+++ b/cvmfs/CMakeLists.txt
@@ -83,11 +83,11 @@ set (CVMFS_CLIENT_SOURCES
   tracer.cc
   uuid.cc
   util/algorithm.cc
+  util/concurrency.cc
   util/exception.cc
   util/logging.cc
   util/posix.cc
   util/string.cc
-  util_concurrency.cc
   whitelist.cc
   wpad.cc
   xattr.cc
@@ -167,11 +167,11 @@ set (LIBCVMFS_CACHE_SOURCES
   monitor.cc
   options.cc
   sanitizer.cc
+  util/concurrency.cc
   util/exception.cc
   util/logging.cc
   util/posix.cc
   util/string.cc
-  util_concurrency.cc
 )
 
 set (CVMFS_CACHE_NULL_SOURCES
@@ -182,7 +182,7 @@ set (CVMFS_CACHE_RAM_SOURCES
   cache_plugin/cvmfs_cache_ram.cc
   malloc_heap.cc
   statistics.cc
-  util_concurrency.cc
+  util/concurrency.cc
   util/exception.cc
   util/logging.cc
   util/posix.cc
@@ -237,11 +237,11 @@ set (CVMFS_SHRINKWRAP_SOURCES
   shrinkwrap/spec_tree.cc
   shrinkwrap/util.cc
   statistics.cc
+  util/concurrency.cc
   util/exception.cc
   util/logging.cc
   util/posix.cc
   util/string.cc
-  util_concurrency.cc
   xattr.cc
 )
 
@@ -353,8 +353,8 @@ set (LIBCVMFS_SERVER_SOURCES
   upload_local.cc
   upload_s3.cc
   upload_spooler_definition.cc
-  util_concurrency.cc
   util/algorithm.cc
+  util/concurrency.cc
   util/exception.cc
   util/file_backed_buffer.cc
   util/logging.cc
@@ -469,13 +469,13 @@ set (CVMFS_SWISSKNIFE_SOURCES
   upload_spooler_definition.cc
   url.cc
   util/algorithm.cc
+  util/concurrency.cc
   util/exception.cc
   util/file_backed_buffer.cc
   util/logging.cc
   util/mmap_file.cc
   util/posix.cc
   util/raii_temp_dir.cc
-  util_concurrency.cc
   whitelist.cc
   xattr.cc
 )
@@ -550,13 +550,13 @@ set (CVMFS_PRELOADER_SOURCES
   upload_s3.cc
   upload_spooler_definition.cc
   util/algorithm.cc
+  util/concurrency.cc
   util/exception.cc
   util/file_backed_buffer.cc
   util/logging.cc
   util/mmap_file.cc
   util/posix.cc
   util/string.cc
-  util_concurrency.cc
   uuid.cc
   whitelist.cc
   xattr.cc
@@ -636,13 +636,13 @@ if(BUILD_RECEIVER)
     upload_s3.cc
     upload_spooler_definition.cc
     util/algorithm.cc
+    util/concurrency.cc
     util/exception.cc
     util/file_backed_buffer.cc
     util/logging.cc
     util/mmap_file.cc
     util/posix.cc
     util/raii_temp_dir.cc
-    util_concurrency.cc
     uuid.cc
     whitelist.cc
     xattr.cc
diff --git a/cvmfs/authz/authz_curl.cc b/cvmfs/authz/authz_curl.cc
index 7598378cb52dd260f8f345f0e62cbede3ddaa4b3..d4e945d829c4160ef44c242b07239eaa2e415049 100644
--- a/cvmfs/authz/authz_curl.cc
+++ b/cvmfs/authz/authz_curl.cc
@@ -13,9 +13,9 @@
 #include "authz/authz_session.h"
 #include "duplex_curl.h"
 #include "duplex_ssl.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/pointer.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/authz/authz_fetch.cc b/cvmfs/authz/authz_fetch.cc
index 065ed7f6ee4ae13523ada093d14fa803e3db750c..0dba2f5b994dd1177be8cf4750d8daff3cf18487 100644
--- a/cvmfs/authz/authz_fetch.cc
+++ b/cvmfs/authz/authz_fetch.cc
@@ -18,13 +18,13 @@
 
 #include "options.h"
 #include "sanitizer.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/platform.h"
 #include "util/pointer.h"
 #include "util/posix.h"
 #include "util/smalloc.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/authz/authz_session.cc b/cvmfs/authz/authz_session.cc
index ed97ef2fcf246936a508270f479f7f7f35f8d968..857b4f7d249112bb3377a2fce427b928fd6a6a5c 100644
--- a/cvmfs/authz/authz_session.cc
+++ b/cvmfs/authz/authz_session.cc
@@ -18,10 +18,10 @@
 
 #include "authz/authz_fetch.h"
 #include "statistics.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/platform.h"
 #include "util/posix.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/cache_extern.cc b/cvmfs/cache_extern.cc
index d4ce78230a64e4de167141de4e80c3a222b5978f..862600f6e8693e658becd8c9fcc3b0c7611f03f4 100644
--- a/cvmfs/cache_extern.cc
+++ b/cvmfs/cache_extern.cc
@@ -25,6 +25,7 @@
 #include "cache.pb.h"
 #include "hash.h"
 #include "util/atomic.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/logging.h"
 #include "util/pointer.h"
@@ -33,7 +34,6 @@
 #include "util/smalloc.h"
 #endif
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/cache_extern.h b/cvmfs/cache_extern.h
index a4697d2fa89524bdfbd875d18f67b021d841a58c..6d9300e04bb8ed0b4e78ca65c99e2e38b2bfe531 100644
--- a/cvmfs/cache_extern.h
+++ b/cvmfs/cache_extern.h
@@ -23,8 +23,8 @@
 #include "hash.h"
 #include "quota.h"
 #include "util/atomic.h"
+#include "util/concurrency.h"
 #include "util/single_copy.h"
-#include "util_concurrency.h"
 
 
 class ExternalCacheManager : public CacheManager {
diff --git a/cvmfs/cache_plugin/channel.cc b/cvmfs/cache_plugin/channel.cc
index a0e85c4a31f6f5e806821e25b3683ff336c99e04..f4541d8ffeec82a8ddbee9e7c37d0b7d5aae9a05 100644
--- a/cvmfs/cache_plugin/channel.cc
+++ b/cvmfs/cache_plugin/channel.cc
@@ -15,6 +15,7 @@
 #include <cstring>
 #include <vector>
 
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/logging.h"
 #include "util/platform.h"
@@ -22,7 +23,6 @@
 #include "util/posix.h"
 #include "util/smalloc.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/cache_plugin/cvmfs_cache_ram.cc b/cvmfs/cache_plugin/cvmfs_cache_ram.cc
index 7073466b78412147c3413dea0f6f3345ee297c9d..af4c5abfde14cad68b07acc4e2bf05eba877243f 100644
--- a/cvmfs/cache_plugin/cvmfs_cache_ram.cc
+++ b/cvmfs/cache_plugin/cvmfs_cache_ram.cc
@@ -27,12 +27,12 @@
 #include "lru.h"
 #include "malloc_heap.h"
 #include "smallhash.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/murmur.hxx"
 #include "util/platform.h"
 #include "util/smalloc.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/cache_ram.cc b/cvmfs/cache_ram.cc
index 19603b57c5563dc0023ec2277cdd294d07742eba..7fcf96a3bdded2ac9725df5deea5530dc2575c2a 100644
--- a/cvmfs/cache_ram.cc
+++ b/cvmfs/cache_ram.cc
@@ -11,10 +11,10 @@
 #include <new>
 
 #include "kvstore.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/posix.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/catalog.cc b/cvmfs/catalog.cc
index 5504b044266bc3c4496ca00c415328d56583f5f3..b1b8a023e6a8c8496fba6863a48294c2cf66be30 100644
--- a/cvmfs/catalog.cc
+++ b/cvmfs/catalog.cc
@@ -11,10 +11,10 @@
 #include <cassert>
 
 #include "catalog_mgr.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/platform.h"
 #include "util/smalloc.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/catalog_mgr_rw.h b/cvmfs/catalog_mgr_rw.h
index 6bcc869bc75454bda4c3d24ac7ebe9d9f39d6746..3a6d605c839db56c1586d665652b8926ce44d4d9 100644
--- a/cvmfs/catalog_mgr_rw.h
+++ b/cvmfs/catalog_mgr_rw.h
@@ -40,7 +40,7 @@
 #include "catalog_rw.h"
 #include "file_chunk.h"
 #include "upload_spooler_result.h"
-#include "util_concurrency.h"
+#include "util/concurrency.h"
 #include "xattr.h"
 
 class XattrList;
diff --git a/cvmfs/catalog_rw.cc b/cvmfs/catalog_rw.cc
index 0eea8399855d00bdf05b5f89659af3d6d1b20f5a..55d20545cf4af7efd9d3decbd01abe35ea1c5215 100644
--- a/cvmfs/catalog_rw.cc
+++ b/cvmfs/catalog_rw.cc
@@ -10,9 +10,9 @@
 #include <cstdio>
 #include <cstdlib>
 
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/logging.h"
-#include "util_concurrency.h"
 #include "xattr.h"
 
 using namespace std;  // NOLINT
diff --git a/cvmfs/catalog_traversal.h b/cvmfs/catalog_traversal.h
index f0b7ea67282222cde253f67e5420218631b96b5a..6af3423bce523dc458dcb8c32bf13011362e27c1 100644
--- a/cvmfs/catalog_traversal.h
+++ b/cvmfs/catalog_traversal.h
@@ -18,8 +18,8 @@
 #include "manifest.h"
 #include "object_fetcher.h"
 #include "signature.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
-#include "util_concurrency.h"
 
 namespace catalog {
 class Catalog;
diff --git a/cvmfs/clientctx.cc b/cvmfs/clientctx.cc
index 186f589510a102551bfa0644739ff7d8d0a23767..5ef899c3c193d56ec81eb6ed6b9f87beb6c689f3 100644
--- a/cvmfs/clientctx.cc
+++ b/cvmfs/clientctx.cc
@@ -7,8 +7,8 @@
 #include <cassert>
 
 #include "interrupt.h"
+#include "util/concurrency.h"
 #include "util/smalloc.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/cvmfs.cc b/cvmfs/cvmfs.cc
index 89cd0ed1714dff2da00e8cf0e1fef2fdb6068bee..1918ccce273424e5859c25f27bcfc9b5a96fd9d7 100644
--- a/cvmfs/cvmfs.cc
+++ b/cvmfs/cvmfs.cc
@@ -106,11 +106,11 @@
 #include "tracer.h"
 #include "util/algorithm.h"
 #include "util/atomic.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/logging.h"
 #include "util/platform.h"
 #include "util/smalloc.h"
-#include "util_concurrency.h"
 #include "uuid.h"
 #include "wpad.h"
 #include "xattr.h"
diff --git a/cvmfs/cvmfs_fsck.cc b/cvmfs/cvmfs_fsck.cc
index c77d52df5d21cbb584114b46229a9207520db1bd..2f678e1858c4fcbb425495da0a1f1228f17b8770 100644
--- a/cvmfs/cvmfs_fsck.cc
+++ b/cvmfs/cvmfs_fsck.cc
@@ -26,11 +26,11 @@
 #include "compression.h"
 #include "hash.h"
 #include "util/atomic.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/platform.h"
 #include "util/posix.h"
 #include "util/smalloc.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/download.cc b/cvmfs/download.cc
index 6a98ff605c8bdbacc6844c7b37a2743160cf8191..80e3531cf4845924a4da93329b4a934976f92cf8 100644
--- a/cvmfs/download.cc
+++ b/cvmfs/download.cc
@@ -58,13 +58,13 @@
 #include "ssl.h"
 #include "util/algorithm.h"
 #include "util/atomic.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/logging.h"
 #include "util/posix.h"
 #include "util/prng.h"
 #include "util/smalloc.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/encrypt.cc b/cvmfs/encrypt.cc
index 3de12b8f0d54cb8c97a9d02451f77a0ecf6d4fde..e8a2f204c76226c9c765ca7d30bcbcb3e6f550d6 100644
--- a/cvmfs/encrypt.cc
+++ b/cvmfs/encrypt.cc
@@ -17,12 +17,12 @@
 
 #include "duplex_ssl.h"
 #include "hash.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/platform.h"
 #include "util/pointer.h"
 #include "util/smalloc.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 #include "uuid.h"
 
 using namespace std;  // NOLINT
diff --git a/cvmfs/fetch.cc b/cvmfs/fetch.cc
index 030ac95794627650faf3f30f3238c08f1dfafd69..01d21c0ad5e8a576f463b14890b7fc40254c01f4 100644
--- a/cvmfs/fetch.cc
+++ b/cvmfs/fetch.cc
@@ -14,9 +14,9 @@
 #include "interrupt.h"
 #include "quota.h"
 #include "statistics.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/posix.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/ingestion/ingestion_source.h b/cvmfs/ingestion/ingestion_source.h
index e17fe41b8e39ca2fdf338a0f9bd03d7288fe0ce2..cd16e4482b9c4a545ae2fd38ea2653f015492ed8 100644
--- a/cvmfs/ingestion/ingestion_source.h
+++ b/cvmfs/ingestion/ingestion_source.h
@@ -16,11 +16,11 @@
 #include <string>
 
 #include "duplex_libarchive.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/platform.h"
 #include "util/posix.h"
 #include "util/single_copy.h"
-#include "util_concurrency.h"
 
 /*
  * The purpose of this class is to add a common interface for object that are
diff --git a/cvmfs/ingestion/item.cc b/cvmfs/ingestion/item.cc
index 5f1de0ce837a7572ce282686620ee3a4e7aa59ab..7cac3a3e460dbf67427c94a48171b376e304c754 100644
--- a/cvmfs/ingestion/item.cc
+++ b/cvmfs/ingestion/item.cc
@@ -11,8 +11,8 @@
 
 #include "ingestion/ingestion_source.h"
 #include "item_mem.h"
+#include "util/concurrency.h"
 #include "util/smalloc.h"
-#include "util_concurrency.h"
 
 FileItem::FileItem(
   IngestionSource* source,
diff --git a/cvmfs/ingestion/item_mem.cc b/cvmfs/ingestion/item_mem.cc
index ecf30a05bb7470a7232717ed5dc1a3bfb7c94d05..ba9ef553647e3acea25afe3c4dad6361e4621109 100644
--- a/cvmfs/ingestion/item_mem.cc
+++ b/cvmfs/ingestion/item_mem.cc
@@ -7,8 +7,8 @@
 #include <cassert>
 #include <cstdlib>
 
+#include "util/concurrency.h"
 #include "util/exception.h"
-#include "util_concurrency.h"
 
 atomic_int64 ItemAllocator::total_allocated_ = 0;
 
diff --git a/cvmfs/ingestion/pipeline.cc b/cvmfs/ingestion/pipeline.cc
index 397fd78151c03cd8a7cc30c7b0d76483d95ecb3c..42a3fe06a8ce626c3926873e8adf91ff5f2f2713 100644
--- a/cvmfs/ingestion/pipeline.cc
+++ b/cvmfs/ingestion/pipeline.cc
@@ -16,10 +16,10 @@
 #include "ingestion/task_write.h"
 #include "upload_facility.h"
 #include "upload_spooler_definition.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/platform.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 const uint64_t IngestionPipeline::kMaxPipelineMem = 1024 * 1024 * 1024;
 
diff --git a/cvmfs/ingestion/pipeline.h b/cvmfs/ingestion/pipeline.h
index 7eaf6046a3cc3d0863c31cc86f92f33a8572fcf0..a8481e37d160bd41fcee0d20ad1f33b82bbc531e 100644
--- a/cvmfs/ingestion/pipeline.h
+++ b/cvmfs/ingestion/pipeline.h
@@ -14,7 +14,7 @@
 #include "ingestion/task.h"
 #include "ingestion/tube.h"
 #include "upload_spooler_result.h"
-#include "util_concurrency.h"
+#include "util/concurrency.h"
 
 namespace upload {
 class AbstractUploader;
diff --git a/cvmfs/ingestion/task_register.h b/cvmfs/ingestion/task_register.h
index c5dd7d75ca865e3febf0b01fff50a6a72e87e399..2117af5c5cbd479b6c3189a866317dc505b306f9 100644
--- a/cvmfs/ingestion/task_register.h
+++ b/cvmfs/ingestion/task_register.h
@@ -9,7 +9,7 @@
 #include "ingestion/task.h"
 #include "ingestion/tube.h"
 #include "upload_spooler_result.h"
-#include "util_concurrency.h"
+#include "util/concurrency.h"
 
 /**
  * Runs the callback to register processed files in the file catalog.
diff --git a/cvmfs/ingestion/tube.h b/cvmfs/ingestion/tube.h
index 4dd188c5c4c6bb781781bbea97a58bdd71ddd3cb..4bf59bebee82b466d946a4a6d6b21dede4f51e3d 100644
--- a/cvmfs/ingestion/tube.h
+++ b/cvmfs/ingestion/tube.h
@@ -12,9 +12,9 @@
 #include <vector>
 
 #include "util/atomic.h"
+#include "util/concurrency.h"
 #include "util/pointer.h"
 #include "util/single_copy.h"
-#include "util_concurrency.h"
 
 /**
  * A thread-safe, doubly linked list of links containing pointers to ItemT.  The
diff --git a/cvmfs/kvstore.cc b/cvmfs/kvstore.cc
index e5e8c5e079fe4fac98b5299abbe5e76bc54242a6..97c071d2aae553bf3ed977162289a333de537f8f 100644
--- a/cvmfs/kvstore.cc
+++ b/cvmfs/kvstore.cc
@@ -14,8 +14,8 @@
 #include <algorithm>
 
 #include "util/async.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/mountpoint.cc b/cvmfs/mountpoint.cc
index 7f2d15500d90261e1b930493c4a7779bd1d82438..a06349d09b07649389de26b2749924736a55167b 100644
--- a/cvmfs/mountpoint.cc
+++ b/cvmfs/mountpoint.cc
@@ -63,12 +63,12 @@
 #include "sqlitevfs.h"
 #include "statistics.h"
 #include "tracer.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/platform.h"
 #include "util/pointer.h"
 #include "util/posix.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 #include "uuid.h"
 #include "wpad.h"
 
diff --git a/cvmfs/nfs_maps_leveldb.cc b/cvmfs/nfs_maps_leveldb.cc
index 9d2d45fa221b9cf33cde880e33cd99d5aa8a00ec..935f2238d69e04d1d15be22b04db9516025ed9e4 100644
--- a/cvmfs/nfs_maps_leveldb.cc
+++ b/cvmfs/nfs_maps_leveldb.cc
@@ -25,12 +25,12 @@
 #include "leveldb/db.h"
 #include "leveldb/filter_policy.h"
 #include "statistics.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/logging.h"
 #include "util/pointer.h"
 #include "util/posix.h"
 #include "util/smalloc.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/nfs_maps_sqlite.cc b/cvmfs/nfs_maps_sqlite.cc
index a1e86c1e567feab0acba02cef52ed986d0c51d40..cd943eac5f08d24003d8a595485a3e9d79e7f88a 100644
--- a/cvmfs/nfs_maps_sqlite.cc
+++ b/cvmfs/nfs_maps_sqlite.cc
@@ -23,6 +23,7 @@
 #include <cstdlib>
 
 #include "statistics.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/logging.h"
 #include "util/pointer.h"
@@ -30,7 +31,6 @@
 #include "util/prng.h"
 #include "util/smalloc.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/pack.cc b/cvmfs/pack.cc
index 65cceb585edc749af833151bddf373457a7dcdb1..a8f06326c67feb8c470c32b700bd534099a1e555 100644
--- a/cvmfs/pack.cc
+++ b/cvmfs/pack.cc
@@ -9,11 +9,11 @@
 #include <cstring>
 #include <map>
 
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/platform.h"
 #include "util/smalloc.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/pack.h b/cvmfs/pack.h
index 6ac0290b1011302321025ea228b9d452f5f75349..489dd1fac2817eba4c33a153df3349cea50d6893 100644
--- a/cvmfs/pack.h
+++ b/cvmfs/pack.h
@@ -15,8 +15,8 @@
 
 #include "gtest/gtest_prod.h"
 #include "hash.h"
+#include "util/concurrency.h"
 #include "util/single_copy.h"
-#include "util_concurrency.h"
 
 /**
  * Multiple content-addressable objects in a single BLOB.  A (serialized)
diff --git a/cvmfs/quota.cc b/cvmfs/quota.cc
index 8d531cfeb8dd7b9be93d9564c778b72993084bfb..5ddec213f5e3b453c537b166d7fd2e403c779e0a 100644
--- a/cvmfs/quota.cc
+++ b/cvmfs/quota.cc
@@ -10,9 +10,9 @@
 
 #include <cstdlib>
 
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/smalloc.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/quota_posix.cc b/cvmfs/quota_posix.cc
index 8ec56367118b2dab2ffb7f7ad333cbbd10e4b6c9..3f03f7c7698982ebe7f9d99b7bfea54613156d0d 100644
--- a/cvmfs/quota_posix.cc
+++ b/cvmfs/quota_posix.cc
@@ -49,6 +49,7 @@
 #include "hash.h"
 #include "monitor.h"
 #include "statistics.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/logging.h"
 #include "util/platform.h"
@@ -56,7 +57,6 @@
 #include "util/posix.h"
 #include "util/smalloc.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/s3fanout.cc b/cvmfs/s3fanout.cc
index 1335a38f6d56666953652749e59d4540f08c06c0..e2c2ec3ad27f83366e757d51b1dc32a2bbac78e0 100644
--- a/cvmfs/s3fanout.cc
+++ b/cvmfs/s3fanout.cc
@@ -14,11 +14,11 @@
 #include "cvmfs_config.h"
 #include "s3fanout.h"
 #include "upload_facility.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/platform.h"
 #include "util/posix.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/s3fanout.h b/cvmfs/s3fanout.h
index 4886b61165d57a1c45d903ba780dee92f3a1ca3e..92960e09fca425f906b34530ccec1790ed7e97ed 100644
--- a/cvmfs/s3fanout.h
+++ b/cvmfs/s3fanout.h
@@ -19,13 +19,13 @@
 #include "dns.h"
 #include "duplex_curl.h"
 #include "ssl.h"
+#include "util/concurrency.h"
 #include "util/file_backed_buffer.h"
 #include "util/mmap_file.h"
 #include "util/pointer.h"
 #include "util/prng.h"
 #include "util/single_copy.h"
 #include "util/smalloc.h"
-#include "util_concurrency.h"
 
 namespace s3fanout {
 
diff --git a/cvmfs/session_context.h b/cvmfs/session_context.h
index 4e6a769b00e4575e5390af4ac179fa91c67d4976..3cc3a640eeecd8f1f1d1e7eb4ddcac8b90b25092 100644
--- a/cvmfs/session_context.h
+++ b/cvmfs/session_context.h
@@ -10,8 +10,8 @@
 
 #include "pack.h"
 #include "repository_tag.h"
+#include "util/concurrency.h"
 #include "util/pointer.h"
-#include "util_concurrency.h"
 
 namespace upload {
 
diff --git a/cvmfs/shrinkwrap/fs_traversal.cc b/cvmfs/shrinkwrap/fs_traversal.cc
index 5eff3efb90af902e7ff5cbf4540fa1c3bc5bf50c..6eb86f7119d0edcdced704466769f8291c73dfa4 100644
--- a/cvmfs/shrinkwrap/fs_traversal.cc
+++ b/cvmfs/shrinkwrap/fs_traversal.cc
@@ -19,12 +19,12 @@
 #include "shrinkwrap/spec_tree.h"
 #include "statistics.h"
 #include "util/atomic.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/platform.h"
 #include "util/posix.h"
 #include "util/smalloc.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std; //NOLINT
 
diff --git a/cvmfs/shrinkwrap/shrinkwrap.cc b/cvmfs/shrinkwrap/shrinkwrap.cc
index 239bcd7419ebb6a029865832ecd6b1660436939e..495de2e1c25dfd9f9ca491fdf327910fb562cafc 100644
--- a/cvmfs/shrinkwrap/shrinkwrap.cc
+++ b/cvmfs/shrinkwrap/shrinkwrap.cc
@@ -13,9 +13,9 @@
 #include "cvmfs_config.h"
 #include "shrinkwrap/fs_traversal.h"
 #include "shrinkwrap/fs_traversal_interface.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 
 namespace {
diff --git a/cvmfs/signature.cc b/cvmfs/signature.cc
index 3a90af07689c9996fa42ba7508d44b2e58707ef4..e189404c416939c5764780e884f67c0978ecfcae 100644
--- a/cvmfs/signature.cc
+++ b/cvmfs/signature.cc
@@ -29,13 +29,13 @@
 
 #include "duplex_ssl.h"
 #include "hash.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/platform.h"
 #include "util/posix.h"
 #include "util/prng.h"
 #include "util/smalloc.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/signing_tool.h b/cvmfs/signing_tool.h
index 0b29e0a30330c42cb59a4ded710c8ca1ad27183b..4e9f0ae119b25c27f4a8866d7354837eb090dddd 100644
--- a/cvmfs/signing_tool.h
+++ b/cvmfs/signing_tool.h
@@ -10,7 +10,7 @@
 
 #include "hash.h"
 #include "server_tool.h"
-#include "util_concurrency.h"
+#include "util/concurrency.h"
 
 class ServerTool;
 
diff --git a/cvmfs/sqlitemem.cc b/cvmfs/sqlitemem.cc
index 8714b37a05b723d2967619790f2bf9bfaffb92ea..e9de14f959c4973d0e2c2e66af6abef328cdafef 100644
--- a/cvmfs/sqlitemem.cc
+++ b/cvmfs/sqlitemem.cc
@@ -13,9 +13,9 @@
 #include <new>
 
 #include "malloc_arena.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/smalloc.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/statistics.cc b/cvmfs/statistics.cc
index 2707394a0d21fa67a69b02227346efe0d61c7ed7..53e7102ed84434c2290228832b5c573a4d422d15 100644
--- a/cvmfs/statistics.cc
+++ b/cvmfs/statistics.cc
@@ -8,10 +8,10 @@
 #include <cassert>
 
 #include "json_document_write.h"
+#include "util/concurrency.h"
 #include "util/platform.h"
 #include "util/smalloc.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/swissknife_history.h b/cvmfs/swissknife_history.h
index 8125d39da915c0c1f8bea664d07c30808d8ef6f0..813df4657728ed17c3a7f33f8a6c284d298e1d7b 100644
--- a/cvmfs/swissknife_history.h
+++ b/cvmfs/swissknife_history.h
@@ -11,7 +11,7 @@
 #include "hash.h"
 #include "history_sqlite.h"
 #include "swissknife.h"
-#include "util_concurrency.h"
+#include "util/concurrency.h"
 
 namespace manifest {
 class Manifest;
diff --git a/cvmfs/swissknife_migrate.cc b/cvmfs/swissknife_migrate.cc
index 5a1ea3c3efda0df24bb862ace484d1b348746ff2..ecfa02d11e9f441c5c09b3638115561ca90dffc0 100644
--- a/cvmfs/swissknife_migrate.cc
+++ b/cvmfs/swissknife_migrate.cc
@@ -16,8 +16,8 @@
 #include "compression.h"
 #include "hash.h"
 #include "swissknife_history.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/swissknife_migrate.h b/cvmfs/swissknife_migrate.h
index ec6fe36ad478633e738d9dd55d0069ef3ee55f61..39c4a60850ce6ef7cb47637dbaa5ec03a1b40196 100644
--- a/cvmfs/swissknife_migrate.h
+++ b/cvmfs/swissknife_migrate.h
@@ -20,9 +20,9 @@
 #include "upload.h"
 #include "util/algorithm.h"
 #include "util/atomic.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/pointer.h"
-#include "util_concurrency.h"
 
 namespace catalog {
 class WritableCatalog;
diff --git a/cvmfs/swissknife_pull.cc b/cvmfs/swissknife_pull.cc
index 10289af9b40457d238c82e7b601a6e1ca4373c5b..dfa94380a0a9fcda263838cf9c709a26deb69512 100644
--- a/cvmfs/swissknife_pull.cc
+++ b/cvmfs/swissknife_pull.cc
@@ -36,13 +36,13 @@
 #include "signature.h"
 #include "upload.h"
 #include "util/atomic.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/logging.h"
 #include "util/posix.h"
 #include "util/shared_ptr.h"
 #include "util/smalloc.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/sync_item_tar.cc b/cvmfs/sync_item_tar.cc
index 89ff891583d699a9cc651b3fe9b0075e8ab37698..d414629b0397f7c720cb4397a49e37d61ef3aea8 100644
--- a/cvmfs/sync_item_tar.cc
+++ b/cvmfs/sync_item_tar.cc
@@ -10,8 +10,8 @@
 #include "duplex_libarchive.h"
 #include "ingestion/ingestion_source.h"
 #include "sync_union_tarball.h"
+#include "util/concurrency.h"
 #include "util/platform.h"
-#include "util_concurrency.h"
 
 namespace publish {
 
diff --git a/cvmfs/sync_item_tar.h b/cvmfs/sync_item_tar.h
index 181b13083ba339309f312b3f3ac23c6cb5a85318..4da37c117f2a12376e96e42d4d2cd7394edac684 100644
--- a/cvmfs/sync_item_tar.h
+++ b/cvmfs/sync_item_tar.h
@@ -13,8 +13,8 @@
 #include "duplex_libarchive.h"
 #include "ingestion/ingestion_source.h"
 #include "sync_union_tarball.h"
+#include "util/concurrency.h"
 #include "util/platform.h"
-#include "util_concurrency.h"
 
 namespace publish {
 
diff --git a/cvmfs/sync_mediator.cc b/cvmfs/sync_mediator.cc
index 13c5379a60146f2ad4f000e981e6d666ac7097fb..43f4daef3567ba7dc711a4b862cba2c1416e2524 100644
--- a/cvmfs/sync_mediator.cc
+++ b/cvmfs/sync_mediator.cc
@@ -23,11 +23,11 @@
 #include "publish/repository.h"
 #include "sync_union.h"
 #include "upload.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/posix.h"
 #include "util/smalloc.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/sync_union_tarball.cc b/cvmfs/sync_union_tarball.cc
index 02380f3674dd99e8435486c8d3ef0891242f2e94..d3571ad608047b7a5a4ef2152e3ca920ce10cc31 100644
--- a/cvmfs/sync_union_tarball.cc
+++ b/cvmfs/sync_union_tarball.cc
@@ -23,10 +23,10 @@
 #include "sync_item_tar.h"
 #include "sync_mediator.h"
 #include "sync_union.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/posix.h"
 #include "util/smalloc.h"
-#include "util_concurrency.h"
 
 namespace publish {
 
diff --git a/cvmfs/sync_union_tarball.h b/cvmfs/sync_union_tarball.h
index 7a27728a733555b28ae1da9376a76c95a0f9c775..0e29a11db3f333a4763fa0f76d197df2a95b35e5 100644
--- a/cvmfs/sync_union_tarball.h
+++ b/cvmfs/sync_union_tarball.h
@@ -19,7 +19,7 @@
 #include <string>
 
 #include "duplex_libarchive.h"
-#include "util_concurrency.h"
+#include "util/concurrency.h"
 
 namespace publish {
 
@@ -68,7 +68,7 @@ class SyncUnionTarball : public SyncUnion {
   std::set<std::string>
       know_directories_;  ///< directory that we know already exist
 
-  /** 
+  /**
    * directories where we found catalog marker, after the main traverse we
    * iterate through them and we add the catalog
    */
diff --git a/cvmfs/tracer.cc b/cvmfs/tracer.cc
index 5a475dfc7b6636ca6f2d050c7d1f7fcef5d1b193..b256b267c6bd40c41b5bccc4d8a090c2d88c4e80 100644
--- a/cvmfs/tracer.cc
+++ b/cvmfs/tracer.cc
@@ -15,9 +15,9 @@
 #include <string>
 
 #include "util/atomic.h"
+#include "util/concurrency.h"
 #include "util/posix.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace std;  // NOLINT
 
diff --git a/cvmfs/upload.cc b/cvmfs/upload.cc
index e666e9b8089a5934a9cee69b2af538ae6ab26013..8a7af48480fa10a6d34b987473025ad4fbb9783b 100644
--- a/cvmfs/upload.cc
+++ b/cvmfs/upload.cc
@@ -7,8 +7,8 @@
 
 #include <vector>
 
+#include "util/concurrency.h"
 #include "util/shared_ptr.h"
-#include "util_concurrency.h"
 
 namespace upload {
 
diff --git a/cvmfs/upload.h b/cvmfs/upload.h
index 14ae8888626dc1198004274b5a19ad35770b65e8..71ea2abdac845ad16d91ffbb2b45ed979fb02bfc 100644
--- a/cvmfs/upload.h
+++ b/cvmfs/upload.h
@@ -121,9 +121,9 @@
 #include "upload_facility.h"
 #include "upload_spooler_definition.h"
 #include "upload_spooler_result.h"
+#include "util/concurrency.h"
 #include "util/pointer.h"
 #include "util/shared_ptr.h"
-#include "util_concurrency.h"
 
 namespace upload {
 
diff --git a/cvmfs/upload_facility.h b/cvmfs/upload_facility.h
index e998554d3945d54fc954f07802ad140ae3b05028..c01692ba3b76c1d24865a7192d1cc354a07ee76c 100644
--- a/cvmfs/upload_facility.h
+++ b/cvmfs/upload_facility.h
@@ -17,8 +17,8 @@
 #include "statistics.h"
 #include "upload_spooler_definition.h"
 #include "util/atomic.h"
+#include "util/concurrency.h"
 #include "util/posix.h"
-#include "util_concurrency.h"
 
 namespace upload {
 
diff --git a/cvmfs/upload_local.h b/cvmfs/upload_local.h
index 6ada1a2db2d10e8e94ebd8ec6574338569550fc7..0c3b35bd1d14bb8ea94d48ee483219272c8a1f61 100644
--- a/cvmfs/upload_local.h
+++ b/cvmfs/upload_local.h
@@ -12,7 +12,7 @@
 
 #include "upload_facility.h"
 #include "util/atomic.h"
-#include "util_concurrency.h"
+#include "util/concurrency.h"
 
 namespace upload {
 
diff --git a/cvmfs/util_concurrency.cc b/cvmfs/util/concurrency.cc
similarity index 98%
rename from cvmfs/util_concurrency.cc
rename to cvmfs/util/concurrency.cc
index c9d60d36936a365b916543e0d9657be74d3cd392..a18df4d68ca02abdacdeda7a4cd1a0f1723b91a0 100644
--- a/cvmfs/util_concurrency.cc
+++ b/cvmfs/util/concurrency.cc
@@ -3,7 +3,7 @@
  */
 
 #include "cvmfs_config.h"
-#include "util_concurrency.h"
+#include "util/concurrency.h"
 
 #include <unistd.h>
 
diff --git a/cvmfs/util_concurrency.h b/cvmfs/util/concurrency.h
similarity index 99%
rename from cvmfs/util_concurrency.h
rename to cvmfs/util/concurrency.h
index 7d582e8b98c6545df6f4c1516e0e2797f61dc564..a350832471bf6e1a829e7a1882476fa01f9d5c40 100644
--- a/cvmfs/util_concurrency.h
+++ b/cvmfs/util/concurrency.h
@@ -770,6 +770,6 @@ class ConcurrentWorker : SingleCopy {
 }  // namespace CVMFS_NAMESPACE_GUARD
 #endif
 
-#include "util_concurrency_impl.h"
+#include "util/concurrency_impl.h"
 
 #endif  // CVMFS_UTIL_CONCURRENCY_H_
diff --git a/cvmfs/util_concurrency_impl.h b/cvmfs/util/concurrency_impl.h
similarity index 100%
rename from cvmfs/util_concurrency_impl.h
rename to cvmfs/util/concurrency_impl.h
diff --git a/cvmfs/util/plugin.h b/cvmfs/util/plugin.h
index 93f243b17c6c6d275f1f315117446039d73e167d..5687d9fe95082afcee3cfc20870cfaebf0ff2ece 100644
--- a/cvmfs/util/plugin.h
+++ b/cvmfs/util/plugin.h
@@ -10,8 +10,8 @@
 #include <cassert>
 #include <vector>
 
-#include "atomic.h"
-#include "util_concurrency.h"
+#include "util/atomic.h"
+#include "util/concurrency.h"
 
 #ifdef CVMFS_NAMESPACE_GUARD
 namespace CVMFS_NAMESPACE_GUARD {
diff --git a/cvmfs/util/posix.cc b/cvmfs/util/posix.cc
index c820a4f054bac48af4da20bc3f23eb1493f9a889..662c0c0cea48c060351b9f1ae56af9698525edaf 100644
--- a/cvmfs/util/posix.cc
+++ b/cvmfs/util/posix.cc
@@ -52,11 +52,11 @@
 
 #include "fs_traversal.h"
 #include "util/algorithm.h"
+#include "util/concurrency.h"
 #include "util/exception.h"
 #include "util/logging.h"
 #include "util/platform.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 //using namespace std;  // NOLINT
 
diff --git a/test/quickcheck/CMakeLists.txt b/test/quickcheck/CMakeLists.txt
index 478980462c06a9d5c10e34bb2894b20220f48be0..85af619138b472114d5814375390e1c89f6f81a1 100644
--- a/test/quickcheck/CMakeLists.txt
+++ b/test/quickcheck/CMakeLists.txt
@@ -85,13 +85,13 @@ set (CVMFS_QC_SOURCES
   ${CVMFS_SOURCE_DIR}/s3fanout.cc
   ${CVMFS_SOURCE_DIR}/upload.cc
   ${CVMFS_SOURCE_DIR}/util/algorithm.cc
+  ${CVMFS_SOURCE_DIR}/util/concurrency.cc
   ${CVMFS_SOURCE_DIR}/util/exception.cc
   ${CVMFS_SOURCE_DIR}/util/logging.cc
   ${CVMFS_SOURCE_DIR}/util/mmap_file.cc
   ${CVMFS_SOURCE_DIR}/util/posix.cc
   ${CVMFS_SOURCE_DIR}/util/raii_temp_dir.cc
   ${CVMFS_SOURCE_DIR}/util/string.cc
-  ${CVMFS_SOURCE_DIR}/util_concurrency.cc
   ${CVMFS_SOURCE_DIR}/whitelist.cc
   ${CVMFS_SOURCE_DIR}/xattr.cc
   cache.pb.cc cache.pb.h
diff --git a/test/unittests/CMakeLists.txt b/test/unittests/CMakeLists.txt
index e0e8dd5f24076ee638c73dd0982d7cef65fb4e6f..e2423244750ec8f7ab1e9e26e5b8beb14f2929de 100644
--- a/test/unittests/CMakeLists.txt
+++ b/test/unittests/CMakeLists.txt
@@ -256,6 +256,7 @@ set (CVMFS_UNITTEST_SOURCES
   ${CVMFS_SOURCE_DIR}/upload_spooler_definition.cc
   ${CVMFS_SOURCE_DIR}/url.cc
   ${CVMFS_SOURCE_DIR}/util/algorithm.cc
+  ${CVMFS_SOURCE_DIR}/util/concurrency.cc
   ${CVMFS_SOURCE_DIR}/util/exception.cc
   ${CVMFS_SOURCE_DIR}/util/file_backed_buffer.cc
   ${CVMFS_SOURCE_DIR}/util/logging.cc
@@ -264,7 +265,6 @@ set (CVMFS_UNITTEST_SOURCES
   ${CVMFS_SOURCE_DIR}/util/posix.cc
   ${CVMFS_SOURCE_DIR}/util/string.cc
   ${CVMFS_SOURCE_DIR}/util/raii_temp_dir.cc
-  ${CVMFS_SOURCE_DIR}/util_concurrency.cc
   ${CVMFS_SOURCE_DIR}/uuid.cc
   ${CVMFS_SOURCE_DIR}/whitelist.cc
   ${CVMFS_SOURCE_DIR}/wpad.cc
@@ -318,11 +318,11 @@ set (CVMFS_TEST_CACHE_SOURCES
   ${CVMFS_SOURCE_DIR}/hash.cc
   ${CVMFS_SOURCE_DIR}/manifest.cc
   ${CVMFS_SOURCE_DIR}/quota.cc
+  ${CVMFS_SOURCE_DIR}/util/concurrency.cc
   ${CVMFS_SOURCE_DIR}/util/exception.cc
   ${CVMFS_SOURCE_DIR}/util/logging.cc
   ${CVMFS_SOURCE_DIR}/util/posix.cc
   ${CVMFS_SOURCE_DIR}/util/string.cc
-  ${CVMFS_SOURCE_DIR}/util_concurrency.cc
 )
 
 
@@ -380,11 +380,11 @@ set (CVMFS_CLIENT_SOURCES
   ${CVMFS_SOURCE_DIR}/tracer.cc
   ${CVMFS_SOURCE_DIR}/uuid.cc
   ${CVMFS_SOURCE_DIR}/util/algorithm.cc
+  ${CVMFS_SOURCE_DIR}/util/concurrency.cc
   ${CVMFS_SOURCE_DIR}/util/exception.cc
   ${CVMFS_SOURCE_DIR}/util/logging.cc
   ${CVMFS_SOURCE_DIR}/util/posix.cc
   ${CVMFS_SOURCE_DIR}/util/string.cc
-  ${CVMFS_SOURCE_DIR}/util_concurrency.cc
   ${CVMFS_SOURCE_DIR}/whitelist.cc
   ${CVMFS_SOURCE_DIR}/wpad.cc
   ${CVMFS_SOURCE_DIR}/xattr.cc
@@ -522,8 +522,8 @@ set (CVMFS_TEST_PUBLISH_SOURCES
   ${CVMFS_SOURCE_DIR}/upload_local.cc
   ${CVMFS_SOURCE_DIR}/upload_s3.cc
   ${CVMFS_SOURCE_DIR}/upload_spooler_definition.cc
-  ${CVMFS_SOURCE_DIR}/util_concurrency.cc
   ${CVMFS_SOURCE_DIR}/util/algorithm.cc
+  ${CVMFS_SOURCE_DIR}/util/concurrency.cc
   ${CVMFS_SOURCE_DIR}/util/exception.cc
   ${CVMFS_SOURCE_DIR}/util/file_backed_buffer.cc
   ${CVMFS_SOURCE_DIR}/util/logging.cc
diff --git a/test/unittests/t_blocking_counter.cc b/test/unittests/t_blocking_counter.cc
index e510f858de6fbb69575db943aa109e8d98c0a740..1a2e696600ec7b154ea89b244ff34f61fce7196d 100644
--- a/test/unittests/t_blocking_counter.cc
+++ b/test/unittests/t_blocking_counter.cc
@@ -8,7 +8,7 @@
 #include <pthread.h>
 #include <unistd.h>
 
-#include "util_concurrency.h"
+#include "util/concurrency.h"
 
 class T_BlockingCounter : public ::testing::Test {
  protected:
diff --git a/test/unittests/t_file_watcher.cc b/test/unittests/t_file_watcher.cc
index 288085241638a7d233a62c24f5c6161cb940628d..ae4a377c2027208e3552eefa26480a123718108b 100644
--- a/test/unittests/t_file_watcher.cc
+++ b/test/unittests/t_file_watcher.cc
@@ -7,10 +7,10 @@
 #include <map>
 
 #include "file_watcher.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/pointer.h"
 #include "util/posix.h"
-#include "util_concurrency.h"
 
 typedef std::map<file_watcher::Event, int> Counters;
 
diff --git a/test/unittests/t_payload_processor.cc b/test/unittests/t_payload_processor.cc
index a882f086f7a33466c8d4ce0dbde9409b32c9e056..9f0e8195491204cc456bf42edcbc45143d24911d 100644
--- a/test/unittests/t_payload_processor.cc
+++ b/test/unittests/t_payload_processor.cc
@@ -6,8 +6,8 @@
 
 #include "pack.h"
 #include "receiver/payload_processor.h"
+#include "util/concurrency.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace receiver;  // NOLINT
 
diff --git a/test/unittests/t_reactor.cc b/test/unittests/t_reactor.cc
index aab2b38a266019c4582123f1b67341503c811a90..5d4d3b382574da3993c1b700e8326698621dcef3 100644
--- a/test/unittests/t_reactor.cc
+++ b/test/unittests/t_reactor.cc
@@ -9,10 +9,10 @@
 #include "pack.h"
 #include "receiver/payload_processor.h"
 #include "receiver/reactor.h"
+#include "util/concurrency.h"
 #include "util/logging.h"
 #include "util/pointer.h"
 #include "util/string.h"
-#include "util_concurrency.h"
 
 using namespace receiver;  // NOLINT
 
diff --git a/test/unittests/t_synchronizing_counter.cc b/test/unittests/t_synchronizing_counter.cc
index d7a580f97096ea933acd048b51dba766e38a6597..4caae181125fa7a2cefb00c39e049b310dd95e88 100644
--- a/test/unittests/t_synchronizing_counter.cc
+++ b/test/unittests/t_synchronizing_counter.cc
@@ -9,7 +9,7 @@
 
 #include <cassert>
 
-#include "util_concurrency.h"
+#include "util/concurrency.h"
 
 
 struct thread_args {
diff --git a/test/unittests/t_util_concurrency.cc b/test/unittests/t_util_concurrency.cc
index 18d8d888bba4ce8bb76a4eeddc82089b30506398..39b656cb730b382b9728ae9ba2685d11d8664277 100644
--- a/test/unittests/t_util_concurrency.cc
+++ b/test/unittests/t_util_concurrency.cc
@@ -7,7 +7,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "util_concurrency.h"
+#include "util/concurrency.h"
 
 
 class DummyLocker {