#include <armnn/ArmNN.hpp>
#include <armnn/Tensor.hpp>
-#include <test/TensorHelpers.hpp>
-
-#include <backends/CpuTensorHandle.hpp>
-#include <backends/WorkloadFactory.hpp>
+#include <backendsCommon/CpuTensorHandle.hpp>
+#include <backendsCommon/WorkloadFactory.hpp>
+#include <backendsCommon/test/QuantizeHelper.hpp>
-#include <backends/test/QuantizeHelper.hpp>
+#include <test/TensorHelpers.hpp>
template<typename T>
LayerTestResult<T, 4> BatchNormTestImpl(armnn::IWorkloadFactory& workloadFactory,