Cleanup: remove unused includes in Compositor

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

Slightly reduces compile time.

81 files changed, 3 insertions, 179 deletions

diff --git a/source/blender/compositor/nodes/COM_AlphaOverNode.cc b/source/blender/compositor/nodes/COM_AlphaOverNode.cc
index c9038886b0d..603f713a43f 100644
--- a/source/blender/compositor/nodes/COM_AlphaOverNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_AntiAliasingNode.cc b/source/blender/compositor/nodes/COM_AntiAliasingNode.cc
index af4832665df..8cbb3994939 100644
--- a/source/blender/compositor/nodes/COM_AntiAliasingNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_BilateralBlurNode.cc b/source/blender/compositor/nodes/COM_BilateralBlurNode.cc
index 1b9da789d3c..40a70e37e4b 100644
--- a/source/blender/compositor/nodes/COM_BilateralBlurNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_BlurNode.cc b/source/blender/compositor/nodes/COM_BlurNode.cc
index c10bc2a05f0..5dfd5c8d0bc 100644
--- a/source/blender/compositor/nodes/COM_BlurNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cc b/source/blender/compositor/nodes/COM_BokehBlurNode.cc
index c51a98c0f82..c18f6351cbd 100644
--- a/source/blender/compositor/nodes/COM_BokehBlurNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_BokehImageNode.cc b/source/blender/compositor/nodes/COM_BokehImageNode.cc
index 2b0a47c76bc..64237571e90 100644
--- a/source/blender/compositor/nodes/COM_BokehImageNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_BoxMaskNode.cc b/source/blender/compositor/nodes/COM_BoxMaskNode.cc
index 8017e063a69..6fcaeada406 100644
--- a/source/blender/compositor/nodes/COM_BoxMaskNode.cc
+++ b/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"
diff --git a/source/blender/compositor/nodes/COM_BrightnessNode.cc b/source/blender/compositor/nodes/COM_BrightnessNode.cc
index b64f1fea99f..e01ec3d8729 100644
--- a/source/blender/compositor/nodes/COM_BrightnessNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.cc b/source/blender/compositor/nodes/COM_ChannelMatteNode.cc
index d0f72274aea..ed49d9c36a9 100644
--- a/source/blender/compositor/nodes/COM_ChannelMatteNode.cc
+++ b/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"
diff --git a/source/blender/compositor/nodes/COM_ChromaMatteNode.cc b/source/blender/compositor/nodes/COM_ChromaMatteNode.cc
index 9abf183a843..33516181152 100644
--- a/source/blender/compositor/nodes/COM_ChromaMatteNode.cc
+++ b/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"
diff --git a/source/blender/compositor/nodes/COM_ColorBalanceNode.cc b/source/blender/compositor/nodes/COM_ColorBalanceNode.cc
index 03e4e143061..8f9d05ad1e1 100644
--- a/source/blender/compositor/nodes/COM_ColorBalanceNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc b/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc
index 6397b1d8e4b..b5bf118d7de 100644
--- a/source/blender/compositor/nodes/COM_ColorCorrectionNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_ColorCurveNode.cc b/source/blender/compositor/nodes/COM_ColorCurveNode.cc
index 774dd689a46..4a82a42b036 100644
--- a/source/blender/compositor/nodes/COM_ColorCurveNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_ColorExposureNode.cc b/source/blender/compositor/nodes/COM_ColorExposureNode.cc
index a8f164e6b66..83507395108 100644
--- a/source/blender/compositor/nodes/COM_ColorExposureNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_ColorMatteNode.cc b/source/blender/compositor/nodes/COM_ColorMatteNode.cc
index eadb8ce4f96..345cdb3ecf7 100644
--- a/source/blender/compositor/nodes/COM_ColorMatteNode.cc
+++ b/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"
diff --git a/source/blender/compositor/nodes/COM_ColorNode.cc b/source/blender/compositor/nodes/COM_ColorNode.cc
index f8277645a4b..e79f2eb97af 100644
--- a/source/blender/compositor/nodes/COM_ColorNode.cc
+++ b/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 {
diff --git a/source/blender/compositor/nodes/COM_ColorRampNode.cc b/source/blender/compositor/nodes/COM_ColorRampNode.cc
index 6b44ef3057e..e4346459dd4 100644
--- a/source/blender/compositor/nodes/COM_ColorRampNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_ColorSpillNode.cc b/source/blender/compositor/nodes/COM_ColorSpillNode.cc
index 6119e635e59..d0bd4eb12ea 100644
--- a/source/blender/compositor/nodes/COM_ColorSpillNode.cc
+++ b/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 {
diff --git a/source/blender/compositor/nodes/COM_ColorToBWNode.cc b/source/blender/compositor/nodes/COM_ColorToBWNode.cc
index dcedfc19e4d..ac051ab0d55 100644
--- a/source/blender/compositor/nodes/COM_ColorToBWNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_CompositorNode.cc b/source/blender/compositor/nodes/COM_CompositorNode.cc
index 262fa550915..10c87b8c886 100644
--- a/source/blender/compositor/nodes/COM_CompositorNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cc b/source/blender/compositor/nodes/COM_ConvertAlphaNode.cc
index ac4e45357dc..649d851fe84 100644
--- a/source/blender/compositor/nodes/COM_ConvertAlphaNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_CornerPinNode.cc b/source/blender/compositor/nodes/COM_CornerPinNode.cc
index 3cfa20f4e05..fb188dc45f8 100644
--- a/source/blender/compositor/nodes/COM_CornerPinNode.cc
+++ b/source/blender/compositor/nodes/COM_CornerPinNode.cc
@@ -16,7 +16,6 @@
  */
 
 #include "COM_CornerPinNode.h"
-#include "COM_ExecutionSystem.h"
 
 #include "COM_PlaneCornerPinOperation.h"
 
diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cc b/source/blender/compositor/nodes/COM_CryptomatteNode.cc
index c04d98d6a2b..21596d5aebb 100644
--- a/source/blender/compositor/nodes/COM_CryptomatteNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_DefocusNode.cc b/source/blender/compositor/nodes/COM_DefocusNode.cc
index 2023e4f7118..6f1361df284 100644
--- a/source/blender/compositor/nodes/COM_DefocusNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_DenoiseNode.cc b/source/blender/compositor/nodes/COM_DenoiseNode.cc
index cc9328414ef..e576966626c 100644
--- a/source/blender/compositor/nodes/COM_DenoiseNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_DespeckleNode.cc b/source/blender/compositor/nodes/COM_DespeckleNode.cc
index beda479025d..1a068112210 100644
--- a/source/blender/compositor/nodes/COM_DespeckleNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cc b/source/blender/compositor/nodes/COM_DifferenceMatteNode.cc
index 8c989bfc04e..9700b761eca 100644
--- a/source/blender/compositor/nodes/COM_DifferenceMatteNode.cc
+++ b/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"
 
diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cc b/source/blender/compositor/nodes/COM_DilateErodeNode.cc
index 1867014f64b..dbd03b02b8e 100644
--- a/source/blender/compositor/nodes/COM_DilateErodeNode.cc
+++ b/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"
 
diff --git a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cc b/source/blender/compositor/nodes/COM_DirectionalBlurNode.cc
index 90c4236bce8..dce2a1a7911 100644
--- a/source/blender/compositor/nodes/COM_DirectionalBlurNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_DisplaceNode.cc b/source/blender/compositor/nodes/COM_DisplaceNode.cc
index f2ec750c595..d13c0c347fb 100644
--- a/source/blender/compositor/nodes/COM_DisplaceNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.cc b/source/blender/compositor/nodes/COM_DistanceMatteNode.cc
index 4450c4a2f4a..26886a6580f 100644
--- a/source/blender/compositor/nodes/COM_DistanceMatteNode.cc
+++ b/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"
 
diff --git a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc b/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc
index 847dcc2f8f1..273f0ee7026 100644
--- a/source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_EllipseMaskNode.cc b/source/blender/compositor/nodes/COM_EllipseMaskNode.cc
index 752597ef937..4f3703dceb1 100644
--- a/source/blender/compositor/nodes/COM_EllipseMaskNode.cc
+++ b/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"
diff --git a/source/blender/compositor/nodes/COM_FilterNode.cc b/source/blender/compositor/nodes/COM_FilterNode.cc
index 351219155c2..4cdb00a87f4 100644
--- a/source/blender/compositor/nodes/COM_FilterNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_FlipNode.cc b/source/blender/compositor/nodes/COM_FlipNode.cc
index bca6cd3c4f7..1c613bde674 100644
--- a/source/blender/compositor/nodes/COM_FlipNode.cc
+++ b/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 {
diff --git a/source/blender/compositor/nodes/COM_GammaNode.cc b/source/blender/compositor/nodes/COM_GammaNode.cc
index 52148a80a8f..31253a90462 100644
--- a/source/blender/compositor/nodes/COM_GammaNode.cc
+++ b/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 {
diff --git a/source/blender/compositor/nodes/COM_GlareNode.cc b/source/blender/compositor/nodes/COM_GlareNode.cc
index 9c26d7c86a9..bbbbb7fa7ee 100644
--- a/source/blender/compositor/nodes/COM_GlareNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc b/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc
index e7b1664c354..3cf4b218bb2 100644
--- a/source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cc b/source/blender/compositor/nodes/COM_HueSaturationValueNode.cc
index 29e5f39a144..7711c306f24 100644
--- a/source/blender/compositor/nodes/COM_HueSaturationValueNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_IDMaskNode.cc b/source/blender/compositor/nodes/COM_IDMaskNode.cc
index 761cb8b98cf..0a7ed521afb 100644
--- a/source/blender/compositor/nodes/COM_IDMaskNode.cc
+++ b/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"
 
diff --git a/source/blender/compositor/nodes/COM_ImageNode.cc b/source/blender/compositor/nodes/COM_ImageNode.cc
index 20476144efa..992d5697109 100644
--- a/source/blender/compositor/nodes/COM_ImageNode.cc
+++ b/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"
diff --git a/source/blender/compositor/nodes/COM_InpaintNode.cc b/source/blender/compositor/nodes/COM_InpaintNode.cc
index 01ec5523939..93fb051090c 100644
--- a/source/blender/compositor/nodes/COM_InpaintNode.cc
+++ b/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 {
 
diff --git a/source/blender/compositor/nodes/COM_InvertNode.cc b/source/blender/compositor/nodes/COM_InvertNode.cc
index 5fe2033227f..cb15f3b28b0 100644
--- a/source/blender/compositor/nodes/COM_InvertNode.cc
+++ b/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 {
diff --git a/source/blender/compositor/nodes/COM_KeyingNode.cc b/source/blender/compositor/nodes/COM_KeyingNode.cc
index 0af328a3601..c928b55fbb0 100644
--- a/source/blender/compositor/nodes/COM_KeyingNode.cc
+++ b/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"
diff --git a/source/blender/compositor/nodes/COM_KeyingScreenNode.cc b/source/blender/compositor/nodes/COM_KeyingScreenNode.cc
index 43574d02d80..e405c01ddf2 100644
--- a/source/blender/compositor/nodes/COM_KeyingScreenNode.cc
+++ b/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)
diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.cc b/source/blender/compositor/nodes/COM_LensDistortionNode.cc
index f5226d31989..46223c1f294 100644
--- a/source/blender/compositor/nodes/COM_LensDistortionNode.cc
+++ b/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"
 
diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cc b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cc
index 920da53231f..e38aff91431 100644
--- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cc
+++ b/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"
 
diff --git a/source/blender/compositor/nodes/COM_MapRangeNode.cc b/source/blender/compositor/nodes/COM_MapRangeNode.cc
index 718a6d9e47b..01288b779ec 100644
--- a/source/blender/compositor/nodes/COM_MapRangeNode.cc
+++ b/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 {
diff --git a/source/blender/compositor/nodes/COM_MapUVNode.cc b/source/blender/compositor/nodes/COM_MapUVNode.cc
index bbf9e8f3aeb..ddda1e2db1d 100644
--- a/source/blender/compositor/nodes/COM_MapUVNode.cc
+++ b/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 {
diff --git a/source/blender/compositor/nodes/COM_MapValueNode.cc b/source/blender/compositor/nodes/COM_MapValueNode.cc
index ae48bda6cb8..9c6be55e93b 100644
--- a/source/blender/compositor/nodes/COM_MapValueNode.cc
+++ b/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 {
diff --git a/source/blender/compositor/nodes/COM_MaskNode.cc b/source/blender/compositor/nodes/COM_MaskNode.cc
index b5b23798160..27488c8a6c8 100644
--- a/source/blender/compositor/nodes/COM_MaskNode.cc
+++ b/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)
diff --git a/source/blender/compositor/nodes/COM_MathNode.cc b/source/blender/compositor/nodes/COM_MathNode.cc
index dd0d8931d58..f8a1530fe29 100644
--- a/source/blender/compositor/nodes/COM_MathNode.cc
+++ b/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 {
diff --git a/source/blender/compositor/nodes/COM_MixNode.cc b/source/blender/compositor/nodes/COM_MixNode.cc
index cfa8d0ee6a6..9eb38783d6a 100644
--- a/source/blender/compositor/nodes/COM_MixNode.cc
+++ b/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 {
diff --git a/source/blender/compositor/nodes/COM_MovieClipNode.cc b/source/blender/compositor/nodes/COM_MovieClipNode.cc
index b80071d27c7..9c2e3c95a03 100644
--- a/source/blender/compositor/nodes/COM_MovieClipNode.cc
+++ b/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"
diff --git a/source/blender/compositor/nodes/COM_MovieDistortionNode.cc b/source/blender/compositor/nodes/COM_MovieDistortionNode.cc
index 8f17ef8bb98..c9155ee8ca3 100644
--- a/source/blender/compositor/nodes/COM_MovieDistortionNode.cc
+++ b/source/blender/compositor/nodes/COM_MovieDistortionNode.cc
@@ -18,9 +18,7 @@
 
 #include "COM_MovieDistortionNode.h"
 
-#include "COM_ExecutionSystem.h"
 #include "COM_MovieDistortionOperation.h"
-#include "DNA_movieclip_types.h"
 
 namespace blender::compositor {
 
diff --git a/source/blender/compositor/nodes/COM_NormalNode.cc b/source/blender/compositor/nodes/COM_NormalNode.cc
index 5a97b0932ef..5a05f4c89b5 100644
--- a/source/blender/compositor/nodes/COM_NormalNode.cc
+++ b/source/blender/compositor/nodes/COM_NormalNode.cc
@@ -17,9 +17,7 @@
  */
 
 #include "COM_NormalNode.h"
-#include "BKE_node.h"
 #include "COM_DotproductOperation.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_SetVectorOperation.h"
 
 namespace blender::compositor {
diff --git a/source/blender/compositor/nodes/COM_NormalizeNode.cc b/source/blender/compositor/nodes/COM_NormalizeNode.cc
index 639dd8e5a51..b42f8154ce0 100644
--- a/source/blender/compositor/nodes/COM_NormalizeNode.cc
+++ b/source/blender/compositor/nodes/COM_NormalizeNode.cc
@@ -17,7 +17,6 @@
  */
 
 #include "COM_NormalizeNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_NormalizeOperation.h"
 
 namespace blender::compositor {
diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cc b/source/blender/compositor/nodes/COM_OutputFileNode.cc
index 25ec7331849..772456da963 100644
--- a/source/blender/compositor/nodes/COM_OutputFileNode.cc
+++ b/source/blender/compositor/nodes/COM_OutputFileNode.cc
@@ -17,12 +17,6 @@
  */
 
 #include "COM_OutputFileNode.h"
-#include "COM_ExecutionSystem.h"
-#include "COM_OutputFileOperation.h"
-
-#include "BKE_scene.h"
-
-#include "BLI_path_util.h"
 
 namespace blender::compositor {
 
diff --git a/source/blender/compositor/nodes/COM_PixelateNode.cc b/source/blender/compositor/nodes/COM_PixelateNode.cc
index 396f339e5a2..ae7169b2d98 100644
--- a/source/blender/compositor/nodes/COM_PixelateNode.cc
+++ b/source/blender/compositor/nodes/COM_PixelateNode.cc
@@ -18,7 +18,6 @@
 
 #include "COM_PixelateNode.h"
 
-#include "COM_ExecutionSystem.h"
 #include "COM_PixelateOperation.h"
 
 namespace blender::compositor {
diff --git a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc
index 54a0f4d0452..716392f8bcf 100644
--- a/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc
+++ b/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cc
@@ -17,14 +17,9 @@
  */
 
 #include "COM_PlaneTrackDeformNode.h"
-#include "COM_ExecutionSystem.h"
 
 #include "COM_PlaneTrackOperation.h"
 
-#include "BKE_movieclip.h"
-#include "BKE_node.h"
-#include "BKE_tracking.h"
-
 namespace blender::compositor {
 
 PlaneTrackDeformNode::PlaneTrackDeformNode(bNode *editorNode) : Node(editorNode)
diff --git a/source/blender/compositor/nodes/COM_PosterizeNode.cc b/source/blender/compositor/nodes/COM_PosterizeNode.cc
index 9f5a69961a4..a69e4f17250 100644
--- a/source/blender/compositor/nodes/COM_PosterizeNode.cc
+++ b/source/blender/compositor/nodes/COM_PosterizeNode.cc
@@ -17,7 +17,6 @@
  */
 
 #include "COM_PosterizeNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_PosterizeOperation.h"
 
 namespace blender::compositor {
diff --git a/source/blender/compositor/nodes/COM_RenderLayersNode.cc b/source/blender/compositor/nodes/COM_RenderLayersNode.cc
index 6744e98ecdb..87dccec7bfc 100644
--- a/source/blender/compositor/nodes/COM_RenderLayersNode.cc
+++ b/source/blender/compositor/nodes/COM_RenderLayersNode.cc
@@ -17,13 +17,9 @@
  */
 
 #include "COM_RenderLayersNode.h"
-#include "COM_RenderLayersProg.h"
-#include "COM_RotateOperation.h"
-#include "COM_ScaleOperation.h"
 #include "COM_SetColorOperation.h"
 #include "COM_SetValueOperation.h"
 #include "COM_SetVectorOperation.h"
-#include "COM_TranslateOperation.h"
 
 namespace blender::compositor {
 
diff --git a/source/blender/compositor/nodes/COM_RotateNode.cc b/source/blender/compositor/nodes/COM_RotateNode.cc
index c2fd8ed5594..76c11a79d2f 100644
--- a/source/blender/compositor/nodes/COM_RotateNode.cc
+++ b/source/blender/compositor/nodes/COM_RotateNode.cc
@@ -18,7 +18,6 @@
 
 #include "COM_RotateNode.h"
 
-#include "COM_ExecutionSystem.h"
 #include "COM_RotateOperation.h"
 #include "COM_SetSamplerOperation.h"
 
diff --git a/source/blender/compositor/nodes/COM_ScaleNode.cc b/source/blender/compositor/nodes/COM_ScaleNode.cc
index f1f41375eba..1e33a8688a9 100644
--- a/source/blender/compositor/nodes/COM_ScaleNode.cc
+++ b/source/blender/compositor/nodes/COM_ScaleNode.cc
@@ -19,9 +19,7 @@
 #include "COM_ScaleNode.h"
 
 #include "BKE_node.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_ScaleOperation.h"
-#include "COM_SetSamplerOperation.h"
 #include "COM_SetValueOperation.h"
 
 namespace blender::compositor {
diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.cc b/source/blender/compositor/nodes/COM_SetAlphaNode.cc
index c7365b09f71..a3a8472ccc9 100644
--- a/source/blender/compositor/nodes/COM_SetAlphaNode.cc
+++ b/source/blender/compositor/nodes/COM_SetAlphaNode.cc
@@ -17,7 +17,6 @@
  */
 
 #include "COM_SetAlphaNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_SetAlphaMultiplyOperation.h"
 #include "COM_SetAlphaReplaceOperation.h"
 
diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.cc b/source/blender/compositor/nodes/COM_SocketProxyNode.cc
index b3aa1770551..4bd3eb0b058 100644
--- a/source/blender/compositor/nodes/COM_SocketProxyNode.cc
+++ b/source/blender/compositor/nodes/COM_SocketProxyNode.cc
@@ -17,12 +17,7 @@
  */
 
 #include "COM_SocketProxyNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_ReadBufferOperation.h"
-#include "COM_SetColorOperation.h"
-#include "COM_SetValueOperation.h"
-#include "COM_SetVectorOperation.h"
-#include "COM_SocketProxyOperation.h"
 #include "COM_WriteBufferOperation.h"
 
 namespace blender::compositor {
diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cc b/source/blender/compositor/nodes/COM_SplitViewerNode.cc
index 582c650f205..bdc927c59a5 100644
--- a/source/blender/compositor/nodes/COM_SplitViewerNode.cc
+++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cc
@@ -17,11 +17,7 @@
  */
 
 #include "COM_SplitViewerNode.h"
-#include "BKE_global.h"
-#include "BKE_image.h"
-#include "BKE_scene.h"
 
-#include "COM_ExecutionSystem.h"
 #include "COM_SplitOperation.h"
 #include "COM_ViewerOperation.h"
 
diff --git a/source/blender/compositor/nodes/COM_Stabilize2dNode.cc b/source/blender/compositor/nodes/COM_Stabilize2dNode.cc
index 3d8f0bbda7e..48eeb337842 100644
--- a/source/blender/compositor/nodes/COM_Stabilize2dNode.cc
+++ b/source/blender/compositor/nodes/COM_Stabilize2dNode.cc
@@ -17,18 +17,12 @@
  */
 
 #include "COM_Stabilize2dNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_MovieClipAttributeOperation.h"
 #include "COM_RotateOperation.h"
 #include "COM_ScaleOperation.h"
 #include "COM_SetSamplerOperation.h"
-#include "COM_TransformOperation.h"
 #include "COM_TranslateOperation.h"
 
-#include "BKE_tracking.h"
-
-#include "DNA_movieclip_types.h"
-
 namespace blender::compositor {
 
 Stabilize2dNode::Stabilize2dNode(bNode *editorNode) : Node(editorNode)
diff --git a/source/blender/compositor/nodes/COM_SwitchViewNode.cc b/source/blender/compositor/nodes/COM_SwitchViewNode.cc
index 395122dd11b..5bf854bb0a0 100644
--- a/source/blender/compositor/nodes/COM_SwitchViewNode.cc
+++ b/source/blender/compositor/nodes/COM_SwitchViewNode.cc
@@ -17,7 +17,6 @@
  */
 
 #include "COM_SwitchViewNode.h"
-#include "BLI_listbase.h"
 
 namespace blender::compositor {
 
diff --git a/source/blender/compositor/nodes/COM_TextureNode.cc b/source/blender/compositor/nodes/COM_TextureNode.cc
index 317355b8c9a..4063e4b4bce 100644
--- a/source/blender/compositor/nodes/COM_TextureNode.cc
+++ b/source/blender/compositor/nodes/COM_TextureNode.cc
@@ -17,7 +17,6 @@
  */
 
 #include "COM_TextureNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_TextureOperation.h"
 
 namespace blender::compositor {
diff --git a/source/blender/compositor/nodes/COM_TimeNode.cc b/source/blender/compositor/nodes/COM_TimeNode.cc
index c14c5344eee..37236959366 100644
--- a/source/blender/compositor/nodes/COM_TimeNode.cc
+++ b/source/blender/compositor/nodes/COM_TimeNode.cc
@@ -17,13 +17,11 @@
  */
 
 #include "COM_TimeNode.h"
-#include "COM_ExecutionSystem.h"
+
 #include "COM_SetValueOperation.h"
 
 #include "BKE_colortools.h"
 
-#include "BLI_utildefines.h"
-
 namespace blender::compositor {
 
 TimeNode::TimeNode(bNode *editorNode) : Node(editorNode)
diff --git a/source/blender/compositor/nodes/COM_TonemapNode.cc b/source/blender/compositor/nodes/COM_TonemapNode.cc
index 844fe3e8cb6..a2b3e84b604 100644
--- a/source/blender/compositor/nodes/COM_TonemapNode.cc
+++ b/source/blender/compositor/nodes/COM_TonemapNode.cc
@@ -17,7 +17,6 @@
  */
 
 #include "COM_TonemapNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_TonemapOperation.h"
 
 namespace blender::compositor {
diff --git a/source/blender/compositor/nodes/COM_TrackPositionNode.cc b/source/blender/compositor/nodes/COM_TrackPositionNode.cc
index 3fb5fc02f20..f683eeb61c2 100644
--- a/source/blender/compositor/nodes/COM_TrackPositionNode.cc
+++ b/source/blender/compositor/nodes/COM_TrackPositionNode.cc
@@ -19,7 +19,6 @@
 #include "COM_TrackPositionNode.h"
 
 #include "COM_ConvertOperation.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_TrackPositionOperation.h"
 
 #include "DNA_movieclip_types.h"
diff --git a/source/blender/compositor/nodes/COM_TransformNode.cc b/source/blender/compositor/nodes/COM_TransformNode.cc
index b38aad78d90..a5b3c41de80 100644
--- a/source/blender/compositor/nodes/COM_TransformNode.cc
+++ b/source/blender/compositor/nodes/COM_TransformNode.cc
@@ -17,12 +17,9 @@
  */
 
 #include "COM_TransformNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_RotateOperation.h"
 #include "COM_ScaleOperation.h"
 #include "COM_SetSamplerOperation.h"
-#include "COM_SetValueOperation.h"
-#include "COM_TransformOperation.h"
 #include "COM_TranslateOperation.h"
 
 namespace blender::compositor {
diff --git a/source/blender/compositor/nodes/COM_TranslateNode.cc b/source/blender/compositor/nodes/COM_TranslateNode.cc
index 165a03baf41..6dbd350fabf 100644
--- a/source/blender/compositor/nodes/COM_TranslateNode.cc
+++ b/source/blender/compositor/nodes/COM_TranslateNode.cc
@@ -18,7 +18,6 @@
 
 #include "COM_TranslateNode.h"
 
-#include "COM_ExecutionSystem.h"
 #include "COM_TranslateOperation.h"
 #include "COM_WrapOperation.h"
 #include "COM_WriteBufferOperation.h"
diff --git a/source/blender/compositor/nodes/COM_ValueNode.cc b/source/blender/compositor/nodes/COM_ValueNode.cc
index 6b640fa2a3a..611353fceba 100644
--- a/source/blender/compositor/nodes/COM_ValueNode.cc
+++ b/source/blender/compositor/nodes/COM_ValueNode.cc
@@ -17,7 +17,6 @@
  */
 
 #include "COM_ValueNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_SetValueOperation.h"
 
 namespace blender::compositor {
diff --git a/source/blender/compositor/nodes/COM_VectorBlurNode.cc b/source/blender/compositor/nodes/COM_VectorBlurNode.cc
index 7aa5f5668c9..2bbfd3591c3 100644
--- a/source/blender/compositor/nodes/COM_VectorBlurNode.cc
+++ b/source/blender/compositor/nodes/COM_VectorBlurNode.cc
@@ -18,7 +18,6 @@
 
 #include "COM_VectorBlurNode.h"
 #include "COM_VectorBlurOperation.h"
-#include "DNA_node_types.h"
 
 namespace blender::compositor {
 
diff --git a/source/blender/compositor/nodes/COM_VectorCurveNode.cc b/source/blender/compositor/nodes/COM_VectorCurveNode.cc
index f2fd80cd93e..2b26056296d 100644
--- a/source/blender/compositor/nodes/COM_VectorCurveNode.cc
+++ b/source/blender/compositor/nodes/COM_VectorCurveNode.cc
@@ -17,7 +17,6 @@
  */
 
 #include "COM_VectorCurveNode.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_VectorCurveOperation.h"
 
 namespace blender::compositor {
diff --git a/source/blender/compositor/nodes/COM_ViewLevelsNode.cc b/source/blender/compositor/nodes/COM_ViewLevelsNode.cc
index 5a03972c89d..605ff9357ab 100644
--- a/source/blender/compositor/nodes/COM_ViewLevelsNode.cc
+++ b/source/blender/compositor/nodes/COM_ViewLevelsNode.cc
@@ -17,10 +17,7 @@
  */
 
 #include "COM_ViewLevelsNode.h"
-#include "COM_CalculateMeanOperation.h"
 #include "COM_CalculateStandardDeviationOperation.h"
-#include "COM_ExecutionSystem.h"
-#include "COM_SetValueOperation.h"
 
 namespace blender::compositor {
 
diff --git a/source/blender/compositor/nodes/COM_ViewerNode.cc b/source/blender/compositor/nodes/COM_ViewerNode.cc
index 4dbcdbe9e40..38ea37a28d6 100644
--- a/source/blender/compositor/nodes/COM_ViewerNode.cc
+++ b/source/blender/compositor/nodes/COM_ViewerNode.cc
@@ -17,12 +17,7 @@
  */
 
 #include "COM_ViewerNode.h"
-#include "BKE_global.h"
-#include "BKE_image.h"
-#include "BKE_scene.h"
-#include "BLI_listbase.h"
 
-#include "COM_ExecutionSystem.h"
 #include "COM_ViewerOperation.h"
 
 namespace blender::compositor {
diff --git a/source/blender/compositor/nodes/COM_ZCombineNode.cc b/source/blender/compositor/nodes/COM_ZCombineNode.cc
index 9753e812a8b..5f7fec53808 100644
--- a/source/blender/compositor/nodes/COM_ZCombineNode.cc
+++ b/source/blender/compositor/nodes/COM_ZCombineNode.cc
@@ -18,15 +18,9 @@
 
 #include "COM_ZCombineNode.h"
 
-#include "COM_ZCombineOperation.h"
-
 #include "COM_AntiAliasOperation.h"
-#include "COM_ExecutionSystem.h"
 #include "COM_MathBaseOperation.h"
-#include "COM_MixOperation.h"
-#include "COM_SetValueOperation.h"
-
-#include "DNA_material_types.h" /* the ramp types */
+#include "COM_ZCombineOperation.h"
 
 namespace blender::compositor {