Cleanup: `make format` after SortedIncludes change

48 files changed, 81 insertions, 81 deletions

diff --git a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
index 7fb9d839d2d..377276777f0 100644
--- a/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
+++ b/source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h
@@ -18,9 +18,9 @@
 
 #ifndef __COM_CALCULATESTANDARDDEVIATIONOPERATION_H__
 #define __COM_CALCULATESTANDARDDEVIATIONOPERATION_H__
+#include "COM_CalculateMeanOperation.h"
 #include "COM_NodeOperation.h"
 #include "DNA_node_types.h"
-#include "COM_CalculateMeanOperation.h"
 /**
  * \brief base class of CalculateStandardDeviation,
  * implementing the simple CalculateStandardDeviation.
diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.h b/source/blender/compositor/operations/COM_ColorCurveOperation.h
index 1d6a9185732..7869d1c4a56 100644
--- a/source/blender/compositor/operations/COM_ColorCurveOperation.h
+++ b/source/blender/compositor/operations/COM_ColorCurveOperation.h
@@ -18,9 +18,9 @@
 
 #ifndef __COM_COLORCURVEOPERATION_H__
 #define __COM_COLORCURVEOPERATION_H__
+#include "COM_CurveBaseOperation.h"
 #include "COM_NodeOperation.h"
 #include "DNA_color_types.h"
-#include "COM_CurveBaseOperation.h"
 
 class ColorCurveOperation : public CurveBaseOperation {
  private:
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp
index 20ea7009105..cb41071e6f0 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.cpp
+++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp
@@ -17,16 +17,16 @@
  */
 
 #include "COM_CompositorOperation.h"
-#include "MEM_guardedalloc.h"
-#include "BLI_listbase.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
+#include "BLI_listbase.h"
+#include "MEM_guardedalloc.h"
 
 extern "C" {
 #include "BLI_threads.h"
 #include "RE_pipeline.h"
-#include "RE_shader_ext.h"
 #include "RE_render_ext.h"
+#include "RE_shader_ext.h"
 #include "render_types.h"
 }
 #include "PIL_time.h"
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h
index d24fc49059c..8db8fe00d3c 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.h
+++ b/source/blender/compositor/operations/COM_CompositorOperation.h
@@ -18,9 +18,9 @@
 
 #ifndef __COM_COMPOSITOROPERATION_H__
 #define __COM_COMPOSITOROPERATION_H__
-#include "COM_NodeOperation.h"
 #include "BLI_rect.h"
 #include "BLI_string.h"
+#include "COM_NodeOperation.h"
 
 struct Scene;
 
diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
index 704f7cfad39..66043abd951 100644
--- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "COM_ConvertDepthToRadiusOperation.h"
-#include "BLI_math.h"
 #include "BKE_camera.h"
+#include "BLI_math.h"
 #include "DNA_camera_types.h"
 
 ConvertDepthToRadiusOperation::ConvertDepthToRadiusOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
index f375d6efb8f..7c3e0ed9738 100644
--- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
+++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h
@@ -18,9 +18,9 @@
 
 #ifndef __COM_CONVERTDEPTHTORADIUSOPERATION_H__
 #define __COM_CONVERTDEPTHTORADIUSOPERATION_H__
+#include "COM_FastGaussianBlurOperation.h"
 #include "COM_NodeOperation.h"
 #include "DNA_object_types.h"
-#include "COM_FastGaussianBlurOperation.h"
 /**
  * this program converts an input color to an output value.
  * it assumes we are in sRGB color space.
diff --git a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
index 48880fb2b59..1cb477bc05d 100644
--- a/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
+++ b/source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h
@@ -18,8 +18,8 @@
 
 #ifndef __COM_DISTANCEYCCMATTEOPERATION_H__
 #define __COM_DISTANCEYCCMATTEOPERATION_H__
-#include "COM_MixOperation.h"
 #include "COM_DistanceRGBMatteOperation.h"
+#include "COM_MixOperation.h"
 
 /**
  * this program converts an input color to an output value.
diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
index f872388e3c7..22949a8e6f1 100644
--- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
@@ -18,8 +18,8 @@
 
 #include <stdlib.h>
 
-#include "COM_DoubleEdgeMaskOperation.h"
 #include "BLI_math.h"
+#include "COM_DoubleEdgeMaskOperation.h"
 #include "DNA_node_types.h"
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
index 3058a5990c6..7a6b69d12fa 100644
--- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
@@ -18,9 +18,9 @@
 
 #include <limits.h>
 
+#include "BLI_utildefines.h"
 #include "COM_FastGaussianBlurOperation.h"
 #include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
 
 FastGaussianBlurOperation::FastGaussianBlurOperation() : BlurBaseOperation(COM_DT_COLOR)
 {
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
index 4d249778f53..9de75ff53a7 100644
--- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h
@@ -18,8 +18,8 @@
 
 #ifndef __COM_GAUSSIANALPHAXBLUROPERATION_H__
 #define __COM_GAUSSIANALPHAXBLUROPERATION_H__
-#include "COM_NodeOperation.h"
 #include "COM_BlurBaseOperation.h"
+#include "COM_NodeOperation.h"
 
 class GaussianAlphaXBlurOperation : public BlurBaseOperation {
  private:
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
index d31534455bc..44689922bfc 100644
--- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h
@@ -18,8 +18,8 @@
 
 #ifndef __COM_GAUSSIANALPHAYBLUROPERATION_H__
 #define __COM_GAUSSIANALPHAYBLUROPERATION_H__
-#include "COM_NodeOperation.h"
 #include "COM_BlurBaseOperation.h"
+#include "COM_NodeOperation.h"
 
 class GaussianAlphaYBlurOperation : public BlurBaseOperation {
  private:
diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
index 99e22cf91c3..3aa380853bd 100644
--- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
@@ -18,8 +18,8 @@
 
 #ifndef __COM_GAUSSIANBOKEHBLUROPERATION_H__
 #define __COM_GAUSSIANBOKEHBLUROPERATION_H__
-#include "COM_NodeOperation.h"
 #include "COM_BlurBaseOperation.h"
+#include "COM_NodeOperation.h"
 #include "COM_QualityStepHelper.h"
 
 class GaussianBokehBlurOperation : public BlurBaseOperation {
diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
index 29a50f5350a..68cde0d365f 100644
--- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "COM_GaussianXBlurOperation.h"
-#include "COM_OpenCLDevice.h"
 #include "BLI_math.h"
+#include "COM_OpenCLDevice.h"
 #include "MEM_guardedalloc.h"
 
 extern "C" {
diff --git a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
index 3ebe52cfcce..c5c08df8ce7 100644
--- a/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianXBlurOperation.h
@@ -18,8 +18,8 @@
 
 #ifndef __COM_GAUSSIANXBLUROPERATION_H__
 #define __COM_GAUSSIANXBLUROPERATION_H__
-#include "COM_NodeOperation.h"
 #include "COM_BlurBaseOperation.h"
+#include "COM_NodeOperation.h"
 
 class GaussianXBlurOperation : public BlurBaseOperation {
  private:
diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
index 500e0fbedc3..eeddd98d4a4 100644
--- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
@@ -17,8 +17,8 @@
  */
 
 #include "COM_GaussianYBlurOperation.h"
-#include "COM_OpenCLDevice.h"
 #include "BLI_math.h"
+#include "COM_OpenCLDevice.h"
 #include "MEM_guardedalloc.h"
 
 extern "C" {
diff --git a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
index ce8e0a7b781..92154aa7518 100644
--- a/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
+++ b/source/blender/compositor/operations/COM_GaussianYBlurOperation.h
@@ -18,8 +18,8 @@
 
 #ifndef __COM_GAUSSIANYBLUROPERATION_H__
 #define __COM_GAUSSIANYBLUROPERATION_H__
-#include "COM_NodeOperation.h"
 #include "COM_BlurBaseOperation.h"
+#include "COM_NodeOperation.h"
 
 class GaussianYBlurOperation : public BlurBaseOperation {
  private:
diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.h b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h
index 45067457778..dae0b714e56 100644
--- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.h
+++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.h
@@ -18,9 +18,9 @@
 
 #ifndef __COM_GLAREFOGGLOWOPERATION_H__
 #define __COM_GLAREFOGGLOWOPERATION_H__
+#include "COM_GlareBaseOperation.h"
 #include "COM_NodeOperation.h"
 #include "DNA_node_types.h"
-#include "COM_GlareBaseOperation.h"
 
 class GlareFogGlowOperation : public GlareBaseOperation {
  public:
diff --git a/source/blender/compositor/operations/COM_GlareGhostOperation.h b/source/blender/compositor/operations/COM_GlareGhostOperation.h
index c89c239e4d1..c0b41762c8a 100644
--- a/source/blender/compositor/operations/COM_GlareGhostOperation.h
+++ b/source/blender/compositor/operations/COM_GlareGhostOperation.h
@@ -18,9 +18,9 @@
 
 #ifndef __COM_GLAREGHOSTOPERATION_H__
 #define __COM_GLAREGHOSTOPERATION_H__
+#include "COM_GlareBaseOperation.h"
 #include "COM_NodeOperation.h"
 #include "DNA_node_types.h"
-#include "COM_GlareBaseOperation.h"
 
 class GlareGhostOperation : public GlareBaseOperation {
  public:
diff --git a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
index a40dfac86ff..b6e2e499f64 100644
--- a/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
+++ b/source/blender/compositor/operations/COM_GlareSimpleStarOperation.h
@@ -18,9 +18,9 @@
 
 #ifndef __COM_GLARESIMPLESTAROPERATION_H__
 #define __COM_GLARESIMPLESTAROPERATION_H__
+#include "COM_GlareBaseOperation.h"
 #include "COM_NodeOperation.h"
 #include "DNA_node_types.h"
-#include "COM_GlareBaseOperation.h"
 
 class GlareSimpleStarOperation : public GlareBaseOperation {
  public:
diff --git a/source/blender/compositor/operations/COM_GlareStreaksOperation.h b/source/blender/compositor/operations/COM_GlareStreaksOperation.h
index 9150b5e4641..9f137f90b71 100644
--- a/source/blender/compositor/operations/COM_GlareStreaksOperation.h
+++ b/source/blender/compositor/operations/COM_GlareStreaksOperation.h
@@ -18,9 +18,9 @@
 
 #ifndef __COM_GLARESTREAKSOPERATION_H__
 #define __COM_GLARESTREAKSOPERATION_H__
+#include "COM_GlareBaseOperation.h"
 #include "COM_NodeOperation.h"
 #include "DNA_node_types.h"
-#include "COM_GlareBaseOperation.h"
 
 class GlareStreaksOperation : public GlareBaseOperation {
  public:
diff --git a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
index 3e212b96521..0624a5c022f 100644
--- a/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
+++ b/source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h
@@ -18,8 +18,8 @@
 
 #ifndef __COM_HUESATURATIONVALUECORRECTOPERATION_H__
 #define __COM_HUESATURATIONVALUECORRECTOPERATION_H__
-#include "COM_NodeOperation.h"
 #include "COM_CurveBaseOperation.h"
+#include "COM_NodeOperation.h"
 
 class HueSaturationValueCorrectOperation : public CurveBaseOperation {
  private:
diff --git a/source/blender/compositor/operations/COM_ImageOperation.cpp b/source/blender/compositor/operations/COM_ImageOperation.cpp
index 3a60b1c84a3..d70cab4ad2a 100644
--- a/source/blender/compositor/operations/COM_ImageOperation.cpp
+++ b/source/blender/compositor/operations/COM_ImageOperation.cpp
@@ -18,19 +18,19 @@
 
 #include "COM_ImageOperation.h"
 
-#include "BLI_listbase.h"
-#include "DNA_image_types.h"
 #include "BKE_image.h"
 #include "BKE_scene.h"
+#include "BLI_listbase.h"
 #include "BLI_math.h"
+#include "DNA_image_types.h"
 
 extern "C" {
-#include "RE_pipeline.h"
-#include "RE_shader_ext.h"
-#include "RE_render_ext.h"
+#include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-#include "IMB_colormanagement.h"
+#include "RE_pipeline.h"
+#include "RE_render_ext.h"
+#include "RE_shader_ext.h"
 }
 
 BaseImageOperation::BaseImageOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_ImageOperation.h b/source/blender/compositor/operations/COM_ImageOperation.h
index 7eb2471ba67..57656d03092 100644
--- a/source/blender/compositor/operations/COM_ImageOperation.h
+++ b/source/blender/compositor/operations/COM_ImageOperation.h
@@ -19,15 +19,15 @@
 #ifndef __COM_IMAGEOPERATION_H__
 #define __COM_IMAGEOPERATION_H__
 
-#include "COM_NodeOperation.h"
-#include "MEM_guardedalloc.h"
+#include "BKE_image.h"
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
-#include "BKE_image.h"
+#include "COM_NodeOperation.h"
+#include "MEM_guardedalloc.h"
 extern "C" {
 #include "RE_pipeline.h"
-#include "RE_shader_ext.h"
 #include "RE_render_ext.h"
+#include "RE_shader_ext.h"
 }
 
 /**
diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h
index 531d6ef1b08..45363ea5220 100644
--- a/source/blender/compositor/operations/COM_MaskOperation.h
+++ b/source/blender/compositor/operations/COM_MaskOperation.h
@@ -19,9 +19,9 @@
 #ifndef __COM_MASKOPERATION_H__
 #define __COM_MASKOPERATION_H__
 
+#include "BLI_listbase.h"
 #include "COM_NodeOperation.h"
 #include "DNA_mask_types.h"
-#include "BLI_listbase.h"
 #include "IMB_imbuf_types.h"
 
 /**
diff --git a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
index 967fa7ad653..4f5d7f6f00b 100644
--- a/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
+++ b/source/blender/compositor/operations/COM_MovieClipAttributeOperation.cpp
@@ -18,8 +18,8 @@
 
 #include "COM_MovieClipAttributeOperation.h"
 extern "C" {
-#include "BKE_tracking.h"
 #include "BKE_movieclip.h"
+#include "BKE_tracking.h"
 }
 MovieClipAttributeOperation::MovieClipAttributeOperation() : NodeOperation()
 {
diff --git a/source/blender/compositor/operations/COM_MovieClipOperation.h b/source/blender/compositor/operations/COM_MovieClipOperation.h
index 8d2dd99afc0..7ae85eac25e 100644
--- a/source/blender/compositor/operations/COM_MovieClipOperation.h
+++ b/source/blender/compositor/operations/COM_MovieClipOperation.h
@@ -19,9 +19,9 @@
 #ifndef __COM_MOVIECLIPOPERATION_H__
 #define __COM_MOVIECLIPOPERATION_H__
 
+#include "BLI_listbase.h"
 #include "COM_NodeOperation.h"
 #include "DNA_movieclip_types.h"
-#include "BLI_listbase.h"
 #include "IMB_imbuf_types.h"
 
 /**
diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
index be354ba5a12..ec858ee2c19 100644
--- a/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
+++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.cpp
@@ -19,8 +19,8 @@
 #include "COM_MovieDistortionOperation.h"
 
 extern "C" {
-#include "BKE_tracking.h"
 #include "BKE_movieclip.h"
+#include "BKE_tracking.h"
 #include "BLI_linklist.h"
 }
 
diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
index 444af5c4cf7..65f4eeeb8bb 100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp
@@ -16,8 +16,8 @@
  * Copyright 2015, Blender Foundation.
  */
 
-#include "COM_OutputFileOperation.h"
 #include "COM_OutputFileMultiViewOperation.h"
+#include "COM_OutputFileOperation.h"
 
 #include <string.h>
 
@@ -34,8 +34,8 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-#include "IMB_imbuf.h"
 #include "IMB_colormanagement.h"
+#include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 }
 
diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
index 42457475848..609448c0bcb 100644
--- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h
@@ -21,8 +21,8 @@
 #include "COM_NodeOperation.h"
 #include "COM_OutputFileOperation.h"
 
-#include "BLI_rect.h"
 #include "BLI_path_util.h"
+#include "BLI_rect.h"
 
 #include "DNA_color_types.h"
 
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp
index 334eab6ef95..efe01d0b5cc 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp
@@ -33,8 +33,8 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
-#include "IMB_imbuf.h"
 #include "IMB_colormanagement.h"
+#include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 }
 
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h
index 3ffba6b374e..d00d1d0dc0d 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.h
@@ -20,8 +20,8 @@
 #define __COM_OUTPUTFILEOPERATION_H__
 #include "COM_NodeOperation.h"
 
-#include "BLI_rect.h"
 #include "BLI_path_util.h"
+#include "BLI_rect.h"
 
 #include "DNA_color_types.h"
 
diff --git a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp
index 78a83391ed1..07053d01d43 100644
--- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp
+++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp
@@ -21,10 +21,10 @@
 #include "MEM_guardedalloc.h"
 
 extern "C" {
+#include "BLI_jitter_2d.h"
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_math_color.h"
-#include "BLI_jitter_2d.h"
 
 #include "BKE_movieclip.h"
 #include "BKE_node.h"
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cpp b/source/blender/compositor/operations/COM_PreviewOperation.cpp
index b91c3324f87..e9e1b4a8cd9 100644
--- a/source/blender/compositor/operations/COM_PreviewOperation.cpp
+++ b/source/blender/compositor/operations/COM_PreviewOperation.cpp
@@ -17,21 +17,21 @@
  */
 
 #include "COM_PreviewOperation.h"
-#include "BLI_listbase.h"
 #include "BKE_image.h"
-#include "WM_api.h"
-#include "WM_types.h"
-#include "PIL_time.h"
-#include "BLI_utildefines.h"
+#include "BLI_listbase.h"
+#include "BLI_math.h"
 #include "BLI_math_color.h"
+#include "BLI_utildefines.h"
 #include "COM_defines.h"
-#include "BLI_math.h"
 #include "MEM_guardedalloc.h"
+#include "PIL_time.h"
+#include "WM_api.h"
+#include "WM_types.h"
 extern "C" {
+#include "BKE_node.h"
+#include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-#include "IMB_colormanagement.h"
-#include "BKE_node.h"
 }
 
 PreviewOperation::PreviewOperation(const ColorManagedViewSettings *viewSettings,
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h
index 6560db727a8..f31bd533971 100644
--- a/source/blender/compositor/operations/COM_PreviewOperation.h
+++ b/source/blender/compositor/operations/COM_PreviewOperation.h
@@ -18,11 +18,11 @@
 
 #ifndef __COM_PREVIEWOPERATION_H__
 #define __COM_PREVIEWOPERATION_H__
+#include "BKE_global.h"
+#include "BLI_rect.h"
 #include "COM_NodeOperation.h"
-#include "DNA_image_types.h"
 #include "DNA_color_types.h"
-#include "BLI_rect.h"
-#include "BKE_global.h"
+#include "DNA_image_types.h"
 
 class PreviewOperation : public NodeOperation {
  protected:
diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.h b/source/blender/compositor/operations/COM_ReadBufferOperation.h
index fee6555c3a9..60d064a5582 100644
--- a/source/blender/compositor/operations/COM_ReadBufferOperation.h
+++ b/source/blender/compositor/operations/COM_ReadBufferOperation.h
@@ -19,9 +19,9 @@
 #ifndef __COM_READBUFFEROPERATION_H__
 #define __COM_READBUFFEROPERATION_H__
 
-#include "COM_NodeOperation.h"
-#include "COM_MemoryProxy.h"
 #include "COM_MemoryBuffer.h"
+#include "COM_MemoryProxy.h"
+#include "COM_NodeOperation.h"
 
 class ReadBufferOperation : public NodeOperation {
  private:
diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp
index 3c0b01874aa..722aab329d7 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp
@@ -18,14 +18,14 @@
 
 #include "COM_RenderLayersProg.h"
 
-#include "BLI_listbase.h"
 #include "BKE_scene.h"
+#include "BLI_listbase.h"
 #include "DNA_scene_types.h"
 
 extern "C" {
 #include "RE_pipeline.h"
-#include "RE_shader_ext.h"
 #include "RE_render_ext.h"
+#include "RE_shader_ext.h"
 }
 
 /* ******** Render Layers Base Prog ******** */
diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.h b/source/blender/compositor/operations/COM_RenderLayersProg.h
index c0b759e68ba..cb47725b749 100644
--- a/source/blender/compositor/operations/COM_RenderLayersProg.h
+++ b/source/blender/compositor/operations/COM_RenderLayersProg.h
@@ -19,11 +19,11 @@
 #ifndef __COM_RENDERLAYERSPROG_H__
 #define __COM_RENDERLAYERSPROG_H__
 
-#include "COM_NodeOperation.h"
-#include "MEM_guardedalloc.h"
-#include "DNA_scene_types.h"
 #include "BLI_listbase.h"
 #include "BLI_utildefines.h"
+#include "COM_NodeOperation.h"
+#include "DNA_scene_types.h"
+#include "MEM_guardedalloc.h"
 extern "C" {
 #include "RE_pipeline.h"
 }
diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
index 94224ac77a6..1afc6d9477f 100644
--- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
+++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
@@ -20,8 +20,8 @@
 
 extern "C" {
 #include "BLI_math.h"
-#include "BLI_utildefines.h"
 #include "BLI_rand.h"
+#include "BLI_utildefines.h"
 #include "PIL_time.h"
 }
 
diff --git a/source/blender/compositor/operations/COM_SplitOperation.cpp b/source/blender/compositor/operations/COM_SplitOperation.cpp
index 437b20d14d4..1862fde2d40 100644
--- a/source/blender/compositor/operations/COM_SplitOperation.cpp
+++ b/source/blender/compositor/operations/COM_SplitOperation.cpp
@@ -17,11 +17,11 @@
  */
 
 #include "COM_SplitOperation.h"
-#include "BLI_listbase.h"
 #include "BKE_image.h"
-#include "BLI_utildefines.h"
+#include "BLI_listbase.h"
 #include "BLI_math_color.h"
 #include "BLI_math_vector.h"
+#include "BLI_utildefines.h"
 #include "MEM_guardedalloc.h"
 
 extern "C" {
diff --git a/source/blender/compositor/operations/COM_TextureOperation.cpp b/source/blender/compositor/operations/COM_TextureOperation.cpp
index e09ccbb016a..0a27a6916b7 100644
--- a/source/blender/compositor/operations/COM_TextureOperation.cpp
+++ b/source/blender/compositor/operations/COM_TextureOperation.cpp
@@ -19,9 +19,9 @@
 #include "COM_TextureOperation.h"
 #include "COM_WorkScheduler.h"
 
+#include "BKE_image.h"
 #include "BLI_listbase.h"
 #include "BLI_threads.h"
-#include "BKE_image.h"
 
 extern "C" {
 #include "BKE_node.h"
diff --git a/source/blender/compositor/operations/COM_TextureOperation.h b/source/blender/compositor/operations/COM_TextureOperation.h
index 6b44c11f423..0d06ac0bc27 100644
--- a/source/blender/compositor/operations/COM_TextureOperation.h
+++ b/source/blender/compositor/operations/COM_TextureOperation.h
@@ -19,14 +19,14 @@
 #ifndef __COM_TEXTUREOPERATION_H__
 #define __COM_TEXTUREOPERATION_H__
 
+#include "BLI_listbase.h"
 #include "COM_NodeOperation.h"
 #include "DNA_texture_types.h"
-#include "BLI_listbase.h"
 #include "MEM_guardedalloc.h"
 extern "C" {
 #include "RE_pipeline.h"
-#include "RE_shader_ext.h"
 #include "RE_render_ext.h"
+#include "RE_shader_ext.h"
 }
 
 /**
diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
index 80df13966b1..83ae1a0526d 100644
--- a/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_VectorBlurOperation.cpp
@@ -16,9 +16,9 @@
  * Copyright 2011, Blender Foundation.
  */
 
-#include <string.h>
-#include "MEM_guardedalloc.h"
 #include "BLI_math.h"
+#include "MEM_guardedalloc.h"
+#include <string.h>
 extern "C" {
 #include "BLI_jitter_2d.h"
 }
diff --git a/source/blender/compositor/operations/COM_VectorBlurOperation.h b/source/blender/compositor/operations/COM_VectorBlurOperation.h
index aedc0d85a50..3caf5c5c8e4 100644
--- a/source/blender/compositor/operations/COM_VectorBlurOperation.h
+++ b/source/blender/compositor/operations/COM_VectorBlurOperation.h
@@ -19,8 +19,8 @@
 #ifndef __COM_VECTORBLUROPERATION_H__
 #define __COM_VECTORBLUROPERATION_H__
 #include "COM_NodeOperation.h"
-#include "DNA_node_types.h"
 #include "COM_QualityStepHelper.h"
+#include "DNA_node_types.h"
 
 class VectorBlurOperation : public NodeOperation, public QualityStepHelper {
  private:
diff --git a/source/blender/compositor/operations/COM_VectorCurveOperation.h b/source/blender/compositor/operations/COM_VectorCurveOperation.h
index c8575de6aa8..65441dbdfb7 100644
--- a/source/blender/compositor/operations/COM_VectorCurveOperation.h
+++ b/source/blender/compositor/operations/COM_VectorCurveOperation.h
@@ -18,8 +18,8 @@
 
 #ifndef __COM_VECTORCURVEOPERATION_H__
 #define __COM_VECTORCURVEOPERATION_H__
-#include "COM_NodeOperation.h"
 #include "COM_CurveBaseOperation.h"
+#include "COM_NodeOperation.h"
 
 class VectorCurveOperation : public CurveBaseOperation {
  private:
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp
index 96c6320ff01..5c32b9962f4 100644
--- a/source/blender/compositor/operations/COM_ViewerOperation.cpp
+++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp
@@ -17,21 +17,21 @@
  */
 
 #include "COM_ViewerOperation.h"
-#include "BLI_listbase.h"
 #include "BKE_image.h"
 #include "BKE_scene.h"
-#include "WM_api.h"
-#include "WM_types.h"
-#include "PIL_time.h"
-#include "BLI_utildefines.h"
+#include "BLI_listbase.h"
 #include "BLI_math_color.h"
 #include "BLI_math_vector.h"
+#include "BLI_utildefines.h"
 #include "MEM_guardedalloc.h"
+#include "PIL_time.h"
+#include "WM_api.h"
+#include "WM_types.h"
 
 extern "C" {
+#include "IMB_colormanagement.h"
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
-#include "IMB_colormanagement.h"
 }
 
 ViewerOperation::ViewerOperation() : NodeOperation()
diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h
index 9a6239ca32e..aae2e912804 100644
--- a/source/blender/compositor/operations/COM_ViewerOperation.h
+++ b/source/blender/compositor/operations/COM_ViewerOperation.h
@@ -18,10 +18,10 @@
 
 #ifndef __COM_VIEWEROPERATION_H__
 #define __COM_VIEWEROPERATION_H__
+#include "BKE_global.h"
+#include "BLI_rect.h"
 #include "COM_NodeOperation.h"
 #include "DNA_image_types.h"
-#include "BLI_rect.h"
-#include "BKE_global.h"
 
 class ViewerOperation : public NodeOperation {
  private:
diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
index 6c5e45472a8..8cc53f8c6a9 100644
--- a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
+++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
@@ -17,9 +17,9 @@
  */
 
 #include "COM_WriteBufferOperation.h"
+#include "COM_OpenCLDevice.h"
 #include "COM_defines.h"
 #include <stdio.h>
-#include "COM_OpenCLDevice.h"
 
 WriteBufferOperation::WriteBufferOperation(DataType datatype) : NodeOperation()
 {
diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.h b/source/blender/compositor/operations/COM_WriteBufferOperation.h
index 83f7ed1ae56..be525db4420 100644
--- a/source/blender/compositor/operations/COM_WriteBufferOperation.h
+++ b/source/blender/compositor/operations/COM_WriteBufferOperation.h
@@ -19,8 +19,8 @@
 #ifndef __COM_WRITEBUFFEROPERATION_H__
 #define __COM_WRITEBUFFEROPERATION_H__
 
-#include "COM_NodeOperation.h"
 #include "COM_MemoryProxy.h"
+#include "COM_NodeOperation.h"
 #include "COM_SocketReader.h"
 /**
  * \brief NodeOperation to write to a tile