3 files changed, 7 insertions, 4 deletions
diff --git a/tests/benchmark/PMUCounter.cpp b/tests/benchmark/PMUCounter.cpp
index e87dae82e6..6d59dae65d 100644
--- a/tests/benchmark/PMUCounter.cpp
+++ b/tests/benchmark/PMUCounter.cpp
@@ -24,6 +24,7 @@
 #include "PMUCounter.h"
 
 #include "Utils.h"
+#include "support/ToolchainSupport.h"
 
 #define _GNU_SOURCE 1
 #include <asm/unistd.h>
@@ -89,7 +90,7 @@ void CycleCounter::stop()
 
 std::unique_ptr<Instrument::IMeasurement> CycleCounter::get_measurement() const
 {
-    return ::arm_compute::test::cpp14::make_unique<Instrument::Measurement<long long>>(_cycles);
+    return support::cpp14::make_unique<Instrument::Measurement<long long>>(_cycles);
 }
 
 InstructionCounter::InstructionCounter()
diff --git a/tests/benchmark/WallClockTimer.cpp b/tests/benchmark/WallClockTimer.cpp
index 9ab53d0b3c..717fe04b31 100644
--- a/tests/benchmark/WallClockTimer.cpp
+++ b/tests/benchmark/WallClockTimer.cpp
@@ -24,6 +24,7 @@
 #include "WallClockTimer.h"
 
 #include "Utils.h"
+#include "support/ToolchainSupport.h"
 
 namespace arm_compute
 {
@@ -49,7 +50,7 @@ void WallClockTimer::stop()
 std::unique_ptr<Instrument::IMeasurement> WallClockTimer::get_measurement() const
 {
     const std::chrono::duration<float, std::milli> delta = _stop - _start;
-    return ::arm_compute::test::cpp14::make_unique<Instrument::Measurement<float>>(delta.count());
+    return support::cpp14::make_unique<Instrument::Measurement<float>>(delta.count());
 }
 } // namespace benchmark
 } // namespace test
diff --git a/tests/benchmark/main.cpp b/tests/benchmark/main.cpp
index 7ce6a26acd..1b6bafb3a1 100644
--- a/tests/benchmark/main.cpp
+++ b/tests/benchmark/main.cpp
@@ -30,6 +30,7 @@
 #include "WallClockTimer.h"
 
 #include "benchmark/benchmark_api.h"
+#include "support/ToolchainSupport.h"
 
 #ifdef OPENCL
 #include "arm_compute/runtime/CL/CLScheduler.h"
@@ -78,11 +79,11 @@ int main(int argc, char **argv)
 
     if(user_config.seed.is_set())
     {
-        library = cpp14::make_unique<TensorLibrary>(user_config.path.get(), user_config.seed);
+        library = arm_compute::support::cpp14::make_unique<TensorLibrary>(user_config.path.get(), user_config.seed);
     }
     else
     {
-        library = cpp14::make_unique<TensorLibrary>(user_config.path.get());
+        library = arm_compute::support::cpp14::make_unique<TensorLibrary>(user_config.path.get());
     }
 
 #ifdef OPENCL