Cleanup: remove unused includes in Compositor

And move unneeded includes in frequently used headers
to source files.

Slightly reduces compile time.

source/blender/compositor/COM_defines.h

@@ -19,8 +19,8 @@
 #pragma once
 
 #include "BLI_float2.hh"
-#include "BLI_index_range.hh"
+
-#include "BLI_rect.h"
+#include "DNA_vec_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/intern/COM_BufferRange.h

@@ -19,7 +19,6 @@
 #pragma once
 
 #include "BLI_assert.h"
-#include "BLI_rect.h"
 
 #include <iterator>
 

source/blender/compositor/intern/COM_CPUDevice.cc

@@ -19,8 +19,7 @@
 #include "COM_CPUDevice.h"
 
 #include "COM_ExecutionGroup.h"
-
+#include "COM_NodeOperation.h"
-#include "BLI_rect.h"
 
 namespace blender::compositor {
 

source/blender/compositor/intern/COM_ChunkOrder.cc

@@ -16,9 +16,9 @@
  * Copyright 2011, Blender Foundation.
  */
 
-#include "COM_ChunkOrder.h"
+#include <cfloat>
 
-#include "BLI_math.h"
+#include "COM_ChunkOrder.h"
 
 namespace blender::compositor {
 

source/blender/compositor/intern/COM_CompositorContext.cc

@@ -17,11 +17,6 @@
  */
 
 #include "COM_CompositorContext.h"
-#include "COM_defines.h"
-#include <cstdio>
-
-#include "BLI_assert.h"
-#include "DNA_userdef_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/intern/COM_CompositorContext.h

@@ -18,16 +18,13 @@
 
 #pragma once
 
-#include "BLI_rect.h"
-
 #include "COM_Enums.h"
 
 #include "DNA_color_types.h"
 #include "DNA_node_types.h"
 #include "DNA_scene_types.h"
 
-#include <string>
+struct bNodeInstanceHash;
-#include <vector>
 
 namespace blender::compositor {
 

source/blender/compositor/intern/COM_ConstantFolder.cc

@@ -16,10 +16,11 @@
  * Copyright 2021, Blender Foundation.
  */
 
-#include "BLI_rect.h"
+#include "BLI_map.hh"
+#include "BLI_set.hh"
 
 #include "COM_ConstantFolder.h"
-#include "COM_ConstantOperation.h"
+#include "COM_NodeOperationBuilder.h"
 #include "COM_SetColorOperation.h"
 #include "COM_SetValueOperation.h"
 #include "COM_SetVectorOperation.h"

source/blender/compositor/intern/COM_ConstantFolder.h

@@ -18,16 +18,12 @@
 
 #pragma once
 
-#include "BLI_map.hh"
-#include "BLI_set.hh"
-#include "BLI_vector.hh"
-
-#include "COM_NodeOperationBuilder.h"
 #include "COM_defines.h"
 
 namespace blender::compositor {
 
 class NodeOperation;
+class NodeOperationBuilder;
 class ConstantOperation;
 class MemoryBuffer;
 

source/blender/compositor/intern/COM_Converter.cc

@@ -22,7 +22,6 @@
 
 #include "BKE_node.h"
 
-#include "COM_NodeOperation.h"
 #include "COM_NodeOperationBuilder.h"
 
 #include "COM_AlphaOverNode.h"
@@ -62,7 +61,6 @@
 #include "COM_DistanceMatteNode.h"
 #include "COM_DoubleEdgeMaskNode.h"
 #include "COM_EllipseMaskNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_FilterNode.h"
 #include "COM_FlipNode.h"
 #include "COM_GammaNode.h"

source/blender/compositor/intern/COM_Converter.h

@@ -18,8 +18,6 @@
 
 #pragma once
 
-#include "COM_NodeOperation.h"
-
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
@@ -29,6 +27,7 @@ struct bNode;
 namespace blender::compositor {
 
 class Node;
+class NodeOperation;
 class NodeOperationInput;
 class NodeOperationOutput;
 class NodeOperationBuilder;

source/blender/compositor/intern/COM_Debug.cc

@@ -18,26 +18,16 @@
 
 #include "COM_Debug.h"
 
-#include <map>
-#include <typeinfo>
-#include <vector>
-
 extern "C" {
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
-#include "BLI_string.h"
-#include "BLI_sys_types.h"
 
 #include "BKE_appdir.h"
-#include "BKE_node.h"
-#include "DNA_node_types.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 }
 
-#include "COM_ExecutionSystem.h"
+#include "COM_ExecutionGroup.h"
-#include "COM_Node.h"
-
 #include "COM_ReadBufferOperation.h"
 #include "COM_SetValueOperation.h"
 #include "COM_ViewerOperation.h"

source/blender/compositor/intern/COM_Debug.h

@@ -21,9 +21,11 @@
 #include <map>
 #include <string>
 
+#include "BLI_vector.hh"
+
 #include "COM_ExecutionSystem.h"
-#include "COM_NodeOperation.h"
+#include "COM_MemoryBuffer.h"
-#include "COM_defines.h"
+#include "COM_Node.h"
 
 namespace blender::compositor {
 
@@ -34,6 +36,7 @@ static constexpr bool COM_GRAPHVIZ_SHOW_NODE_NAME = false;
 static constexpr bool COM_EXPORT_OPERATION_BUFFERS = false;
 
 class Node;
+class NodeOperation;
 class ExecutionSystem;
 class ExecutionGroup;
 

source/blender/compositor/intern/COM_Device.h

@@ -18,10 +18,10 @@
 
 #pragma once
 
-#include "COM_WorkPackage.h"
-
 namespace blender::compositor {
 
+struct WorkPackage;
+
 /**
  * \brief Abstract class for device implementations to be used by the Compositor.
  * devices are queried, initialized and used by the WorkScheduler.

source/blender/compositor/intern/COM_Enums.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_Enums.h"
-#include "BLI_rect.h"
 
 namespace blender::compositor {
 

source/blender/compositor/intern/COM_ExecutionGroup.cc

@@ -16,36 +16,21 @@
  * Copyright 2011, Blender Foundation.
  */
 
-#include <algorithm>
+#include "COM_ExecutionGroup.h"
-#include <cmath>
-#include <cstdlib>
-#include <sstream>
-
-#include "atomic_ops.h"
-
 #include "COM_ChunkOrder.h"
 #include "COM_Debug.h"
-#include "COM_ExecutionGroup.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_ReadBufferOperation.h"
 #include "COM_ViewerOperation.h"
 #include "COM_WorkScheduler.h"
 #include "COM_WriteBufferOperation.h"
 #include "COM_defines.h"
 
-#include "BLI_math.h"
 #include "BLI_rand.hh"
-#include "BLI_string.h"
 
 #include "BLT_translation.h"
 
-#include "MEM_guardedalloc.h"
-
 #include "PIL_time.h"
 
-#include "WM_api.h"
-#include "WM_types.h"
-
 namespace blender::compositor {
 
 std::ostream &operator<<(std::ostream &os, const ExecutionGroupFlags &flags)

source/blender/compositor/intern/COM_ExecutionGroup.h

@@ -22,25 +22,24 @@
 #  include "MEM_guardedalloc.h"
 #endif
 
+#include <iostream>
+
 #include "BLI_array.hh"
-#include "BLI_rect.h"
 #include "BLI_vector.hh"
 
-#include "COM_CompositorContext.h"
+#include "COM_Enums.h"
-#include "COM_Device.h"
-#include "COM_MemoryProxy.h"
-#include "COM_Node.h"
-#include "COM_NodeOperation.h"
 #include "COM_WorkPackage.h"
-#include <vector>
+
+#include "DNA_node_types.h"
+#include "DNA_vec_types.h"
 
 namespace blender::compositor {
 
 class ExecutionSystem;
+class NodeOperation;
 class MemoryProxy;
 class MemoryBuffer;
 class ReadBufferOperation;
-class Device;
 
 struct ExecutionGroupFlags {
   bool initialized : 1;

source/blender/compositor/intern/COM_ExecutionModel.cc

@@ -17,6 +17,7 @@
  */
 
 #include "COM_ExecutionModel.h"
+#include "COM_CompositorContext.h"
 
 namespace blender::compositor {
 

source/blender/compositor/intern/COM_ExecutionModel.h

@@ -18,12 +18,9 @@
 
 #pragma once
 
-#include "BLI_rect.h"
+#include "BLI_span.hh"
-#include "BLI_vector.hh"
 
-#include "COM_ExecutionSystem.h"
+#include "DNA_vec_types.h"
-
-#include <functional>
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
@@ -31,6 +28,8 @@
 
 namespace blender::compositor {
 
+class CompositorContext;
+class ExecutionSystem;
 class NodeOperation;
 
 /**

source/blender/compositor/intern/COM_ExecutionSystem.cc

@@ -18,14 +18,13 @@
 
 #include "COM_ExecutionSystem.h"
 
-#include "BLI_utildefines.h"
-#include "PIL_time.h"
-
 #include "COM_Debug.h"
+#include "COM_ExecutionGroup.h"
 #include "COM_FullFrameExecutionModel.h"
 #include "COM_NodeOperation.h"
 #include "COM_NodeOperationBuilder.h"
 #include "COM_TiledExecutionModel.h"
+#include "COM_WorkPackage.h"
 #include "COM_WorkScheduler.h"
 
 #ifdef WITH_CXX_GUARDEDALLOC

source/blender/compositor/intern/COM_ExecutionSystem.h

@@ -16,22 +16,23 @@
  * Copyright 2011, Blender Foundation.
  */
 
-class ExecutionGroup;
-
 #pragma once
 
-#include "BKE_text.h"
+#include <functional>
 
-#include "COM_ExecutionGroup.h"
+#include "atomic_ops.h"
-#include "COM_Node.h"
+
-#include "COM_NodeOperation.h"
+#include "BLI_index_range.hh"
+#include "BLI_threads.h"
+#include "BLI_vector.hh"
+
+#include "COM_CompositorContext.h"
 #include "COM_SharedOperationBuffers.h"
 
 #include "DNA_color_types.h"
 #include "DNA_node_types.h"
-
+#include "DNA_scene_types.h"
-#include "BLI_vector.hh"
+#include "DNA_vec_types.h"
-#include "atomic_ops.h"
 
 namespace blender::compositor {
 
@@ -118,7 +119,9 @@ namespace blender::compositor {
  */
 
 /* Forward declarations. */
+class ExecutionGroup;
 class ExecutionModel;
+class NodeOperation;
 
 /**
  * \brief the ExecutionSystem contains the whole compositor tree.

source/blender/compositor/intern/COM_FullFrameExecutionModel.cc

@@ -17,14 +17,13 @@
  */
 
 #include "COM_FullFrameExecutionModel.h"
-#include "COM_Debug.h"
-#include "COM_ExecutionGroup.h"
-#include "COM_ReadBufferOperation.h"
-#include "COM_ViewerOperation.h"
-#include "COM_WorkScheduler.h"
 
 #include "BLT_translation.h"
 
+#include "COM_Debug.h"
+#include "COM_ViewerOperation.h"
+#include "COM_WorkScheduler.h"
+
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif

source/blender/compositor/intern/COM_FullFrameExecutionModel.h

@@ -18,6 +18,9 @@
 
 #pragma once
 
+#include "BLI_vector.hh"
+
+#include "COM_Enums.h"
 #include "COM_ExecutionModel.h"
 
 #ifdef WITH_CXX_GUARDEDALLOC
@@ -27,7 +30,11 @@
 namespace blender::compositor {
 
 /* Forward declarations. */
-class ExecutionGroup;
+class CompositorContext;
+class ExecutionSystem;
+class MemoryBuffer;
+class NodeOperation;
+class SharedOperationBuffers;
 
 /**
  * Fully renders operations in order from inputs to outputs.

source/blender/compositor/intern/COM_MemoryBuffer.cc

@@ -18,9 +18,10 @@
 
 #include "COM_MemoryBuffer.h"
 
+#include "COM_MemoryProxy.h"
+
 #include "IMB_colormanagement.h"
 #include "IMB_imbuf_types.h"
-#include "MEM_guardedalloc.h"
 
 #define ASSERT_BUFFER_CONTAINS_AREA(buf, area) \
   BLI_assert(BLI_rcti_inside_rcti(&(buf)->get_rect(), &(area)))

source/blender/compositor/intern/COM_MemoryBuffer.h

@@ -21,12 +21,13 @@
 #include "COM_BufferArea.h"
 #include "COM_BufferRange.h"
 #include "COM_BuffersIterator.h"
-#include "COM_ExecutionGroup.h"
+#include "COM_Enums.h"
-#include "COM_MemoryProxy.h"
 
-#include "BLI_math.h"
+#include "BLI_math_interp.h"
 #include "BLI_rect.h"
 
+struct ImBuf;
+
 namespace blender::compositor {
 
 /**

source/blender/compositor/intern/COM_MemoryProxy.cc

@@ -17,11 +17,8 @@
  */
 
 #include "COM_MemoryProxy.h"
-
 #include "COM_MemoryBuffer.h"
 
-#include "BLI_rect.h"
-
 namespace blender::compositor {
 
 MemoryProxy::MemoryProxy(DataType datatype)

source/blender/compositor/intern/COM_MetaData.cc

@@ -22,8 +22,6 @@
 
 #include "RE_pipeline.h"
 
-#include <string_view>
-
 namespace blender::compositor {
 
 void MetaData::add(const blender::StringRef key, const blender::StringRef value)

source/blender/compositor/intern/COM_MultiThreadedRowOperation.h

@@ -18,6 +18,8 @@
 
 #pragma once
 
+#include "BLI_array.h"
+
 #include "COM_MultiThreadedOperation.h"
 
 namespace blender::compositor {

source/blender/compositor/intern/COM_Node.cc

@@ -16,20 +16,10 @@
  * Copyright 2011, Blender Foundation.
  */
 
-#include <cstring>
-
 #include "BKE_node.h"
 
 #include "RNA_access.h"
 
-#include "COM_ExecutionSystem.h"
-#include "COM_NodeOperation.h"
-#include "COM_TranslateOperation.h"
-
-#include "COM_SocketProxyNode.h"
-
-#include "COM_defines.h"
-
 #include "COM_Node.h" /* own include */
 
 namespace blender::compositor {

source/blender/compositor/intern/COM_Node.h

@@ -22,9 +22,6 @@
 
 #include "DNA_node_types.h"
 
-#include <algorithm>
-#include <string>
-
 /* common node includes
  * added here so node files don't have to include themselves
  */

source/blender/compositor/intern/COM_NodeConverter.cc

@@ -18,9 +18,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "COM_Debug.h"
+#include "COM_Node.h"
-
-#include "COM_NodeOperation.h"
 #include "COM_NodeOperationBuilder.h"
 #include "COM_SetColorOperation.h"
 #include "COM_SetValueOperation.h"

source/blender/compositor/intern/COM_NodeGraph.cc

@@ -18,17 +18,12 @@
 
 #include <cstring>
 
-#include "BLI_listbase.h"
-#include "BLI_utildefines.h"
-
 #include "DNA_node_types.h"
 
 #include "BKE_node.h"
 
-#include "COM_CompositorContext.h"
 #include "COM_Converter.h"
 #include "COM_Debug.h"
-#include "COM_Node.h"
 #include "COM_SocketProxyNode.h"
 
 #include "COM_NodeGraph.h" /* own include */

source/blender/compositor/intern/COM_NodeGraph.h

@@ -18,11 +18,6 @@
 
 #pragma once
 
-#include "BLI_vector.hh"
-
-#include <map>
-#include <set>
-
 #include "DNA_node_types.h"
 
 #ifdef WITH_CXX_GUARDEDALLOC

source/blender/compositor/intern/COM_NodeOperation.cc

@@ -17,13 +17,10 @@
  */
 
 #include <cstdio>
-#include <memory>
-#include <typeinfo>
 
 #include "COM_BufferOperation.h"
 #include "COM_ExecutionSystem.h"
 #include "COM_ReadBufferOperation.h"
-#include "COM_defines.h"
 
 #include "COM_NodeOperation.h" /* own include */
 

source/blender/compositor/intern/COM_NodeOperation.h

@@ -18,32 +18,32 @@
 
 #pragma once
 
+#include <functional>
 #include <list>
-#include <sstream>
-#include <string>
 
 #include "BLI_ghash.h"
 #include "BLI_hash.hh"
-#include "BLI_math_color.h"
+#include "BLI_rect.h"
-#include "BLI_math_vector.h"
+#include "BLI_span.hh"
 #include "BLI_threads.h"
+#include "BLI_utildefines.h"
 
 #include "COM_Enums.h"
 #include "COM_MemoryBuffer.h"
-#include "COM_MemoryProxy.h"
 #include "COM_MetaData.h"
-#include "COM_Node.h"
 
 #include "clew.h"
 
+#include "DNA_node_types.h"
+
 namespace blender::compositor {
 
 class OpenCLDevice;
 class ReadBufferOperation;
-class WriteBufferOperation;
 class ExecutionSystem;
-
 class NodeOperation;
+class NodeOperationOutput;
+
 typedef NodeOperation SocketReader;
 
 /**

source/blender/compositor/intern/COM_NodeOperationBuilder.cc

@@ -16,24 +16,19 @@
  * Copyright 2013, Blender Foundation.
  */
 
+#include <set>
+
 #include "BLI_multi_value_map.hh"
-#include "BLI_utildefines.h"
 
 #include "COM_Converter.h"
 #include "COM_Debug.h"
-#include "COM_ExecutionSystem.h"
-#include "COM_Node.h"
-#include "COM_NodeConverter.h"
-#include "COM_SocketProxyNode.h"
 
-#include "COM_NodeOperation.h"
+#include "COM_ExecutionGroup.h"
 #include "COM_PreviewOperation.h"
 #include "COM_ReadBufferOperation.h"
 #include "COM_SetColorOperation.h"
 #include "COM_SetValueOperation.h"
 #include "COM_SetVectorOperation.h"
-#include "COM_SocketProxyOperation.h"
-#include "COM_TranslateOperation.h"
 #include "COM_ViewerOperation.h"
 #include "COM_WriteBufferOperation.h"
 

source/blender/compositor/intern/COM_NodeOperationBuilder.h

@@ -18,9 +18,8 @@
 
 #pragma once
 
-#include <map>
+#include "BLI_map.hh"
-#include <set>
+#include "BLI_vector.hh"
-#include <vector>
 
 #include "COM_NodeGraph.h"
 

source/blender/compositor/intern/COM_OpenCLDevice.cc

@@ -17,7 +17,9 @@
  */
 
 #include "COM_OpenCLDevice.h"
-#include "COM_WorkScheduler.h"
+
+#include "COM_ExecutionGroup.h"
+#include "COM_ReadBufferOperation.h"
 
 namespace blender::compositor {
 

source/blender/compositor/intern/COM_OpenCLDevice.h

@@ -20,13 +20,20 @@ class OpenCLDevice;
 
 #pragma once
 
+#include <list>
+
 #include "COM_Device.h"
-#include "COM_ReadBufferOperation.h"
+
-#include "COM_WorkScheduler.h"
 #include "clew.h"
 
 namespace blender::compositor {
 
+class NodeOperation;
+class MemoryBuffer;
+class ReadBufferOperation;
+
+typedef NodeOperation SocketReader;
+
 /**
  * \brief device representing an GPU OpenCL device.
  * an instance of this class represents a single cl_device

source/blender/compositor/intern/COM_SharedOperationBuffers.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_SharedOperationBuffers.h"
-#include "BLI_rect.h"
 #include "COM_NodeOperation.h"
 
 namespace blender::compositor {

source/blender/compositor/intern/COM_SharedOperationBuffers.h

@@ -19,16 +19,19 @@
 #pragma once
 
 #include "BLI_map.hh"
-#include "BLI_span.hh"
 #include "BLI_vector.hh"
-#include "COM_MemoryBuffer.h"
+
+#include "DNA_vec_types.h"
+
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
-#include <memory>
 
 namespace blender::compositor {
 
+class MemoryBuffer;
+class NodeOperation;
+
 /**
  * Stores and shares operations rendered buffers including render data. Buffers are
  * disposed once all dependent operations have finished reading them.

source/blender/compositor/intern/COM_TiledExecutionModel.h

@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include "COM_Enums.h"
 #include "COM_ExecutionModel.h"
 
 #ifdef WITH_CXX_GUARDEDALLOC

source/blender/compositor/intern/COM_WorkPackage.cc

@@ -18,7 +18,6 @@
 
 #include "COM_WorkPackage.h"
 
-#include "COM_Enums.h"
 #include "COM_ExecutionGroup.h"
 
 namespace blender::compositor {

source/blender/compositor/intern/COM_WorkPackage.h

@@ -24,7 +24,7 @@
 
 #include "COM_Enums.h"
 
-#include "BLI_rect.h"
+#include "DNA_vec_types.h"
 
 #include <functional>
 #include <ostream>

source/blender/compositor/intern/COM_WorkScheduler.cc

@@ -16,15 +16,14 @@
  * Copyright 2011, Blender Foundation.
  */
 
-#include <cstdio>
+#include "COM_WorkScheduler.h"
-#include <list>
 
 #include "COM_CPUDevice.h"
+#include "COM_CompositorContext.h"
+#include "COM_ExecutionGroup.h"
 #include "COM_OpenCLDevice.h"
 #include "COM_OpenCLKernels.cl.h"
-#include "COM_WorkScheduler.h"
 #include "COM_WriteBufferOperation.h"
-#include "COM_compositor.h"
 
 #include "clew.h"
 
@@ -33,7 +32,6 @@
 #include "BLI_task.h"
 #include "BLI_threads.h"
 #include "BLI_vector.hh"
-#include "PIL_time.h"
 
 #include "BKE_global.h"
 

source/blender/compositor/intern/COM_WorkScheduler.h

@@ -18,14 +18,12 @@
 
 #pragma once
 
-#include "COM_ExecutionGroup.h"
-
-#include "COM_Device.h"
-#include "COM_WorkPackage.h"
-#include "COM_defines.h"
-
 namespace blender::compositor {
 
+struct WorkPackage;
+
+class CompositorContext;
+
 /** \brief the workscheduler
  * \ingroup execution
  */

source/blender/compositor/intern/COM_compositor.cc

@@ -24,10 +24,8 @@
 #include "BKE_scene.h"
 
 #include "COM_ExecutionSystem.h"
-#include "COM_MovieDistortionOperation.h"
 #include "COM_WorkScheduler.h"
 #include "COM_compositor.h"
-#include "clew.h"
 
 static struct {
   bool is_initialized = false;

source/blender/compositor/nodes/COM_AlphaOverNode.cc

@@ -21,10 +21,6 @@
 #include "COM_AlphaOverKeyOperation.h"
 #include "COM_AlphaOverMixedOperation.h"
 #include "COM_AlphaOverPremultiplyOperation.h"
-#include "COM_MixOperation.h"
-
-#include "COM_SetValueOperation.h"
-#include "DNA_material_types.h" /* the ramp types */
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_AntiAliasingNode.cc

@@ -20,7 +20,6 @@
 
 #include "COM_AntiAliasingNode.h"
 #include "COM_SMAAOperation.h"
-#include "DNA_node_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_BilateralBlurNode.cc

@@ -18,8 +18,6 @@
 
 #include "COM_BilateralBlurNode.h"
 #include "COM_BilateralBlurOperation.h"
-#include "COM_ExecutionSystem.h"
-#include "DNA_node_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_BlurNode.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_BlurNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_FastGaussianBlurOperation.h"
 #include "COM_GammaCorrectOperation.h"
 #include "COM_GaussianAlphaXBlurOperation.h"
@@ -27,7 +26,6 @@
 #include "COM_GaussianYBlurOperation.h"
 #include "COM_MathBaseOperation.h"
 #include "COM_SetValueOperation.h"
-#include "DNA_node_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_BokehBlurNode.cc

@@ -18,12 +18,7 @@
 
 #include "COM_BokehBlurNode.h"
 #include "COM_BokehBlurOperation.h"
-#include "COM_ConvertDepthToRadiusOperation.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_VariableSizeBokehBlurOperation.h"
-#include "DNA_camera_types.h"
-#include "DNA_node_types.h"
-#include "DNA_object_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_BokehImageNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_BokehImageNode.h"
 #include "COM_BokehImageOperation.h"
-#include "COM_ExecutionSystem.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_BoxMaskNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_BoxMaskNode.h"
 #include "COM_BoxMaskOperation.h"
-#include "COM_ExecutionSystem.h"
 
 #include "COM_ScaleOperation.h"
 #include "COM_SetValueOperation.h"

source/blender/compositor/nodes/COM_BrightnessNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_BrightnessNode.h"
 #include "COM_BrightnessOperation.h"
-#include "COM_ExecutionSystem.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_ChannelMatteNode.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_ChannelMatteNode.h"
-#include "BKE_node.h"
 #include "COM_ChannelMatteOperation.h"
 #include "COM_ConvertOperation.h"
 #include "COM_SetAlphaMultiplyOperation.h"

source/blender/compositor/nodes/COM_ChromaMatteNode.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_ChromaMatteNode.h"
-#include "BKE_node.h"
 #include "COM_ChromaMatteOperation.h"
 #include "COM_ConvertOperation.h"
 #include "COM_SetAlphaMultiplyOperation.h"

source/blender/compositor/nodes/COM_ColorBalanceNode.cc

@@ -17,11 +17,8 @@
  */
 
 #include "COM_ColorBalanceNode.h"
-#include "BKE_node.h"
 #include "COM_ColorBalanceASCCDLOperation.h"
 #include "COM_ColorBalanceLGGOperation.h"
-#include "COM_ExecutionSystem.h"
-#include "COM_MixOperation.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_ColorCorrectionNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_ColorCorrectionNode.h"
 #include "COM_ColorCorrectionOperation.h"
-#include "COM_ExecutionSystem.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_ColorCurveNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_ColorCurveNode.h"
 #include "COM_ColorCurveOperation.h"
-#include "COM_ExecutionSystem.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_ColorExposureNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_ColorExposureNode.h"
 #include "COM_ColorExposureOperation.h"
-#include "COM_ExecutionSystem.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_ColorMatteNode.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_ColorMatteNode.h"
-#include "BKE_node.h"
 #include "COM_ColorMatteOperation.h"
 #include "COM_ConvertOperation.h"
 #include "COM_SetAlphaMultiplyOperation.h"

source/blender/compositor/nodes/COM_ColorNode.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_ColorNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_SetColorOperation.h"
 
 namespace blender::compositor {

source/blender/compositor/nodes/COM_ColorRampNode.cc

@@ -17,11 +17,8 @@
  */
 
 #include "COM_ColorRampNode.h"
-#include "BKE_node.h"
 #include "COM_ColorRampOperation.h"
 #include "COM_ConvertOperation.h"
-#include "COM_ExecutionSystem.h"
-#include "DNA_texture_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_ColorSpillNode.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_ColorSpillNode.h"
-#include "BKE_node.h"
 #include "COM_ColorSpillOperation.h"
 
 namespace blender::compositor {

source/blender/compositor/nodes/COM_ColorToBWNode.cc

@@ -19,7 +19,6 @@
 #include "COM_ColorToBWNode.h"
 
 #include "COM_ConvertOperation.h"
-#include "COM_ExecutionSystem.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_CompositorNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_CompositorNode.h"
 #include "COM_CompositorOperation.h"
-#include "COM_ExecutionSystem.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_ConvertAlphaNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_ConvertAlphaNode.h"
 #include "COM_ConvertOperation.h"
-#include "COM_ExecutionSystem.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_CornerPinNode.cc

@@ -16,7 +16,6 @@
  */
 
 #include "COM_CornerPinNode.h"
-#include "COM_ExecutionSystem.h"
 
 #include "COM_PlaneCornerPinOperation.h"
 

source/blender/compositor/nodes/COM_CryptomatteNode.cc

@@ -18,18 +18,11 @@
 
 #include "COM_CryptomatteNode.h"
 #include "BKE_node.h"
-#include "BLI_assert.h"
-#include "BLI_hash_mm3.h"
-#include "BLI_listbase.h"
-#include "BLI_string.h"
 #include "COM_ConvertOperation.h"
-#include "COM_CryptomatteOperation.h"
 #include "COM_MultilayerImageOperation.h"
 #include "COM_RenderLayersProg.h"
 #include "COM_SetAlphaMultiplyOperation.h"
 #include "COM_SetColorOperation.h"
-#include <iterator>
-#include <string>
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_DefocusNode.cc

@@ -19,16 +19,10 @@
 #include "COM_DefocusNode.h"
 #include "COM_BokehImageOperation.h"
 #include "COM_ConvertDepthToRadiusOperation.h"
-#include "COM_ExecutionSystem.h"
-#include "COM_FastGaussianBlurOperation.h"
 #include "COM_GammaCorrectOperation.h"
 #include "COM_MathBaseOperation.h"
 #include "COM_SetValueOperation.h"
 #include "COM_VariableSizeBokehBlurOperation.h"
-#include "DNA_camera_types.h"
-#include "DNA_node_types.h"
-#include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_DenoiseNode.cc

@@ -17,9 +17,6 @@
  */
 #include "COM_DenoiseNode.h"
 #include "COM_DenoiseOperation.h"
-#include "COM_MixOperation.h"
-#include "COM_SetValueOperation.h"
-#include "DNA_node_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_DespeckleNode.cc

@@ -17,10 +17,7 @@
  */
 
 #include "COM_DespeckleNode.h"
-#include "BLI_math.h"
 #include "COM_DespeckleOperation.h"
-#include "COM_ExecutionSystem.h"
-#include "DNA_scene_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_DifferenceMatteNode.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_DifferenceMatteNode.h"
-#include "BKE_node.h"
 #include "COM_DifferenceMatteOperation.h"
 #include "COM_SetAlphaMultiplyOperation.h"
 

source/blender/compositor/nodes/COM_DilateErodeNode.cc

@@ -17,10 +17,8 @@
  */
 
 #include "COM_DilateErodeNode.h"
-#include "BLI_math.h"
 #include "COM_AntiAliasOperation.h"
 #include "COM_DilateErodeOperation.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_GaussianAlphaXBlurOperation.h"
 #include "COM_GaussianAlphaYBlurOperation.h"
 

source/blender/compositor/nodes/COM_DirectionalBlurNode.cc

@@ -18,8 +18,6 @@
 
 #include "COM_DirectionalBlurNode.h"
 #include "COM_DirectionalBlurOperation.h"
-#include "COM_ExecutionSystem.h"
-#include "DNA_node_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_DisplaceNode.cc

@@ -19,7 +19,6 @@
 #include "COM_DisplaceNode.h"
 #include "COM_DisplaceOperation.h"
 #include "COM_DisplaceSimpleOperation.h"
-#include "COM_ExecutionSystem.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_DistanceMatteNode.cc

@@ -17,9 +17,7 @@
  */
 
 #include "COM_DistanceMatteNode.h"
-#include "BKE_node.h"
 #include "COM_ConvertOperation.h"
-#include "COM_DistanceRGBMatteOperation.h"
 #include "COM_DistanceYCCMatteOperation.h"
 #include "COM_SetAlphaMultiplyOperation.h"
 

source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_DoubleEdgeMaskNode.h"
 #include "COM_DoubleEdgeMaskOperation.h"
-#include "COM_ExecutionSystem.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_EllipseMaskNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_EllipseMaskNode.h"
 #include "COM_EllipseMaskOperation.h"
-#include "COM_ExecutionSystem.h"
 
 #include "COM_ScaleOperation.h"
 #include "COM_SetValueOperation.h"

source/blender/compositor/nodes/COM_FilterNode.cc

@@ -19,9 +19,6 @@
 #include "COM_FilterNode.h"
 #include "BKE_node.h"
 #include "COM_ConvolutionEdgeFilterOperation.h"
-#include "COM_ConvolutionFilterOperation.h"
-#include "COM_ExecutionSystem.h"
-#include "COM_MixOperation.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_FlipNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_FlipNode.h"
 
-#include "COM_ExecutionSystem.h"
 #include "COM_FlipOperation.h"
 
 namespace blender::compositor {

source/blender/compositor/nodes/COM_GammaNode.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_GammaNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_GammaOperation.h"
 
 namespace blender::compositor {

source/blender/compositor/nodes/COM_GlareNode.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_GlareNode.h"
-#include "COM_FastGaussianBlurOperation.h"
 #include "COM_GlareFogGlowOperation.h"
 #include "COM_GlareGhostOperation.h"
 #include "COM_GlareSimpleStarOperation.h"
@@ -25,7 +24,6 @@
 #include "COM_GlareThresholdOperation.h"
 #include "COM_MixOperation.h"
 #include "COM_SetValueOperation.h"
-#include "DNA_node_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc

@@ -19,12 +19,8 @@
 #include "COM_HueSaturationValueCorrectNode.h"
 
 #include "COM_ConvertOperation.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_HueSaturationValueCorrectOperation.h"
 #include "COM_MixOperation.h"
-#include "COM_SetColorOperation.h"
-#include "COM_SetValueOperation.h"
-#include "DNA_node_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_HueSaturationValueNode.cc

@@ -20,11 +20,7 @@
 
 #include "COM_ChangeHSVOperation.h"
 #include "COM_ConvertOperation.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_MixOperation.h"
-#include "COM_SetColorOperation.h"
-#include "COM_SetValueOperation.h"
-#include "DNA_node_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_IDMaskNode.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_IDMaskNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_IDMaskOperation.h"
 #include "COM_SMAAOperation.h"
 

source/blender/compositor/nodes/COM_ImageNode.cc

@@ -17,14 +17,9 @@
  */
 
 #include "COM_ImageNode.h"
-#include "BKE_node.h"
-#include "BLI_utildefines.h"
 #include "COM_ConvertOperation.h"
-#include "COM_ExecutionSystem.h"
-#include "COM_ImageOperation.h"
 #include "COM_MultilayerImageOperation.h"
 
-#include "COM_SeparateColorNode.h"
 #include "COM_SetColorOperation.h"
 #include "COM_SetValueOperation.h"
 #include "COM_SetVectorOperation.h"

source/blender/compositor/nodes/COM_InpaintNode.cc

@@ -17,10 +17,7 @@
  */
 
 #include "COM_InpaintNode.h"
-#include "BLI_math.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_InpaintOperation.h"
-#include "DNA_scene_types.h"
 
 namespace blender::compositor {
 

source/blender/compositor/nodes/COM_InvertNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_InvertNode.h"
 #include "BKE_node.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_InvertOperation.h"
 
 namespace blender::compositor {

source/blender/compositor/nodes/COM_KeyingNode.cc

@@ -18,8 +18,6 @@
 
 #include "COM_KeyingNode.h"
 
-#include "COM_ExecutionSystem.h"
-
 #include "COM_KeyingBlurOperation.h"
 #include "COM_KeyingClipOperation.h"
 #include "COM_KeyingDespillOperation.h"

source/blender/compositor/nodes/COM_KeyingScreenNode.cc

@@ -17,11 +17,8 @@
  */
 
 #include "COM_KeyingScreenNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_KeyingScreenOperation.h"
 
-#include "DNA_movieclip_types.h"
-
 namespace blender::compositor {
 
 KeyingScreenNode::KeyingScreenNode(bNode *editorNode) : Node(editorNode)

source/blender/compositor/nodes/COM_LensDistortionNode.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_LensDistortionNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_ProjectorLensDistortionOperation.h"
 #include "COM_ScreenLensDistortionOperation.h"
 

source/blender/compositor/nodes/COM_LuminanceMatteNode.cc

@@ -17,8 +17,6 @@
  */
 
 #include "COM_LuminanceMatteNode.h"
-#include "BKE_node.h"
-#include "COM_ConvertOperation.h"
 #include "COM_LuminanceMatteOperation.h"
 #include "COM_SetAlphaMultiplyOperation.h"
 

source/blender/compositor/nodes/COM_MapRangeNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_MapRangeNode.h"
 
-#include "COM_ExecutionSystem.h"
 #include "COM_MapRangeOperation.h"
 
 namespace blender::compositor {

source/blender/compositor/nodes/COM_MapUVNode.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_MapUVNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_MapUVOperation.h"
 
 namespace blender::compositor {

source/blender/compositor/nodes/COM_MapValueNode.cc

@@ -18,7 +18,6 @@
 
 #include "COM_MapValueNode.h"
 
-#include "COM_ExecutionSystem.h"
 #include "COM_MapValueOperation.h"
 
 namespace blender::compositor {

source/blender/compositor/nodes/COM_MaskNode.cc

@@ -17,11 +17,8 @@
  */
 
 #include "COM_MaskNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_MaskOperation.h"
 
-#include "DNA_mask_types.h"
-
 namespace blender::compositor {
 
 MaskNode::MaskNode(bNode *editorNode) : Node(editorNode)

source/blender/compositor/nodes/COM_MathNode.cc

@@ -17,7 +17,6 @@
  */
 
 #include "COM_MathNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_MathBaseOperation.h"
 
 namespace blender::compositor {

source/blender/compositor/nodes/COM_MixNode.cc

@@ -20,8 +20,6 @@
 
 #include "COM_MixOperation.h"
 
-#include "COM_ExecutionSystem.h"
-#include "COM_SetValueOperation.h"
 #include "DNA_material_types.h" /* the ramp types */
 
 namespace blender::compositor {

source/blender/compositor/nodes/COM_MovieClipNode.cc

@@ -17,10 +17,8 @@
  */
 
 #include "COM_MovieClipNode.h"
-#include "COM_ConvertColorProfileOperation.h"
+
-#include "COM_ExecutionSystem.h"
 #include "COM_MovieClipOperation.h"
-#include "COM_SetValueOperation.h"
 
 #include "BKE_movieclip.h"
 #include "BKE_tracking.h"