10 files changed, 48 insertions, 46 deletions
diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp
index 61f9f1cd83..c111fe6016 100644
--- a/src/armnn/test/CreateWorkload.hpp
+++ b/src/armnn/test/CreateWorkload.hpp
@@ -8,12 +8,13 @@
 
 #include <boost/cast.hpp>
 
-#include "backends/WorkloadData.hpp"
-#include "Graph.hpp"
+#include <backends/WorkloadData.hpp>
+#include <backends/CpuTensorHandle.hpp>
+
+#include <Graph.hpp>
 
 #include <utility>
 
-#include "backends/CpuTensorHandle.hpp"
 
 using namespace armnn;
 
diff --git a/src/armnn/test/CreateWorkloadClNeon.hpp b/src/armnn/test/CreateWorkloadClNeon.hpp
index 6d02c95740..a18e85d5f0 100644
--- a/src/armnn/test/CreateWorkloadClNeon.hpp
+++ b/src/armnn/test/CreateWorkloadClNeon.hpp
@@ -8,7 +8,7 @@
 #include <backends/reference/RefWorkloadFactory.hpp>
 
 #if ARMCOMPUTECL_ENABLED
-#include <backends/ClTensorHandle.hpp>
+#include <backends/cl/ClTensorHandle.hpp>
 #endif
 
 #if ARMCOMPUTENEON_ENABLED
diff --git a/src/armnn/test/EndToEndTest.cpp b/src/armnn/test/EndToEndTest.cpp
index 1d0886ed09..98b18411d4 100644
--- a/src/armnn/test/EndToEndTest.cpp
+++ b/src/armnn/test/EndToEndTest.cpp
@@ -4,11 +4,11 @@
 //
 #include <boost/test/unit_test.hpp>
 
-#include "armnn/Descriptors.hpp"
-#include "armnn/IRuntime.hpp"
-#include "armnn/INetwork.hpp"
+#include <armnn/Descriptors.hpp>
+#include <armnn/IRuntime.hpp>
+#include <armnn/INetwork.hpp>
 
-#include "backends/test/QuantizeHelper.hpp"
+#include <backends/test/QuantizeHelper.hpp>
 #include <boost/core/ignore_unused.hpp>
 
 #include <set>
diff --git a/src/armnn/test/FP16SupportTest.cpp b/src/armnn/test/FP16SupportTest.cpp
index 74ca372b0a..6baadc4c77 100644
--- a/src/armnn/test/FP16SupportTest.cpp
+++ b/src/armnn/test/FP16SupportTest.cpp
@@ -3,14 +3,14 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include "armnn/ArmNN.hpp"
-#include "armnn/Descriptors.hpp"
-#include "Graph.hpp"
-#include "armnn/IRuntime.hpp"
-#include "armnn/INetwork.hpp"
-#include "Optimizer.hpp"
-#include "backends/CpuTensorHandle.hpp"
-#include "backends/test/QuantizeHelper.hpp"
+#include <armnn/ArmNN.hpp>
+#include <armnn/Descriptors.hpp>
+#include <armnn/IRuntime.hpp>
+#include <armnn/INetwork.hpp>
+#include <Graph.hpp>
+#include <Optimizer.hpp>
+#include <backends/CpuTensorHandle.hpp>
+#include <backends/test/QuantizeHelper.hpp>
 
 #include <boost/core/ignore_unused.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/src/armnn/test/GraphTests.cpp b/src/armnn/test/GraphTests.cpp
index e38252917d..b297a74785 100644
--- a/src/armnn/test/GraphTests.cpp
+++ b/src/armnn/test/GraphTests.cpp
@@ -2,18 +2,19 @@
 // Copyright © 2017 Arm Ltd. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
+#include "GraphUtils.hpp"
+
 #include <boost/test/unit_test.hpp>
+#include <boost/cast.hpp>
 
-#include "armnn/ArmNN.hpp"
-#include "Graph.hpp"
-#include "Layer.hpp"
-#include "armnn/TypesUtils.hpp"
-#include "armnn/Exceptions.hpp"
+#include <armnn/ArmNN.hpp>
+#include <armnn/TypesUtils.hpp>
+#include <armnn/Exceptions.hpp>
+#include <Graph.hpp>
+#include <Layer.hpp>
 
-#include "GraphUtils.hpp"
-#include "backends/CpuTensorHandle.hpp"
+#include <backends/CpuTensorHandle.hpp>
 
-#include <boost/cast.hpp>
 
 /// Checks that first comes before second in the order.
 bool CheckOrder(const armnn::Graph& graph, const armnn::Layer* first, const armnn::Layer* second)
diff --git a/src/armnn/test/JsonPrinterTests.cpp b/src/armnn/test/JsonPrinterTests.cpp
index aae7dba0f5..9c24fdaa7b 100644
--- a/src/armnn/test/JsonPrinterTests.cpp
+++ b/src/armnn/test/JsonPrinterTests.cpp
@@ -10,12 +10,12 @@
 #include <vector>
 #include <sstream>
 
-#include "Profiling.hpp"
-#include "armnn/Descriptors.hpp"
-#include "armnn/IRuntime.hpp"
-#include "armnn/INetwork.hpp"
-#include "backends/test/ClContextControlFixture.hpp"
-#include "backends/ClWorkloadFactory.hpp"
+#include <Profiling.hpp>
+#include <armnn/Descriptors.hpp>
+#include <armnn/IRuntime.hpp>
+#include <armnn/INetwork.hpp>
+#include <backends/test/ClContextControlFixture.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
 
 BOOST_FIXTURE_TEST_SUITE(JsonPrinterTests, ClProfilingContextControlFixture)
 
diff --git a/src/armnn/test/NetworkTests.cpp b/src/armnn/test/NetworkTests.cpp
index 2f36f4da09..c342f22ced 100644
--- a/src/armnn/test/NetworkTests.cpp
+++ b/src/armnn/test/NetworkTests.cpp
@@ -9,7 +9,7 @@
 #include <Graph.hpp>
 #include <backends/reference/RefWorkloadFactory.hpp>
 #include <backends/neon/NeonWorkloadFactory.hpp>
-#include <backends/ClWorkloadFactory.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
 
 #include "GraphUtils.hpp"
 
diff --git a/src/armnn/test/OpenClTimerTest.cpp b/src/armnn/test/OpenClTimerTest.cpp
index 37cb085604..76cffec4f3 100644
--- a/src/armnn/test/OpenClTimerTest.cpp
+++ b/src/armnn/test/OpenClTimerTest.cpp
@@ -5,18 +5,18 @@
 
 #if (defined(__aarch64__)) || (defined(__x86_64__)) // disable test failing on FireFly/Armv7
 
-#include "arm_compute/runtime/CL/CLScheduler.h"
-#include "backends/ClContextControl.hpp"
-#include "backends/ClWorkloadFactory.hpp"
-#include "backends/CpuTensorHandle.hpp"
+#include <arm_compute/runtime/CL/CLScheduler.h>
+#include <backends/cl/ClContextControl.hpp>
+#include <backends/cl/ClWorkloadFactory.hpp>
+#include <backends/CpuTensorHandle.hpp>
 #include <boost/format.hpp>
 #include <iostream>
-#include "OpenClTimer.hpp"
-#include "backends/test/TensorCopyUtils.hpp"
+#include <OpenClTimer.hpp>
+#include <backends/test/TensorCopyUtils.hpp>
 #include "TensorHelpers.hpp"
 #include <boost/test/unit_test.hpp>
-#include "backends/WorkloadFactory.hpp"
-#include "backends/test/WorkloadTestUtils.hpp"
+#include <backends/WorkloadFactory.hpp>
+#include <backends/test/WorkloadTestUtils.hpp>
 
 using namespace armnn;
 
diff --git a/src/armnn/test/OptimizerTests.cpp b/src/armnn/test/OptimizerTests.cpp
index f8dff366da..9d351babd8 100644
--- a/src/armnn/test/OptimizerTests.cpp
+++ b/src/armnn/test/OptimizerTests.cpp
@@ -4,11 +4,11 @@
 //
 #include <boost/test/unit_test.hpp>
 
-#include "armnn/ArmNN.hpp"
-#include "Graph.hpp"
-#include "Optimizer.hpp"
-#include "backends/CpuTensorHandle.hpp"
-#include "FloatingPointConverter.hpp"
+#include <armnn/ArmNN.hpp>
+#include <Graph.hpp>
+#include <Optimizer.hpp>
+#include <backends/CpuTensorHandle.hpp>
+#include <FloatingPointConverter.hpp>
 
 namespace
 {
diff --git a/src/armnn/test/TensorHelpers.hpp b/src/armnn/test/TensorHelpers.hpp
index a4d3cf62c7..7f3ac9ec95 100644
--- a/src/armnn/test/TensorHelpers.hpp
+++ b/src/armnn/test/TensorHelpers.hpp
@@ -16,9 +16,9 @@
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
-#include "armnn/Tensor.hpp"
+#include <armnn/Tensor.hpp>
 
-#include "backends/test/QuantizeHelper.hpp"
+#include <backends/test/QuantizeHelper.hpp>
 
 #include <cmath>