12 files changed, 18 insertions, 18 deletions
diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp
index c0d2ab1c7f..07f9079b5d 100644
--- a/src/armnn/test/CreateWorkload.hpp
+++ b/src/armnn/test/CreateWorkload.hpp
@@ -8,9 +8,9 @@
 
 #include <boost/cast.hpp>
 
-#include <backends/WorkloadData.hpp>
-#include <backends/WorkloadFactory.hpp>
-#include <backends/CpuTensorHandle.hpp>
+#include <backendsCommon/WorkloadData.hpp>
+#include <backendsCommon/WorkloadFactory.hpp>
+#include <backendsCommon/CpuTensorHandle.hpp>
 
 #include <Graph.hpp>
 
@@ -54,7 +54,7 @@ void CreateTensorHandles(armnn::Graph& graph, armnn::IWorkloadFactory& factory)
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////
-// The following functions are called by backends/test/CreateWorkload*.cpp
+// The following functions are called by backendsCommon/test/CreateWorkload*.cpp
 // They build very simple graphs, and then create a workload.
 // Some checks are performed on the workload to ensure parameters have been passed correctly.
 // They return the created workloads so that backend-specific checks can be performed.
diff --git a/src/armnn/test/EndToEndTest.cpp b/src/armnn/test/EndToEndTest.cpp
index 4f202f174e..d25e197f63 100644
--- a/src/armnn/test/EndToEndTest.cpp
+++ b/src/armnn/test/EndToEndTest.cpp
@@ -7,7 +7,7 @@
 #include <armnn/IRuntime.hpp>
 #include <armnn/INetwork.hpp>
 
-#include <backends/test/QuantizeHelper.hpp>
+#include <backendsCommon/test/QuantizeHelper.hpp>
 
 #include <boost/core/ignore_unused.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/src/armnn/test/FloatingPointConverterTest.cpp b/src/armnn/test/FloatingPointConverterTest.cpp
index ec4288c438..9299b90e29 100644
--- a/src/armnn/test/FloatingPointConverterTest.cpp
+++ b/src/armnn/test/FloatingPointConverterTest.cpp
@@ -4,7 +4,7 @@
 //
 
 #include "FloatingPointConverter.hpp"
-#include <armnnUtils/Half.hpp>
+#include <Half.hpp>
 
 #include <malloc.h>
 #include <iostream>
diff --git a/src/armnn/test/GraphTests.cpp b/src/armnn/test/GraphTests.cpp
index e99cb153fc..0c0ba8b000 100644
--- a/src/armnn/test/GraphTests.cpp
+++ b/src/armnn/test/GraphTests.cpp
@@ -13,7 +13,7 @@
 #include <Graph.hpp>
 #include <Layer.hpp>
 
-#include <backends/CpuTensorHandle.hpp>
+#include <backendsCommon/CpuTensorHandle.hpp>
 
 
 /// Checks that first comes before second in the order.
diff --git a/src/armnn/test/GraphUtils.hpp b/src/armnn/test/GraphUtils.hpp
index 3325405eaf..04f9727dc0 100644
--- a/src/armnn/test/GraphUtils.hpp
+++ b/src/armnn/test/GraphUtils.hpp
@@ -4,7 +4,7 @@
 //
 #pragma once
 
-#include <armnn/Graph.hpp>
+#include <Graph.hpp>
 
 #include <string>
 
diff --git a/src/armnn/test/NetworkTests.cpp b/src/armnn/test/NetworkTests.cpp
index 91ff7fa983..0963df6222 100644
--- a/src/armnn/test/NetworkTests.cpp
+++ b/src/armnn/test/NetworkTests.cpp
@@ -6,7 +6,7 @@
 #include "GraphUtils.hpp"
 
 #include <armnn/ArmNN.hpp>
-#include <armnn/Network.hpp>
+#include <Network.hpp>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/src/armnn/test/OptimizerTests.cpp b/src/armnn/test/OptimizerTests.cpp
index 30df6eb0e6..8bd7d3dbee 100644
--- a/src/armnn/test/OptimizerTests.cpp
+++ b/src/armnn/test/OptimizerTests.cpp
@@ -7,7 +7,7 @@
 #include <armnn/ArmNN.hpp>
 #include <Graph.hpp>
 #include <Optimizer.hpp>
-#include <backends/CpuTensorHandle.hpp>
+#include <backendsCommon/CpuTensorHandle.hpp>
 #include <FloatingPointConverter.hpp>
 
 namespace
diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp
index 8a4e85ee23..08e3190414 100644
--- a/src/armnn/test/RuntimeTests.cpp
+++ b/src/armnn/test/RuntimeTests.cpp
@@ -6,11 +6,11 @@
 #include <armnn/Descriptors.hpp>
 #include <armnn/IRuntime.hpp>
 #include <armnn/INetwork.hpp>
-#include <armnn/Runtime.hpp>
+#include <Runtime.hpp>
 #include <armnn/TypesUtils.hpp>
 
-#include <armnnUtils/HeapProfiling.hpp>
-#include <armnnUtils/LeakChecking.hpp>
+#include <HeapProfiling.hpp>
+#include <LeakChecking.hpp>
 
 #ifdef WITH_VALGRIND
 #include <valgrind/memcheck.h>
diff --git a/src/armnn/test/RuntimeTests.hpp b/src/armnn/test/RuntimeTests.hpp
index ba2a37baea..588a760472 100644
--- a/src/armnn/test/RuntimeTests.hpp
+++ b/src/armnn/test/RuntimeTests.hpp
@@ -4,7 +4,7 @@
 //
 #pragma once
 
-#include <armnn/Runtime.hpp>
+#include <Runtime.hpp>
 
 namespace armnn
 {
diff --git a/src/armnn/test/SubGraphTests.cpp b/src/armnn/test/SubGraphTests.cpp
index 4f8b0a920c..e516ac0fa6 100644
--- a/src/armnn/test/SubGraphTests.cpp
+++ b/src/armnn/test/SubGraphTests.cpp
@@ -10,7 +10,7 @@
 #include <SubGraph.hpp>
 #include <SubGraphSelector.hpp>
 
-#include <backends/CpuTensorHandle.hpp>
+#include <backendsCommon/CpuTensorHandle.hpp>
 
 using namespace armnn;
 
diff --git a/src/armnn/test/TensorHelpers.hpp b/src/armnn/test/TensorHelpers.hpp
index f1ab6c99b5..4501c3532c 100644
--- a/src/armnn/test/TensorHelpers.hpp
+++ b/src/armnn/test/TensorHelpers.hpp
@@ -18,7 +18,7 @@
 
 #include <armnn/Tensor.hpp>
 
-#include <backends/test/QuantizeHelper.hpp>
+#include <backendsCommon/test/QuantizeHelper.hpp>
 
 #include <cmath>
 
diff --git a/src/armnn/test/UnitTests.hpp b/src/armnn/test/UnitTests.hpp
index e8c5908d72..40765e8e4f 100644
--- a/src/armnn/test/UnitTests.hpp
+++ b/src/armnn/test/UnitTests.hpp
@@ -6,8 +6,8 @@
 
 #include <Logging.hpp>
 #include <armnn/Utils.hpp>
-#include <backends/reference/RefWorkloadFactory.hpp>
-#include <backends/test/LayerTests.hpp>
+#include <reference/RefWorkloadFactory.hpp>
+#include <backendsCommon/test/LayerTests.hpp>
 #include "TensorHelpers.hpp"
 #include <boost/test/unit_test.hpp>