diff --git a/src/backends/gpuFsa/layers/GpuFsaConvolution2d.cpp b/src/backends/gpuFsa/layers/GpuFsaConvolution2d.cpp
index 2393174..90b0ddc 100644
--- a/src/backends/gpuFsa/layers/GpuFsaConvolution2d.cpp
+++ b/src/backends/gpuFsa/layers/GpuFsaConvolution2d.cpp
@@ -5,17 +5,17 @@
 
 #include "GpuFsaConvolution2d.hpp"
 
-#include <armnn/Types.hpp>
+//#include <armnn/Types.hpp>
 
 #include <aclCommon/ArmComputeTensorUtils.hpp>
 
-#include <arm_compute/core/ITensorInfo.h>
-#include <arm_compute/core/TensorInfo.h>
-#include <arm_compute/core/TensorShape.h>
-#include <arm_compute/core/CL/CLKernelLibrary.h>
-#include <arm_compute/core/CL/CLCompileContext.h>
+//#include <arm_compute/core/ITensorInfo.h>
+//#include <arm_compute/core/TensorInfo.h>
+//#include <arm_compute/core/TensorShape.h>
+//#include <arm_compute/core/CL/CLKernelLibrary.h>
+//#include <arm_compute/core/CL/CLCompileContext.h>
 
-#include <arm_compute/dynamic_fusion/runtime/gpu/cl/ClWorkloadRuntime.h>
+//#include <arm_compute/dynamic_fusion/runtime/gpu/cl/ClWorkloadRuntime.h>
 #include <arm_compute/dynamic_fusion/sketch/gpu/GpuWorkloadContext.h>
 #include <arm_compute/dynamic_fusion/sketch/gpu/operators/GpuConv2d.h>
 #include <arm_compute/dynamic_fusion/sketch/gpu/operators/GpuOutput.h>
diff --git a/src/backends/gpuFsa/layers/GpuFsaConvolution2d.hpp b/src/backends/gpuFsa/layers/GpuFsaConvolution2d.hpp
index 3346dc1..424ba41 100644
--- a/src/backends/gpuFsa/layers/GpuFsaConvolution2d.hpp
+++ b/src/backends/gpuFsa/layers/GpuFsaConvolution2d.hpp
@@ -5,10 +5,7 @@
 #pragma once
 
 #include <armnn/Descriptors.hpp>
-#include <armnn/Tensor.hpp>
 
-#include <arm_compute/core/Error.h>
-#include <arm_compute/dynamic_fusion/sketch/gpu/GpuWorkloadSketch.h>
 #include <gpuFsa/GpuFsaBackend.hpp>
 
 namespace armnn
diff --git a/src/backends/gpuFsa/layers/GpuFsaDepthwiseConvolution2d.cpp b/src/backends/gpuFsa/layers/GpuFsaDepthwiseConvolution2d.cpp
index dd55d4d..a3c3dd9 100644
--- a/src/backends/gpuFsa/layers/GpuFsaDepthwiseConvolution2d.cpp
+++ b/src/backends/gpuFsa/layers/GpuFsaDepthwiseConvolution2d.cpp
@@ -4,17 +4,9 @@
 //
 
 #include "GpuFsaDepthwiseConvolution2d.hpp"
-
-#include <armnn/Types.hpp>
-
 #include <backendsCommon/WorkloadUtils.hpp>
-#include <aclCommon/ArmComputeTensorUtils.hpp>
 
-#include <arm_compute/core/ITensorInfo.h>
-#include <arm_compute/core/TensorInfo.h>
-#include <arm_compute/core/TensorShape.h>
-#include <arm_compute/core/CL/CLKernelLibrary.h>
-#include <arm_compute/core/CL/CLCompileContext.h>
+#include <aclCommon/ArmComputeTensorUtils.hpp>
 
 #include <arm_compute/dynamic_fusion/runtime/gpu/cl/ClWorkloadRuntime.h>
 #include <arm_compute/dynamic_fusion/sketch/gpu/GpuWorkloadContext.h>
diff --git a/src/backends/gpuFsa/layers/GpuFsaDepthwiseConvolution2d.hpp b/src/backends/gpuFsa/layers/GpuFsaDepthwiseConvolution2d.hpp
index b705096..d3e562d 100644
--- a/src/backends/gpuFsa/layers/GpuFsaDepthwiseConvolution2d.hpp
+++ b/src/backends/gpuFsa/layers/GpuFsaDepthwiseConvolution2d.hpp
@@ -5,10 +5,7 @@
 #pragma once
 
 #include <armnn/Descriptors.hpp>
-#include <armnn/Tensor.hpp>
 
-#include <arm_compute/core/Error.h>
-#include <arm_compute/dynamic_fusion/sketch/gpu/GpuWorkloadSketch.h>
 #include <gpuFsa/GpuFsaBackend.hpp>
 
 namespace armnn
diff --git a/src/backends/gpuFsa/layers/GpuFsaElementwiseBinaryAdd.cpp b/src/backends/gpuFsa/layers/GpuFsaElementwiseBinaryAdd.cpp
index bc8b370..fa016a6 100644
--- a/src/backends/gpuFsa/layers/GpuFsaElementwiseBinaryAdd.cpp
+++ b/src/backends/gpuFsa/layers/GpuFsaElementwiseBinaryAdd.cpp
@@ -5,12 +5,8 @@
 
 #include "GpuFsaElementwiseBinaryAdd.hpp"
 
-#include <armnn/Types.hpp>
-
 #include <aclCommon/ArmComputeTensorUtils.hpp>
 
-#include <arm_compute/core/CL/CLKernelLibrary.h>
-
 #include <arm_compute/dynamic_fusion/sketch/gpu/operators/GpuAdd.h>
 #include <arm_compute/dynamic_fusion/sketch/gpu/operators/GpuOutput.h>
 #include <arm_compute/dynamic_fusion/sketch/gpu/GpuWorkloadContext.h>
diff --git a/src/backends/gpuFsa/layers/GpuFsaElementwiseBinaryAdd.hpp b/src/backends/gpuFsa/layers/GpuFsaElementwiseBinaryAdd.hpp
index 8221f0e..73f1fcb 100644
--- a/src/backends/gpuFsa/layers/GpuFsaElementwiseBinaryAdd.hpp
+++ b/src/backends/gpuFsa/layers/GpuFsaElementwiseBinaryAdd.hpp
@@ -5,10 +5,7 @@
 #pragma once
 
 #include <armnn/Descriptors.hpp>
-#include <armnn/Tensor.hpp>
 
-#include <arm_compute/core/Error.h>
-#include <arm_compute/dynamic_fusion/sketch/gpu/GpuWorkloadSketch.h>
 #include <gpuFsa/GpuFsaBackend.hpp>
 
 namespace armnn