4 files changed, 27 insertions, 8 deletions
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.