Removing unnecessary schema dependency from delegate unit tests.

* All of the unit tests were including the TfL schema even though it
is not used. This prevented building with delegate and not TfL parser.
* Fixing some template compile errors that were introduced when
FileComparisonExecutorTests.cpp was compiled without TfL parser.

Signed-off-by: Colm Donelan <colm.donelan@arm.com>
Change-Id: I86742d57a6520ab6bd8336a683fee29de326fff5

78 files changed, 8 insertions, 117 deletions

diff --git a/delegate/test/ActivationTest.cpp b/delegate/test/ActivationTest.cpp
index 70321cd7e5..5eafa49948 100644
--- a/delegate/test/ActivationTest.cpp
+++ b/delegate/test/ActivationTest.cpp
@@ -9,7 +9,6 @@
 
 #include <flatbuffers/flatbuffers.h>
 #include <tensorflow/lite/interpreter.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/ActivationTestHelper.hpp b/delegate/test/ActivationTestHelper.hpp
index 7beb53ba3d..2bd118f448 100644
--- a/delegate/test/ActivationTestHelper.hpp
+++ b/delegate/test/ActivationTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/ArgMinMaxTest.cpp b/delegate/test/ArgMinMaxTest.cpp
index 1c0550313f..2f08c9469c 100644
--- a/delegate/test/ArgMinMaxTest.cpp
+++ b/delegate/test/ArgMinMaxTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/ArgMinMaxTestHelper.hpp b/delegate/test/ArgMinMaxTestHelper.hpp
index fd230fff94..1086a5e6d3 100644
--- a/delegate/test/ArgMinMaxTestHelper.hpp
+++ b/delegate/test/ArgMinMaxTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/BatchMatMulTest.cpp b/delegate/test/BatchMatMulTest.cpp
index fcf1ec2b7c..d38e934b82 100644
--- a/delegate/test/BatchMatMulTest.cpp
+++ b/delegate/test/BatchMatMulTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/BatchMatMulTestHelper.hpp b/delegate/test/BatchMatMulTestHelper.hpp
index d45f438f5c..86f1c534c9 100644
--- a/delegate/test/BatchMatMulTestHelper.hpp
+++ b/delegate/test/BatchMatMulTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/BatchSpaceTest.cpp b/delegate/test/BatchSpaceTest.cpp
index f4c041dffa..dd6047a61e 100644
--- a/delegate/test/BatchSpaceTest.cpp
+++ b/delegate/test/BatchSpaceTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/BatchSpaceTestHelper.hpp b/delegate/test/BatchSpaceTestHelper.hpp
index ba6afb1382..8f3d76ac58 100644
--- a/delegate/test/BatchSpaceTestHelper.hpp
+++ b/delegate/test/BatchSpaceTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/BroadcastToTest.cpp b/delegate/test/BroadcastToTest.cpp
index f4692cfb07..30909b8cef 100644
--- a/delegate/test/BroadcastToTest.cpp
+++ b/delegate/test/BroadcastToTest.cpp
@@ -10,7 +10,6 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
 #include <tensorflow/lite/version.h>
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/BroadcastToTestHelper.hpp b/delegate/test/BroadcastToTestHelper.hpp
index 630fe3aaf1..6d05863b0c 100644
--- a/delegate/test/BroadcastToTestHelper.hpp
+++ b/delegate/test/BroadcastToTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/CastTest.cpp b/delegate/test/CastTest.cpp
index d3c3e294f2..e02bf2ad68 100644
--- a/delegate/test/CastTest.cpp
+++ b/delegate/test/CastTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/CastTestHelper.hpp b/delegate/test/CastTestHelper.hpp
index ac8f033bb8..c169be988c 100644
--- a/delegate/test/CastTestHelper.hpp
+++ b/delegate/test/CastTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/ComparisonTest.cpp b/delegate/test/ComparisonTest.cpp
index b044c27693..8374025cf0 100644
--- a/delegate/test/ComparisonTest.cpp
+++ b/delegate/test/ComparisonTest.cpp
@@ -11,7 +11,6 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
 #include <tensorflow/lite/version.h>
 
 #include <doctest/doctest.h>
diff --git a/delegate/test/ComparisonTestHelper.hpp b/delegate/test/ComparisonTestHelper.hpp
index a1114cb938..dc471d8f02 100644
--- a/delegate/test/ComparisonTestHelper.hpp
+++ b/delegate/test/ComparisonTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/ControlTest.cpp b/delegate/test/ControlTest.cpp
index ec7ff88e42..e567d67f1a 100644
--- a/delegate/test/ControlTest.cpp
+++ b/delegate/test/ControlTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/ControlTestHelper.hpp b/delegate/test/ControlTestHelper.hpp
index 9e082a78af..0b76ebe0c7 100644
--- a/delegate/test/ControlTestHelper.hpp
+++ b/delegate/test/ControlTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/Convolution2dTest.cpp b/delegate/test/Convolution2dTest.cpp
index 4b54a14058..0e11445b8e 100644
--- a/delegate/test/Convolution2dTest.cpp
+++ b/delegate/test/Convolution2dTest.cpp
@@ -11,7 +11,6 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
 #include <tensorflow/lite/version.h>
 
 #include <doctest/doctest.h>
diff --git a/delegate/test/Convolution3dTest.cpp b/delegate/test/Convolution3dTest.cpp
index fe987be5da..e1a0a94507 100644
--- a/delegate/test/Convolution3dTest.cpp
+++ b/delegate/test/Convolution3dTest.cpp
@@ -11,7 +11,6 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/ConvolutionTestHelper.hpp b/delegate/test/ConvolutionTestHelper.hpp
index 6a3400e9cb..bb8852eaa5 100644
--- a/delegate/test/ConvolutionTestHelper.hpp
+++ b/delegate/test/ConvolutionTestHelper.hpp
@@ -14,7 +14,6 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
 #include <tensorflow/lite/version.h>
 
 #include <doctest/doctest.h>
diff --git a/delegate/test/DelegateOptionsTestHelper.hpp b/delegate/test/DelegateOptionsTestHelper.hpp
index 148a6d2c22..76d127237c 100644
--- a/delegate/test/DelegateOptionsTestHelper.hpp
+++ b/delegate/test/DelegateOptionsTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/DepthwiseConvolution2dTest.cpp b/delegate/test/DepthwiseConvolution2dTest.cpp
index 5fdbfc4801..755c6ec089 100644
--- a/delegate/test/DepthwiseConvolution2dTest.cpp
+++ b/delegate/test/DepthwiseConvolution2dTest.cpp
@@ -11,7 +11,6 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
 #include <tensorflow/lite/version.h>
 
 #include <doctest/doctest.h>
diff --git a/delegate/test/ElementwiseBinaryTest.cpp b/delegate/test/ElementwiseBinaryTest.cpp
index 2f22e7d1b1..a36708d42e 100644
--- a/delegate/test/ElementwiseBinaryTest.cpp
+++ b/delegate/test/ElementwiseBinaryTest.cpp
@@ -11,7 +11,7 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
+
 #include <tensorflow/lite/version.h>
 
 #include <doctest/doctest.h>
diff --git a/delegate/test/ElementwiseBinaryTestHelper.hpp b/delegate/test/ElementwiseBinaryTestHelper.hpp
index fc7549161c..e2887a2054 100644
--- a/delegate/test/ElementwiseBinaryTestHelper.hpp
+++ b/delegate/test/ElementwiseBinaryTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/ElementwiseUnaryTest.cpp b/delegate/test/ElementwiseUnaryTest.cpp
index b4bdd295e1..14a6061191 100644
--- a/delegate/test/ElementwiseUnaryTest.cpp
+++ b/delegate/test/ElementwiseUnaryTest.cpp
@@ -11,7 +11,6 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
 #include <tensorflow/lite/version.h>
 
 #include <doctest/doctest.h>
diff --git a/delegate/test/ElementwiseUnaryTestHelper.hpp b/delegate/test/ElementwiseUnaryTestHelper.hpp
index 7f8879b50d..7ef11f42d2 100644
--- a/delegate/test/ElementwiseUnaryTestHelper.hpp
+++ b/delegate/test/ElementwiseUnaryTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/FillTest.cpp b/delegate/test/FillTest.cpp
index a12715ccc1..e9def8de41 100644
--- a/delegate/test/FillTest.cpp
+++ b/delegate/test/FillTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/FillTestHelper.hpp b/delegate/test/FillTestHelper.hpp
index 70162c4a1d..100aee7cba 100644
--- a/delegate/test/FillTestHelper.hpp
+++ b/delegate/test/FillTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/FullyConnectedTestHelper.hpp b/delegate/test/FullyConnectedTestHelper.hpp
index e9e5c092d6..20c1102bd9 100644
--- a/delegate/test/FullyConnectedTestHelper.hpp
+++ b/delegate/test/FullyConnectedTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/GatherNdTest.cpp b/delegate/test/GatherNdTest.cpp
index 066248f22a..26dc332239 100644
--- a/delegate/test/GatherNdTest.cpp
+++ b/delegate/test/GatherNdTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/GatherNdTestHelper.hpp b/delegate/test/GatherNdTestHelper.hpp
index 604b2159fd..c8e9a72b97 100644
--- a/delegate/test/GatherNdTestHelper.hpp
+++ b/delegate/test/GatherNdTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/GatherTest.cpp b/delegate/test/GatherTest.cpp
index e4012b49ee..c49c10d054 100644
--- a/delegate/test/GatherTest.cpp
+++ b/delegate/test/GatherTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/GatherTestHelper.hpp b/delegate/test/GatherTestHelper.hpp
index 43717a3b2f..5d24cdabce 100644
--- a/delegate/test/GatherTestHelper.hpp
+++ b/delegate/test/GatherTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/LogicalTest.cpp b/delegate/test/LogicalTest.cpp
index 8414293547..82927275f4 100644
--- a/delegate/test/LogicalTest.cpp
+++ b/delegate/test/LogicalTest.cpp
@@ -9,7 +9,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/LogicalTestHelper.hpp b/delegate/test/LogicalTestHelper.hpp
index 7da8ad9bfc..9732917824 100644
--- a/delegate/test/LogicalTestHelper.hpp
+++ b/delegate/test/LogicalTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/LstmTest.cpp b/delegate/test/LstmTest.cpp
index 1034a012e2..87b87bead6 100644
--- a/delegate/test/LstmTest.cpp
+++ b/delegate/test/LstmTest.cpp
@@ -8,7 +8,7 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
+
 #include <doctest/doctest.h>
 
 namespace armnnDelegate
diff --git a/delegate/test/LstmTestHelper.hpp b/delegate/test/LstmTestHelper.hpp
index 4ff517509d..ce1efe0b47 100644
--- a/delegate/test/LstmTestHelper.hpp
+++ b/delegate/test/LstmTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/MirrorPadTest.cpp b/delegate/test/MirrorPadTest.cpp
index 14c4755d0b..5b459861c6 100644
--- a/delegate/test/MirrorPadTest.cpp
+++ b/delegate/test/MirrorPadTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/NeonDelegateTests_NDK_Issue.cpp b/delegate/test/NeonDelegateTests_NDK_Issue.cpp
index 5dad598e63..b2651c4249 100644
--- a/delegate/test/NeonDelegateTests_NDK_Issue.cpp
+++ b/delegate/test/NeonDelegateTests_NDK_Issue.cpp
@@ -9,7 +9,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/NormalizationTestHelper.hpp b/delegate/test/NormalizationTestHelper.hpp
index a9db6b8fbf..d7930d91b9 100644
--- a/delegate/test/NormalizationTestHelper.hpp
+++ b/delegate/test/NormalizationTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/PackTest.cpp b/delegate/test/PackTest.cpp
index 1e7eb696c1..51f545ce5e 100644
--- a/delegate/test/PackTest.cpp
+++ b/delegate/test/PackTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/PackTestHelper.hpp b/delegate/test/PackTestHelper.hpp
index 112eccb5be..1d032a3c49 100644
--- a/delegate/test/PackTestHelper.hpp
+++ b/delegate/test/PackTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/PadTest.cpp b/delegate/test/PadTest.cpp
index be54ede7a3..17fabe65e8 100644
--- a/delegate/test/PadTest.cpp
+++ b/delegate/test/PadTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/PadTestHelper.hpp b/delegate/test/PadTestHelper.hpp
index c4bfd89458..fefcec60a7 100644
--- a/delegate/test/PadTestHelper.hpp
+++ b/delegate/test/PadTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/Pooling2dTest.cpp b/delegate/test/Pooling2dTest.cpp
index ea87a29793..c202a956e4 100644
--- a/delegate/test/Pooling2dTest.cpp
+++ b/delegate/test/Pooling2dTest.cpp
@@ -11,7 +11,7 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
+
 #include <tensorflow/lite/version.h>
 
 #include <doctest/doctest.h>
diff --git a/delegate/test/Pooling2dTestHelper.hpp b/delegate/test/Pooling2dTestHelper.hpp
index d08a45b588..3059f3b7a2 100644
--- a/delegate/test/Pooling2dTestHelper.hpp
+++ b/delegate/test/Pooling2dTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/Pooling3dTest.cpp b/delegate/test/Pooling3dTest.cpp
index 85202e1165..a79ee33b0a 100644
--- a/delegate/test/Pooling3dTest.cpp
+++ b/delegate/test/Pooling3dTest.cpp
@@ -11,7 +11,7 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
+
 #include <tensorflow/lite/version.h>
 
 #include <doctest/doctest.h>
diff --git a/delegate/test/Pooling3dTestHelper.hpp b/delegate/test/Pooling3dTestHelper.hpp
index 59d2e18228..a23413e2fe 100644
--- a/delegate/test/Pooling3dTestHelper.hpp
+++ b/delegate/test/Pooling3dTestHelper.hpp
@@ -16,8 +16,6 @@
 #include <tensorflow/lite/kernels/custom_ops_register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/PreluTest.cpp b/delegate/test/PreluTest.cpp
index f65e15bb97..3240eafe2b 100644
--- a/delegate/test/PreluTest.cpp
+++ b/delegate/test/PreluTest.cpp
@@ -11,7 +11,7 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
+
 #include <tensorflow/lite/version.h>
 
 #include <doctest/doctest.h>
diff --git a/delegate/test/PreluTestHelper.hpp b/delegate/test/PreluTestHelper.hpp
index c2a9435d0c..fa6122fa1f 100644
--- a/delegate/test/PreluTestHelper.hpp
+++ b/delegate/test/PreluTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/QuantizationTest.cpp b/delegate/test/QuantizationTest.cpp
index 0210602eb8..8f9fbff019 100644
--- a/delegate/test/QuantizationTest.cpp
+++ b/delegate/test/QuantizationTest.cpp
@@ -8,7 +8,7 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
+
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/QuantizationTestHelper.hpp b/delegate/test/QuantizationTestHelper.hpp
index 8554a01967..94290288b2 100644
--- a/delegate/test/QuantizationTestHelper.hpp
+++ b/delegate/test/QuantizationTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/RedefineTestHelper.hpp b/delegate/test/RedefineTestHelper.hpp
index af9b446ae5..c1838e01b1 100644
--- a/delegate/test/RedefineTestHelper.hpp
+++ b/delegate/test/RedefineTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/ReduceTest.cpp b/delegate/test/ReduceTest.cpp
index 5c031d9312..f8606a8189 100644
--- a/delegate/test/ReduceTest.cpp
+++ b/delegate/test/ReduceTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/ReduceTestHelper.hpp b/delegate/test/ReduceTestHelper.hpp
index adbbfc3a81..f6acdbc84f 100644
--- a/delegate/test/ReduceTestHelper.hpp
+++ b/delegate/test/ReduceTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/ReshapeTest.cpp b/delegate/test/ReshapeTest.cpp
index c3df8b21d8..9a34173e3c 100644
--- a/delegate/test/ReshapeTest.cpp
+++ b/delegate/test/ReshapeTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/ResizeTest.cpp b/delegate/test/ResizeTest.cpp
index f3bfe43143..95f4d93e59 100644
--- a/delegate/test/ResizeTest.cpp
+++ b/delegate/test/ResizeTest.cpp
@@ -11,7 +11,7 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
+
 #include <tensorflow/lite/version.h>
 
 #include <doctest/doctest.h>
diff --git a/delegate/test/ResizeTestHelper.hpp b/delegate/test/ResizeTestHelper.hpp
index ff0c413fbf..5421082a39 100644
--- a/delegate/test/ResizeTestHelper.hpp
+++ b/delegate/test/ResizeTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/ReverseV2Test.cpp b/delegate/test/ReverseV2Test.cpp
index 430cf2c7c7..e842217d2a 100644
--- a/delegate/test/ReverseV2Test.cpp
+++ b/delegate/test/ReverseV2Test.cpp
@@ -11,7 +11,7 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
+
 #include <tensorflow/lite/version.h>
 
 #include <doctest/doctest.h>
diff --git a/delegate/test/ReverseV2TestHelper.hpp b/delegate/test/ReverseV2TestHelper.hpp
index 8c4acd1a7e..82f0bd700c 100644
--- a/delegate/test/ReverseV2TestHelper.hpp
+++ b/delegate/test/ReverseV2TestHelper.hpp
@@ -14,9 +14,7 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
 
-#include <doctest/doctest.h>
 
 namespace
 {
diff --git a/delegate/test/RoundTest.cpp b/delegate/test/RoundTest.cpp
index b4f0446792..4aac1a77b3 100644
--- a/delegate/test/RoundTest.cpp
+++ b/delegate/test/RoundTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/RoundTestHelper.hpp b/delegate/test/RoundTestHelper.hpp
index 3aa066b8f6..b7bd32fbc4 100644
--- a/delegate/test/RoundTestHelper.hpp
+++ b/delegate/test/RoundTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/ShapeTestHelper.hpp b/delegate/test/ShapeTestHelper.hpp
index 42f258b00b..1d1da2fa51 100644
--- a/delegate/test/ShapeTestHelper.hpp
+++ b/delegate/test/ShapeTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/SliceTestHelper.hpp b/delegate/test/SliceTestHelper.hpp
index 19f2b3d8ea..2e84d8de9f 100644
--- a/delegate/test/SliceTestHelper.hpp
+++ b/delegate/test/SliceTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/SoftmaxTest.cpp b/delegate/test/SoftmaxTest.cpp
index 27f780948d..35840533f9 100644
--- a/delegate/test/SoftmaxTest.cpp
+++ b/delegate/test/SoftmaxTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/SoftmaxTestHelper.hpp b/delegate/test/SoftmaxTestHelper.hpp
index ffd02abdf7..609882d90c 100644
--- a/delegate/test/SoftmaxTestHelper.hpp
+++ b/delegate/test/SoftmaxTestHelper.hpp
@@ -15,8 +15,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/SpaceDepthTest.cpp b/delegate/test/SpaceDepthTest.cpp
index 8a8bbaeccb..6cffba33eb 100644
--- a/delegate/test/SpaceDepthTest.cpp
+++ b/delegate/test/SpaceDepthTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/SpaceDepthTestHelper.hpp b/delegate/test/SpaceDepthTestHelper.hpp
index 912472d6c7..6d566a61b4 100644
--- a/delegate/test/SpaceDepthTestHelper.hpp
+++ b/delegate/test/SpaceDepthTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/SplitTest.cpp b/delegate/test/SplitTest.cpp
index b54ce217b5..1d14b6d9f3 100644
--- a/delegate/test/SplitTest.cpp
+++ b/delegate/test/SplitTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/SplitTestHelper.hpp b/delegate/test/SplitTestHelper.hpp
index 1d5f459148..54c859c764 100644
--- a/delegate/test/SplitTestHelper.hpp
+++ b/delegate/test/SplitTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/StridedSliceTestHelper.hpp b/delegate/test/StridedSliceTestHelper.hpp
index d3d160158b..0ae6384dab 100644
--- a/delegate/test/StridedSliceTestHelper.hpp
+++ b/delegate/test/StridedSliceTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/TileTest.cpp b/delegate/test/TileTest.cpp
index 32f5610bce..ef803964fd 100644
--- a/delegate/test/TileTest.cpp
+++ b/delegate/test/TileTest.cpp
@@ -10,7 +10,6 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
 #include <tensorflow/lite/version.h>
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/TileTestHelper.hpp b/delegate/test/TileTestHelper.hpp
index f376612f36..0bdee9d7d4 100644
--- a/delegate/test/TileTestHelper.hpp
+++ b/delegate/test/TileTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/TransposeConvolution2dTest.cpp b/delegate/test/TransposeConvolution2dTest.cpp
index 4630a9004f..b5261921f9 100644
--- a/delegate/test/TransposeConvolution2dTest.cpp
+++ b/delegate/test/TransposeConvolution2dTest.cpp
@@ -11,7 +11,6 @@
 #include <tensorflow/lite/interpreter.h>
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/model.h>
-#include <schema_generated.h>
 #include <tensorflow/lite/version.h>
 
 #include <doctest/doctest.h>
diff --git a/delegate/test/TransposeTestHelper.hpp b/delegate/test/TransposeTestHelper.hpp
index 57f4e291bf..d72bb7662e 100644
--- a/delegate/test/TransposeTestHelper.hpp
+++ b/delegate/test/TransposeTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace
diff --git a/delegate/test/UnidirectionalSequenceLstmTest.cpp b/delegate/test/UnidirectionalSequenceLstmTest.cpp
index 7fd43fc0d6..d4716e665f 100644
--- a/delegate/test/UnidirectionalSequenceLstmTest.cpp
+++ b/delegate/test/UnidirectionalSequenceLstmTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 #include <doctest/doctest.h>
 
 namespace armnnDelegate
diff --git a/delegate/test/UnidirectionalSequenceLstmTestHelper.hpp b/delegate/test/UnidirectionalSequenceLstmTestHelper.hpp
index c058d83bc6..c27f8d854b 100644
--- a/delegate/test/UnidirectionalSequenceLstmTestHelper.hpp
+++ b/delegate/test/UnidirectionalSequenceLstmTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 #include <armnn/utility/IgnoreUnused.hpp>
diff --git a/delegate/test/UnpackTest.cpp b/delegate/test/UnpackTest.cpp
index 7c4b12a6b8..4caba84494 100644
--- a/delegate/test/UnpackTest.cpp
+++ b/delegate/test/UnpackTest.cpp
@@ -8,7 +8,6 @@
 #include <armnn_delegate.hpp>
 
 #include <flatbuffers/flatbuffers.h>
-#include <schema_generated.h>
 
 #include <doctest/doctest.h>
 
diff --git a/delegate/test/UnpackTestHelper.hpp b/delegate/test/UnpackTestHelper.hpp
index 2d6565f883..1b1ab496a1 100644
--- a/delegate/test/UnpackTestHelper.hpp
+++ b/delegate/test/UnpackTestHelper.hpp
@@ -14,8 +14,6 @@
 #include <tensorflow/lite/kernels/register.h>
 #include <tensorflow/lite/version.h>
 
-#include <schema_generated.h>
-
 #include <doctest/doctest.h>
 
 namespace