From d9a5e82160ffbbfdf2db92ca9e83871c75955d6c Mon Sep 17 00:00:00 2001
From: Alexey Rybalchenko <alexryba@gmail.com>
Date: Wed, 13 Jan 2021 14:01:48 +0100
Subject: [PATCH] Cleanup tools includes

---
 fairmq/FairMQTransportFactory.cxx           | 3 ++-
 fairmq/JSONParser.cxx                       | 1 -
 fairmq/Properties.cxx                       | 2 --
 fairmq/ofi/Context.cxx                      | 2 +-
 fairmq/ofi/Message.cxx                      | 1 -
 fairmq/ofi/Poller.cxx                       | 2 +-
 fairmq/ofi/TransportFactory.cxx             | 1 -
 fairmq/plugins/PMIx/PMIxPlugin.cxx          | 2 +-
 fairmq/run/runUuidGenerator.cxx             | 2 +-
 fairmq/sdk/DDSEnvironment.cxx               | 2 +-
 fairmq/sdk/DDSSession.cxx                   | 3 ++-
 fairmq/sdk/DDSTopology.cxx                  | 1 -
 fairmq/sdk/runDDSCommandUI.cxx              | 2 +-
 fairmq/shmem/Message.h                      | 1 -
 fairmq/shmem/Monitor.cxx                    | 2 +-
 fairmq/shmem/Poller.h                       | 2 +-
 fairmq/shmem/Socket.h                       | 5 ++---
 fairmq/shmem/TransportFactory.h             | 2 +-
 fairmq/zeromq/Context.h                     | 2 +-
 fairmq/zeromq/Poller.h                      | 2 +-
 fairmq/zeromq/Socket.h                      | 2 +-
 fairmq/zeromq/TransportFactory.h            | 1 -
 test/device/_config.cxx                     | 2 --
 test/device/_error_state.cxx                | 3 ++-
 test/device/_exceptions.cxx                 | 3 ++-
 test/device/_signals.cxx                    | 3 ++-
 test/device/_version.cxx                    | 2 +-
 test/device/_waitfor.cxx                    | 4 +++-
 test/memory_resources/_memory_resources.cxx | 2 +-
 test/message/_message.cxx                   | 3 ++-
 test/plugin_services/_config.cxx            | 2 +-
 test/plugins/_plugin.cxx                    | 2 +-
 test/poller/_poller.cxx                     | 4 +++-
 test/protocols/_pair.cxx                    | 3 ++-
 test/protocols/_pub_sub.cxx                 | 3 ++-
 test/protocols/_push_pull.cxx               | 3 ++-
 test/protocols/_push_pull_multipart.cxx     | 2 +-
 test/protocols/_req_rep.cxx                 | 3 ++-
 test/region/_region.cxx                     | 9 ++++++---
 test/sdk/_topology.cxx                      | 3 ++-
 test/tools/_network.cxx                     | 2 +-
 test/transport/_options.cxx                 | 2 +-
 test/transport/_transfer_timeout.cxx        | 4 +++-
 43 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/fairmq/FairMQTransportFactory.cxx b/fairmq/FairMQTransportFactory.cxx
index 0ea33632..073a894b 100644
--- a/fairmq/FairMQTransportFactory.cxx
+++ b/fairmq/FairMQTransportFactory.cxx
@@ -13,7 +13,8 @@
 #include <fairmq/ofi/TransportFactory.h>
 #endif
 #include <FairMQLogger.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
+#include <fairmq/tools/Strings.h>
 
 #include <fairlogger/Logger.h>
 
diff --git a/fairmq/JSONParser.cxx b/fairmq/JSONParser.cxx
index fdb733d7..b2665af4 100644
--- a/fairmq/JSONParser.cxx
+++ b/fairmq/JSONParser.cxx
@@ -15,7 +15,6 @@
 #include "JSONParser.h"
 #include "FairMQChannel.h"
 #include <fairmq/PropertyOutput.h>
-#include <fairmq/tools/CppSTL.h>
 #include <fairmq/tools/Strings.h>
 
 #include <fairlogger/Logger.h>
diff --git a/fairmq/Properties.cxx b/fairmq/Properties.cxx
index 23d2f5c4..19b51a76 100644
--- a/fairmq/Properties.cxx
+++ b/fairmq/Properties.cxx
@@ -7,12 +7,10 @@
  ********************************************************************************/
 
 #include <fairmq/Properties.h>
-#include <fairmq/Tools.h>
 
 #include <boost/filesystem.hpp>
 
 using namespace std;
-using namespace fair::mq::tools;
 using boost::any_cast;
 
 namespace fair
diff --git a/fairmq/ofi/Context.cxx b/fairmq/ofi/Context.cxx
index e0abb971..f3b06e72 100644
--- a/fairmq/ofi/Context.cxx
+++ b/fairmq/ofi/Context.cxx
@@ -7,7 +7,7 @@
  ********************************************************************************/
 
 #include <fairmq/ofi/Context.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <FairMQLogger.h>
 
 #include <asiofi/version.hpp>
diff --git a/fairmq/ofi/Message.cxx b/fairmq/ofi/Message.cxx
index cdd56117..1cf56c6c 100644
--- a/fairmq/ofi/Message.cxx
+++ b/fairmq/ofi/Message.cxx
@@ -7,7 +7,6 @@
  ********************************************************************************/
 
 #include <fairmq/ofi/Message.h>
-#include <fairmq/Tools.h>
 #include <FairMQLogger.h>
 
 #include <asiofi.hpp>
diff --git a/fairmq/ofi/Poller.cxx b/fairmq/ofi/Poller.cxx
index 700fc561..bed8b9e9 100644
--- a/fairmq/ofi/Poller.cxx
+++ b/fairmq/ofi/Poller.cxx
@@ -8,7 +8,7 @@
 
 #include <fairmq/ofi/Poller.h>
 #include <fairmq/ofi/Socket.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <FairMQLogger.h>
 
 #include <zmq.h>
diff --git a/fairmq/ofi/TransportFactory.cxx b/fairmq/ofi/TransportFactory.cxx
index 4e400e6b..51ac1ff3 100644
--- a/fairmq/ofi/TransportFactory.cxx
+++ b/fairmq/ofi/TransportFactory.cxx
@@ -10,7 +10,6 @@
 #include <fairmq/ofi/Poller.h>
 #include <fairmq/ofi/Socket.h>
 #include <fairmq/ofi/TransportFactory.h>
-#include <fairmq/Tools.h>
 
 #include <stdexcept>
 
diff --git a/fairmq/plugins/PMIx/PMIxPlugin.cxx b/fairmq/plugins/PMIx/PMIxPlugin.cxx
index b59eea61..00aeb97d 100644
--- a/fairmq/plugins/PMIx/PMIxPlugin.cxx
+++ b/fairmq/plugins/PMIx/PMIxPlugin.cxx
@@ -9,7 +9,7 @@
 #include "PMIxPlugin.h"
 
 #include <fairmq/sdk/commands/Commands.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 
 #include <sstream>
 #include <stdexcept>
diff --git a/fairmq/run/runUuidGenerator.cxx b/fairmq/run/runUuidGenerator.cxx
index be77e0f9..a9162fbd 100644
--- a/fairmq/run/runUuidGenerator.cxx
+++ b/fairmq/run/runUuidGenerator.cxx
@@ -5,7 +5,7 @@
 *              GNU Lesser General Public Licence (LGPL) version 3,             *
 *                  copied verbatim in the file "LICENSE"                       *
 ********************************************************************************/
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
 
 #include <boost/program_options.hpp>
 
diff --git a/fairmq/sdk/DDSEnvironment.cxx b/fairmq/sdk/DDSEnvironment.cxx
index 2a2b13de..7a66abab 100644
--- a/fairmq/sdk/DDSEnvironment.cxx
+++ b/fairmq/sdk/DDSEnvironment.cxx
@@ -11,7 +11,7 @@
 #include <cstdlib>
 #include <dds/dds.h>
 #include <fairlogger/Logger.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/InstanceLimit.h>
 #include <fairmq/sdk/DDSInfo.h>
 #include <sstream>
 #include <utility>
diff --git a/fairmq/sdk/DDSSession.cxx b/fairmq/sdk/DDSSession.cxx
index 4d02c6a8..dcc530af 100644
--- a/fairmq/sdk/DDSSession.cxx
+++ b/fairmq/sdk/DDSSession.cxx
@@ -14,7 +14,8 @@
 #include <cstdlib>
 #include <dds/dds.h>
 #include <fairlogger/Logger.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
+#include <fairmq/tools/Semaphore.h>
 #include <fairmq/sdk/DDSAgent.h>
 #include <fairmq/sdk/DDSEnvironment.h>
 #include <fairmq/sdk/DDSTopology.h>
diff --git a/fairmq/sdk/DDSTopology.cxx b/fairmq/sdk/DDSTopology.cxx
index b632e287..51774011 100644
--- a/fairmq/sdk/DDSTopology.cxx
+++ b/fairmq/sdk/DDSTopology.cxx
@@ -11,7 +11,6 @@
 #include <boost/range/iterator_range.hpp>
 #include <dds/dds.h>
 #include <fairlogger/Logger.h>
-#include <fairmq/Tools.h>
 #include <fairmq/sdk/DDSEnvironment.h>
 #include <memory>
 #include <sstream>
diff --git a/fairmq/sdk/runDDSCommandUI.cxx b/fairmq/sdk/runDDSCommandUI.cxx
index 1069f76b..085c6384 100644
--- a/fairmq/sdk/runDDSCommandUI.cxx
+++ b/fairmq/sdk/runDDSCommandUI.cxx
@@ -9,7 +9,7 @@
 #include <fairmq/sdk/commands/Commands.h>
 #include <fairmq/States.h>
 #include <fairmq/SDK.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 
 #include <boost/program_options.hpp>
 
diff --git a/fairmq/shmem/Message.h b/fairmq/shmem/Message.h
index b8e5eb09..9ca5e1d2 100644
--- a/fairmq/shmem/Message.h
+++ b/fairmq/shmem/Message.h
@@ -12,7 +12,6 @@
 #include "Manager.h"
 #include "Region.h"
 #include "UnmanagedRegion.h"
-#include <fairmq/Tools.h>
 #include <FairMQLogger.h>
 #include <FairMQMessage.h>
 #include <FairMQUnmanagedRegion.h>
diff --git a/fairmq/shmem/Monitor.cxx b/fairmq/shmem/Monitor.cxx
index 91ebbf5e..1f7a8cc8 100644
--- a/fairmq/shmem/Monitor.cxx
+++ b/fairmq/shmem/Monitor.cxx
@@ -9,7 +9,7 @@
 #include "Monitor.h"
 #include "Common.h"
 
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <fairlogger/Logger.h>
 
 #include <boost/interprocess/managed_shared_memory.hpp>
diff --git a/fairmq/shmem/Poller.h b/fairmq/shmem/Poller.h
index f8861149..468758fe 100644
--- a/fairmq/shmem/Poller.h
+++ b/fairmq/shmem/Poller.h
@@ -9,7 +9,7 @@
 #define FAIR_MQ_SHMEM_POLLER_H_
 
 #include "Socket.h"
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <FairMQChannel.h>
 #include <FairMQLogger.h>
 #include <FairMQPoller.h>
diff --git a/fairmq/shmem/Socket.h b/fairmq/shmem/Socket.h
index 474fa30c..447d9bb6 100644
--- a/fairmq/shmem/Socket.h
+++ b/fairmq/shmem/Socket.h
@@ -15,7 +15,7 @@
 #include <FairMQSocket.h>
 #include <FairMQMessage.h>
 #include <FairMQLogger.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 
 #include <zmq.h>
 
@@ -386,8 +386,7 @@ class Socket final : public fair::mq::Socket
     {
         size_t eventsSize = sizeof(uint32_t);
         if (zmq_getsockopt(fSocket, ZMQ_EVENTS, events, &eventsSize) < 0) {
-            throw SocketError(
-                tools::ToString("failed setting ZMQ_EVENTS, reason: ", zmq_strerror(errno)));
+            throw SocketError(tools::ToString("failed setting ZMQ_EVENTS, reason: ", zmq_strerror(errno)));
         }
     }
 
diff --git a/fairmq/shmem/TransportFactory.h b/fairmq/shmem/TransportFactory.h
index ee226ca0..5d61d23e 100644
--- a/fairmq/shmem/TransportFactory.h
+++ b/fairmq/shmem/TransportFactory.h
@@ -19,7 +19,7 @@
 #include <FairMQTransportFactory.h>
 #include <fairmq/ProgOptions.h>
 #include <FairMQLogger.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 
 #include <boost/version.hpp>
 
diff --git a/fairmq/zeromq/Context.h b/fairmq/zeromq/Context.h
index 6fdd7650..2c3af60d 100644
--- a/fairmq/zeromq/Context.h
+++ b/fairmq/zeromq/Context.h
@@ -9,7 +9,7 @@
 #ifndef FAIR_MQ_ZMQ_CONTEXT_H_
 #define FAIR_MQ_ZMQ_CONTEXT_H_
 
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <FairMQLogger.h>
 #include <FairMQUnmanagedRegion.h>
 
diff --git a/fairmq/zeromq/Poller.h b/fairmq/zeromq/Poller.h
index b4b27384..3edf1b32 100644
--- a/fairmq/zeromq/Poller.h
+++ b/fairmq/zeromq/Poller.h
@@ -10,7 +10,7 @@
 #define FAIR_MQ_ZMQ_POLLER_H
 
 #include <fairmq/zeromq/Socket.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <FairMQChannel.h>
 #include <FairMQLogger.h>
 #include <FairMQPoller.h>
diff --git a/fairmq/zeromq/Socket.h b/fairmq/zeromq/Socket.h
index 6ae45ee6..912c3640 100644
--- a/fairmq/zeromq/Socket.h
+++ b/fairmq/zeromq/Socket.h
@@ -12,7 +12,7 @@
 #include <FairMQLogger.h>
 #include <FairMQMessage.h>
 #include <FairMQSocket.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <fairmq/zeromq/Context.h>
 #include <fairmq/zeromq/Message.h>
 
diff --git a/fairmq/zeromq/TransportFactory.h b/fairmq/zeromq/TransportFactory.h
index 14efe016..3ca9f516 100644
--- a/fairmq/zeromq/TransportFactory.h
+++ b/fairmq/zeromq/TransportFactory.h
@@ -14,7 +14,6 @@
 #include <fairmq/zeromq/Socket.h>
 #include <fairmq/zeromq/Poller.h>
 #include <fairmq/zeromq/UnmanagedRegion.h>
-#include <fairmq/Tools.h>
 #include <FairMQTransportFactory.h>
 #include <fairmq/ProgOptions.h>
 
diff --git a/test/device/_config.cxx b/test/device/_config.cxx
index 136a8fe8..8da834fd 100644
--- a/test/device/_config.cxx
+++ b/test/device/_config.cxx
@@ -10,8 +10,6 @@
 #include <fairmq/DeviceRunner.h>
 #include <fairmq/ProgOptions.h>
 
-#include <fairmq/Tools.h>
-
 #include <gtest/gtest.h>
 
 #include <sstream> // std::stringstream
diff --git a/test/device/_error_state.cxx b/test/device/_error_state.cxx
index 61a06f02..03877368 100644
--- a/test/device/_error_state.cxx
+++ b/test/device/_error_state.cxx
@@ -10,7 +10,8 @@
 
 #include <gtest/gtest.h>
 #include <boost/process.hpp>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Process.h>
+#include <fairmq/tools/Unique.h>
 #include <FairMQDevice.h>
 
 #include <string>
diff --git a/test/device/_exceptions.cxx b/test/device/_exceptions.cxx
index 9fb10692..a430f015 100644
--- a/test/device/_exceptions.cxx
+++ b/test/device/_exceptions.cxx
@@ -10,7 +10,8 @@
 
 #include <gtest/gtest.h>
 #include <boost/process.hpp>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Process.h>
+#include <fairmq/tools/Unique.h>
 
 #include <string>
 #include <thread>
diff --git a/test/device/_signals.cxx b/test/device/_signals.cxx
index c34f2da7..5799b8ab 100644
--- a/test/device/_signals.cxx
+++ b/test/device/_signals.cxx
@@ -10,7 +10,8 @@
 
 #include <gtest/gtest.h>
 #include <boost/process.hpp>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
+#include <fairmq/tools/Process.h>
 
 #include <string>
 #include <thread>
diff --git a/test/device/_version.cxx b/test/device/_version.cxx
index 21ac64b8..2c0d3837 100644
--- a/test/device/_version.cxx
+++ b/test/device/_version.cxx
@@ -8,7 +8,7 @@
 
 #include <FairMQDevice.h>
 
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Version.h>
 
 #include <gtest/gtest.h>
 
diff --git a/test/device/_waitfor.cxx b/test/device/_waitfor.cxx
index c2884ee6..a30357a3 100644
--- a/test/device/_waitfor.cxx
+++ b/test/device/_waitfor.cxx
@@ -9,7 +9,9 @@
 #include "runner.h"
 
 #include <gtest/gtest.h>
-#include <fairmq/Tools.h>
+
+#include <fairmq/tools/Unique.h>
+#include <fairmq/tools/Process.h>
 
 #include <signal.h> // kill
 
diff --git a/test/memory_resources/_memory_resources.cxx b/test/memory_resources/_memory_resources.cxx
index 0d9594d8..cd5c34d0 100644
--- a/test/memory_resources/_memory_resources.cxx
+++ b/test/memory_resources/_memory_resources.cxx
@@ -9,7 +9,7 @@
 #include <fairmq/FairMQTransportFactory.h>
 #include <fairmq/MemoryResourceTools.h>
 #include <fairmq/ProgOptions.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
 
 #include <boost/container/pmr/polymorphic_allocator.hpp>
 
diff --git a/test/message/_message.cxx b/test/message/_message.cxx
index fdb23fb2..6d9cf10b 100644
--- a/test/message/_message.cxx
+++ b/test/message/_message.cxx
@@ -10,7 +10,8 @@
 #include <FairMQLogger.h>
 #include <FairMQTransportFactory.h>
 #include <fairmq/ProgOptions.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
+#include <fairmq/tools/Strings.h>
 
 #include <gtest/gtest.h>
 
diff --git a/test/plugin_services/_config.cxx b/test/plugin_services/_config.cxx
index c1e47b19..ddca53dd 100644
--- a/test/plugin_services/_config.cxx
+++ b/test/plugin_services/_config.cxx
@@ -7,7 +7,7 @@
  ********************************************************************************/
 
 #include "Fixture.h"
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
 #include <fairmq/PropertyOutput.h>
 #include <algorithm>
 
diff --git a/test/plugins/_plugin.cxx b/test/plugins/_plugin.cxx
index dcd18726..9c6664b9 100644
--- a/test/plugins/_plugin.cxx
+++ b/test/plugins/_plugin.cxx
@@ -9,7 +9,7 @@
 #include <gtest/gtest.h>
 #include <fairmq/Plugin.h>
 #include <fairmq/PluginServices.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Version.h>
 #include <FairMQDevice.h>
 #include <fairmq/ProgOptions.h>
 #include <memory>
diff --git a/test/poller/_poller.cxx b/test/poller/_poller.cxx
index 9a3d5f41..ed575d16 100644
--- a/test/poller/_poller.cxx
+++ b/test/poller/_poller.cxx
@@ -7,7 +7,9 @@
  ********************************************************************************/
 
 #include "runner.h"
-#include <fairmq/Tools.h>
+
+#include <fairmq/tools/Unique.h>
+#include <fairmq/tools/Process.h>
 #include <gtest/gtest.h>
 #include <sstream> // std::stringstream
 #include <thread>
diff --git a/test/protocols/_pair.cxx b/test/protocols/_pair.cxx
index d6891ecb..9b9d3849 100644
--- a/test/protocols/_pair.cxx
+++ b/test/protocols/_pair.cxx
@@ -7,7 +7,8 @@
  ********************************************************************************/
 
 #include "runner.h"
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
+#include <fairmq/tools/Process.h>
 #include <gtest/gtest.h>
 #include <sstream> // std::stringstream
 #include <thread>
diff --git a/test/protocols/_pub_sub.cxx b/test/protocols/_pub_sub.cxx
index 7e0ba0cc..54b3deef 100644
--- a/test/protocols/_pub_sub.cxx
+++ b/test/protocols/_pub_sub.cxx
@@ -7,7 +7,8 @@
  ********************************************************************************/
 
 #include "runner.h"
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
+#include <fairmq/tools/Process.h>
 #include <gtest/gtest.h>
 #include <sstream> // std::stringstream
 #include <thread>
diff --git a/test/protocols/_push_pull.cxx b/test/protocols/_push_pull.cxx
index 5e9df414..28d97a2e 100644
--- a/test/protocols/_push_pull.cxx
+++ b/test/protocols/_push_pull.cxx
@@ -7,7 +7,8 @@
  ********************************************************************************/
 
 #include "runner.h"
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
+#include <fairmq/tools/Process.h>
 #include <gtest/gtest.h>
 #include <sstream> // std::stringstream
 #include <thread>
diff --git a/test/protocols/_push_pull_multipart.cxx b/test/protocols/_push_pull_multipart.cxx
index f8741ff5..0f38406f 100644
--- a/test/protocols/_push_pull_multipart.cxx
+++ b/test/protocols/_push_pull_multipart.cxx
@@ -11,7 +11,7 @@
 #include <FairMQParts.h>
 #include <FairMQLogger.h>
 #include <FairMQTransportFactory.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
 #include <fairmq/ProgOptions.h>
 
 #include <algorithm>
diff --git a/test/protocols/_req_rep.cxx b/test/protocols/_req_rep.cxx
index a6a3ae4b..a1a12dea 100644
--- a/test/protocols/_req_rep.cxx
+++ b/test/protocols/_req_rep.cxx
@@ -7,7 +7,8 @@
  ********************************************************************************/
 
 #include "runner.h"
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
+#include <fairmq/tools/Process.h>
 #include <gtest/gtest.h>
 #include <sstream> // std::stringstream
 #include <thread>
diff --git a/test/region/_region.cxx b/test/region/_region.cxx
index b4b32881..ab2e6201 100644
--- a/test/region/_region.cxx
+++ b/test/region/_region.cxx
@@ -9,10 +9,13 @@
 #include <FairMQLogger.h>
 #include <FairMQTransportFactory.h>
 #include <fairmq/ProgOptions.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
+#include <fairmq/tools/Semaphore.h>
+#include <fairmq/tools/Strings.h>
 
 #include <gtest/gtest.h>
 
+#include <memory> // make_unique
 #include <string>
 
 namespace
@@ -101,8 +104,8 @@ void RegionCallbacks(const string& transport, const string& _address)
 
     auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config);
 
-    unique_ptr<int> intPtr1 = fair::mq::tools::make_unique<int>(42);
-    unique_ptr<int> intPtr2 = fair::mq::tools::make_unique<int>(43);
+    unique_ptr<int> intPtr1 = make_unique<int>(42);
+    unique_ptr<int> intPtr2 = make_unique<int>(43);
     fair::mq::tools::Semaphore blocker;
 
     FairMQChannel push("Push", "push", factory);
diff --git a/test/sdk/_topology.cxx b/test/sdk/_topology.cxx
index 25b1f5c1..95ac053d 100644
--- a/test/sdk/_topology.cxx
+++ b/test/sdk/_topology.cxx
@@ -11,7 +11,8 @@
 #include <asio.hpp>
 #include <dds/dds.h>
 #include <fairmq/sdk/Topology.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Strings.h>
+#include <fairmq/tools/Semaphore.h>
 
 #include <thread>
 
diff --git a/test/tools/_network.cxx b/test/tools/_network.cxx
index 33fd455b..838c40de 100644
--- a/test/tools/_network.cxx
+++ b/test/tools/_network.cxx
@@ -7,7 +7,7 @@
  ********************************************************************************/
 
 #include <gtest/gtest.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Network.h>
 
 #include <string>
 
diff --git a/test/transport/_options.cxx b/test/transport/_options.cxx
index 50ec5a77..9d0ed855 100644
--- a/test/transport/_options.cxx
+++ b/test/transport/_options.cxx
@@ -11,7 +11,7 @@
 #include <FairMQParts.h>
 #include <FairMQLogger.h>
 #include <FairMQTransportFactory.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Unique.h>
 #include <fairmq/ProgOptions.h>
 
 #include <algorithm>
diff --git a/test/transport/_transfer_timeout.cxx b/test/transport/_transfer_timeout.cxx
index 4f1d4c96..5a596860 100644
--- a/test/transport/_transfer_timeout.cxx
+++ b/test/transport/_transfer_timeout.cxx
@@ -11,7 +11,9 @@
 #include <FairMQLogger.h>
 #include <FairMQTransportFactory.h>
 #include <fairmq/ProgOptions.h>
-#include <fairmq/Tools.h>
+#include <fairmq/tools/Process.h>
+#include <fairmq/tools/Strings.h>
+#include <fairmq/tools/Unique.h>
 #include <gtest/gtest.h>
 
 #include <chrono>