Updates following execution of Includewhatyouuse on armnn/include.

This tool forces explicit includes of all dependencies and
highlights unused dependencies.

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

12 files changed, 80 insertions, 38 deletions

diff --git a/include/armnn/BackendHelper.hpp b/include/armnn/BackendHelper.hpp
index 2f8eabde6b..cf60b01ddd 100644
--- a/include/armnn/BackendHelper.hpp
+++ b/include/armnn/BackendHelper.hpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
@@ -7,11 +7,20 @@
 
 #include <armnn/BackendId.hpp>
 #include <armnn/BackendOptions.hpp>
-#include <armnn/backends/ILayerSupport.hpp>
-#include <armnn/Types.hpp>
+#include <armnn/Descriptors.hpp>
+#include <armnn/Optional.hpp>
+#include <functional>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace armnn
 {
+class ILayerSupport;
+class TensorInfo;
+struct LstmInputParamsInfo;
+struct QuantizedLstmInputParamsInfo;
 
 // This handle calls its own IsXXXLayerSupported() functions which then call the polymorphic
 // ILayerSupport::IsXXXLayerSupported() at the framework level so there is no risk of VTable misalignment.
diff --git a/include/armnn/BackendRegistry.hpp b/include/armnn/BackendRegistry.hpp
index 40a117ea48..ea23091ad3 100644
--- a/include/armnn/BackendRegistry.hpp
+++ b/include/armnn/BackendRegistry.hpp
@@ -1,19 +1,16 @@
 //
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 #pragma once
 
-#include <armnn/Types.hpp>
 #include <armnn/BackendId.hpp>
 #include <armnn/Optional.hpp>
-#include <armnn/backends/ICustomAllocator.hpp>
-#include <armnn/backends/IMemoryOptimizerStrategy.hpp>
-
-#include <algorithm>
 #include <memory>
 #include <unordered_map>
 #include <functional>
+#include <stddef.h>
+#include <string>
 
 namespace arm
 {
@@ -29,6 +26,9 @@ namespace armnn
 {
 
 class IBackendInternal;
+class ICustomAllocator;
+class IMemoryOptimizerStrategy;
+
 using IBackendInternalUniquePtr = std::unique_ptr<IBackendInternal>;
 using MemoryOptimizerStrategiesMapRef = std::unordered_map<BackendId, std::shared_ptr<IMemoryOptimizerStrategy>>;
 
diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp
index 1cc403cf99..7c6942ce58 100644
--- a/include/armnn/Descriptors.hpp
+++ b/include/armnn/Descriptors.hpp
@@ -5,15 +5,15 @@
 #pragma once
 
 #include "Deprecated.hpp"
-#include "DescriptorsFwd.hpp"
-
-#include <cstdint>
-#include <initializer_list>
-#include <iostream>
-#include <sstream>
-
+#include "DescriptorsFwd.hpp" // Required for class equivalence declarations.
 #include "Tensor.hpp"
 #include "Types.hpp"
+#include <armnn/Exceptions.hpp>
+
+#include <cstdint>
+#include <iterator>
+#include <utility>
+#include <vector>
 
 namespace armnn
 {
diff --git a/include/armnn/Logging.hpp b/include/armnn/Logging.hpp
index 6336e96d8c..ca52b5c98f 100644
--- a/include/armnn/Logging.hpp
+++ b/include/armnn/Logging.hpp
@@ -1,13 +1,20 @@
 //
-// Copyright © 2019 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2019,2022 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
 #pragma once
 
 #include <armnn/Utils.hpp>
+#include <ctype.h>
 #include <iostream>
 #include <algorithm>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <armnn/Exceptions.hpp>
 
 namespace armnn
 {
diff --git a/include/armnn/Tensor.hpp b/include/armnn/Tensor.hpp
index 8dbc9127b2..46859c4887 100644
--- a/include/armnn/Tensor.hpp
+++ b/include/armnn/Tensor.hpp
@@ -1,18 +1,18 @@
 //
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 #pragma once
 
-#include "TensorFwd.hpp"
-
 #include "Exceptions.hpp"
 #include "Optional.hpp"
 #include "Types.hpp"
 
+#include <stdint.h>
 #include <array>
 #include <initializer_list>
 #include <vector>
+#include <utility>
 
 namespace armnn
 {
diff --git a/include/armnn/Threadpool.hpp b/include/armnn/Threadpool.hpp
index 672f8b8de6..98a907dd15 100644
--- a/include/armnn/Threadpool.hpp
+++ b/include/armnn/Threadpool.hpp
@@ -1,27 +1,32 @@
 //
-// Copyright © 2021 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2021-2022 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 #if !defined(ARMNN_DISABLE_THREADS)
 
 #pragma once
 
+#include "IRuntime.hpp"
 #include <armnn/Tensor.hpp>
 #include <armnn/Types.hpp>
-
-#include "INetwork.hpp"
-#include "IRuntime.hpp"
-
+#include <stdint.h>
 #include <thread>
 #include <mutex>
 #include <condition_variable>
 #include <unordered_map>
 #include <queue>
+#include <iosfwd>
+#include <memory>
+#include <tuple>
+#include <vector>
 
 namespace armnn
 {
 namespace experimental
 {
+class IAsyncExecutionCallback;
+class IWorkingMemHandle;
+
 class Threadpool
 {
 public:
diff --git a/include/armnn/TypesUtils.hpp b/include/armnn/TypesUtils.hpp
index ca7e7c58ac..4dd5360591 100644
--- a/include/armnn/TypesUtils.hpp
+++ b/include/armnn/TypesUtils.hpp
@@ -1,15 +1,19 @@
 //
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 #pragma once
 
+#include <armnn/BackendId.hpp>
+#include <armnn/Exceptions.hpp>
 #include <armnn/Tensor.hpp>
 #include <armnn/Types.hpp>
 
+#include <stdint.h>
 #include <cmath>
 #include <ostream>
 #include <set>
+#include <type_traits>
 
 namespace armnn
 {
diff --git a/include/armnn/Utils.hpp b/include/armnn/Utils.hpp
index 7d442ba4b5..7c1f096823 100644
--- a/include/armnn/Utils.hpp
+++ b/include/armnn/Utils.hpp
@@ -1,12 +1,10 @@
 //
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 #pragma once
 
-#include <armnn/TypesUtils.hpp>
-
-#include <iostream>
+#include <string>
 
 namespace armnn
 {
diff --git a/include/armnn/backends/DynamicBackend.hpp b/include/armnn/backends/DynamicBackend.hpp
index f888b1e27e..fd121bfaab 100644
--- a/include/armnn/backends/DynamicBackend.hpp
+++ b/include/armnn/backends/DynamicBackend.hpp
@@ -1,16 +1,18 @@
 //
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
 #pragma once
 
 #include "IBackendInternal.hpp"
-
 #include <armnn/BackendRegistry.hpp>
+#include <armnn/BackendId.hpp>
 
+#include <stdint.h>
 #include <functional>
 #include <memory>
+#include <string>
 
 namespace armnn
 {
diff --git a/include/armnn/backends/ITensorHandleFactory.hpp b/include/armnn/backends/ITensorHandleFactory.hpp
index 501d97b852..b10ff66783 100644
--- a/include/armnn/backends/ITensorHandleFactory.hpp
+++ b/include/armnn/backends/ITensorHandleFactory.hpp
@@ -1,19 +1,23 @@
 //
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
 #pragma once
 
 #include "ITensorHandle.hpp"
-
-#include <armnn/IRuntime.hpp>
 #include <armnn/MemorySources.hpp>
+#include <armnn/Tensor.hpp>
 #include <armnn/Types.hpp>
 #include <armnn/utility/IgnoreUnused.hpp>
 
+#include <memory>
+#include <string>
+#include <vector>
+
 namespace armnn
 {
+class IConnectableLayer;
 
 /// Capability class to calculate in the GetCapabilities function
 /// so that only the capability in the scope can be choose to calculate
diff --git a/include/armnn/backends/OptimizationViews.hpp b/include/armnn/backends/OptimizationViews.hpp
index 110c5f7492..0357adaa27 100644
--- a/include/armnn/backends/OptimizationViews.hpp
+++ b/include/armnn/backends/OptimizationViews.hpp
@@ -5,7 +5,12 @@
 
 #pragma once
 
+#include <armnn/BackendOptions.hpp>
+#include <armnn/Deprecated.hpp>
+#include <armnn/INetwork.hpp>
 #include <armnn/backends/SubgraphView.hpp>
+#include <vector>
+#include "Graph.hpp"
 
 namespace armnn
 {
diff --git a/include/armnn/backends/SubgraphView.hpp b/include/armnn/backends/SubgraphView.hpp
index 63a9f57cc7..777311747a 100644
--- a/include/armnn/backends/SubgraphView.hpp
+++ b/include/armnn/backends/SubgraphView.hpp
@@ -1,18 +1,26 @@
 //
-// Copyright © 2017 Arm Ltd. All rights reserved.
+// Copyright © 2017,2022 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
 #pragma once
 
-#include <Layer.hpp>
-#include <Graph.hpp>
+#include <armnn/Deprecated.hpp>
 
 #include <vector>
 #include <list>
+#include <iterator>
+#include <memory>
 
 namespace armnn
 {
+class Graph;
+class IConnectableLayer;
+class IInputSlot;
+class IOutputSlot;
+class InputSlot;
+class Layer;
+class OutputSlot;
 
 ///
 /// The SubgraphView class represents a subgraph of a Graph.