Cleanup: `make format` after SortedIncludes change

30 files changed, 54 insertions, 54 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index ab8d77e8194..427e4198e5c 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -25,24 +25,24 @@
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
+#include "BPy_Interface1D.h"
+#include "BPy_MediumType.h"
+#include "BPy_Nature.h"
+#include "BPy_SShape.h"
+#include "BPy_StrokeAttribute.h"
+#include "BPy_ViewShape.h"
 #include "Interface0D/BPy_CurvePoint.h"
-#include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
 #include "Interface0D/BPy_SVertex.h"
 #include "Interface0D/BPy_ViewVertex.h"
+#include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
 #include "Interface0D/ViewVertex/BPy_NonTVertex.h"
 #include "Interface0D/ViewVertex/BPy_TVertex.h"
-#include "BPy_Interface1D.h"
 #include "Interface1D/BPy_FEdge.h"
 #include "Interface1D/BPy_Stroke.h"
 #include "Interface1D/BPy_ViewEdge.h"
 #include "Interface1D/Curve/BPy_Chain.h"
 #include "Interface1D/FEdge/BPy_FEdgeSharp.h"
 #include "Interface1D/FEdge/BPy_FEdgeSmooth.h"
-#include "BPy_Nature.h"
-#include "BPy_MediumType.h"
-#include "BPy_SShape.h"
-#include "BPy_StrokeAttribute.h"
-#include "BPy_ViewShape.h"
 
 #include "Iterator/BPy_AdjacencyIterator.h"
 #include "Iterator/BPy_ChainPredicateIterator.h"
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index fffe25fde60..19e0879beff 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -87,8 +87,8 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-#include "mathutils/mathutils.h"
 #include "generic/python_utildefines.h"
+#include "mathutils/mathutils.h"
 
 //==============================
 // C++ => Python
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index a6512a64776..e7fe660cf93 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -53,10 +53,10 @@ extern "C" {
 
 //------------------------ MODULE FUNCTIONS ----------------------------------
 
-#include "FRS_freestyle.h"
-#include "RNA_access.h"
 #include "BKE_appdir.h"
 #include "DNA_scene_types.h"
+#include "FRS_freestyle.h"
+#include "RNA_access.h"
 #include "bpy_rna.h" /* pyrna_struct_CreatePyObject() */
 
 static char Freestyle_getCurrentScene___doc__[] =
@@ -228,8 +228,8 @@ static PyObject *Freestyle_evaluateColorRamp(PyObject * /*self*/, PyObject *args
   return Vector_CreatePyObject(out, 4, NULL);
 }
 
-#include "DNA_color_types.h"
 #include "BKE_colortools.h" /* BKE_curvemapping_evaluateF() */
+#include "DNA_color_types.h"
 
 static char Freestyle_evaluateCurveMappingF___doc__[] =
     ".. function:: evaluateCurveMappingF(cumap, cur, value)\n"
diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
index 0286932146c..98b0099bcad 100644
--- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
@@ -21,10 +21,10 @@
 #include "BPy_IntegrationType.h"
 
 #include "BPy_Convert.h"
+#include "Iterator/BPy_Interface0DIterator.h"
 #include "UnaryFunction0D/BPy_UnaryFunction0DDouble.h"
 #include "UnaryFunction0D/BPy_UnaryFunction0DFloat.h"
 #include "UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h"
-#include "Iterator/BPy_Interface0DIterator.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
index 628a9d43b6c..18e11c55bc4 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
@@ -21,14 +21,14 @@
 #include "BPy_Interface0D.h"
 
 #include "BPy_Convert.h"
+#include "BPy_Nature.h"
 #include "Interface0D/BPy_CurvePoint.h"
-#include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
 #include "Interface0D/BPy_SVertex.h"
 #include "Interface0D/BPy_ViewVertex.h"
+#include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
 #include "Interface0D/ViewVertex/BPy_NonTVertex.h"
 #include "Interface0D/ViewVertex/BPy_TVertex.h"
 #include "Interface1D/BPy_FEdge.h"
-#include "BPy_Nature.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index af1f8d2d549..423b97fe3cd 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -21,13 +21,13 @@
 #include "BPy_Interface1D.h"
 
 #include "BPy_Convert.h"
+#include "Interface1D/BPy_FEdge.h"
 #include "Interface1D/BPy_FrsCurve.h"
+#include "Interface1D/BPy_Stroke.h"
+#include "Interface1D/BPy_ViewEdge.h"
 #include "Interface1D/Curve/BPy_Chain.h"
-#include "Interface1D/BPy_FEdge.h"
 #include "Interface1D/FEdge/BPy_FEdgeSharp.h"
 #include "Interface1D/FEdge/BPy_FEdgeSmooth.h"
-#include "Interface1D/BPy_Stroke.h"
-#include "Interface1D/BPy_ViewEdge.h"
 
 #include "BPy_MediumType.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
index daa2bdbef81..6e00a05b969 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp
@@ -22,15 +22,15 @@
 
 #include "BPy_Convert.h"
 #include "Iterator/BPy_AdjacencyIterator.h"
-#include "Iterator/BPy_Interface0DIterator.h"
+#include "Iterator/BPy_ChainPredicateIterator.h"
+#include "Iterator/BPy_ChainSilhouetteIterator.h"
+#include "Iterator/BPy_ChainingIterator.h"
 #include "Iterator/BPy_CurvePointIterator.h"
-#include "Iterator/BPy_StrokeVertexIterator.h"
+#include "Iterator/BPy_Interface0DIterator.h"
 #include "Iterator/BPy_SVertexIterator.h"
-#include "Iterator/BPy_orientedViewEdgeIterator.h"
+#include "Iterator/BPy_StrokeVertexIterator.h"
 #include "Iterator/BPy_ViewEdgeIterator.h"
-#include "Iterator/BPy_ChainingIterator.h"
-#include "Iterator/BPy_ChainPredicateIterator.h"
-#include "Iterator/BPy_ChainSilhouetteIterator.h"
+#include "Iterator/BPy_orientedViewEdgeIterator.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/BPy_Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp
index 2892d1e9400..510e823ba55 100644
--- a/source/blender/freestyle/intern/python/BPy_Operators.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Operators.cpp
@@ -21,14 +21,14 @@
 #include "BPy_Operators.h"
 
 #include "BPy_BinaryPredicate1D.h"
+#include "BPy_Convert.h"
+#include "BPy_StrokeShader.h"
 #include "BPy_UnaryPredicate0D.h"
 #include "BPy_UnaryPredicate1D.h"
+#include "Iterator/BPy_ChainingIterator.h"
+#include "Iterator/BPy_ViewEdgeIterator.h"
 #include "UnaryFunction0D/BPy_UnaryFunction0DDouble.h"
 #include "UnaryFunction1D/BPy_UnaryFunction1DVoid.h"
-#include "Iterator/BPy_ViewEdgeIterator.h"
-#include "Iterator/BPy_ChainingIterator.h"
-#include "BPy_StrokeShader.h"
-#include "BPy_Convert.h"
 
 #include <sstream>
 
diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp
index d4b5f426a8b..9712dccfa5e 100644
--- a/source/blender/freestyle/intern/python/BPy_SShape.cpp
+++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp
@@ -20,8 +20,8 @@
 
 #include "BPy_SShape.h"
 
-#include "BPy_Convert.h"
 #include "BPy_BBox.h"
+#include "BPy_Convert.h"
 #include "BPy_Id.h"
 #include "Interface0D/BPy_SVertex.h"
 #include "Interface1D/BPy_FEdge.h"
diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
index 1f162997c44..b7b425abe23 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp
@@ -20,8 +20,8 @@
 
 #include "BPy_ViewMap.h"
 
-#include "BPy_Convert.h"
 #include "BPy_BBox.h"
+#include "BPy_Convert.h"
 #include "Interface1D/BPy_FEdge.h"
 #include "Interface1D/BPy_ViewEdge.h"
 
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
index c08e7eea7b9..f59ae15ae01 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp
@@ -21,9 +21,9 @@
 #include "BPy_ViewShape.h"
 
 #include "BPy_Convert.h"
+#include "BPy_SShape.h"
 #include "Interface0D/BPy_ViewVertex.h"
 #include "Interface1D/BPy_ViewEdge.h"
-#include "BPy_SShape.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Director.cpp b/source/blender/freestyle/intern/python/Director.cpp
index c931a246961..0769b30ebb7 100644
--- a/source/blender/freestyle/intern/python/Director.cpp
+++ b/source/blender/freestyle/intern/python/Director.cpp
@@ -26,16 +26,16 @@
 #include "BPy_BinaryPredicate1D.h"
 #include "BPy_FrsMaterial.h"
 #include "BPy_Id.h"
+#include "BPy_StrokeShader.h"
 #include "BPy_UnaryFunction0D.h"
 #include "BPy_UnaryFunction1D.h"
 #include "BPy_UnaryPredicate0D.h"
 #include "BPy_UnaryPredicate1D.h"
-#include "BPy_StrokeShader.h"
-#include "Iterator/BPy_ChainingIterator.h"
-#include "Iterator/BPy_Interface0DIterator.h"
+#include "BPy_ViewShape.h"
 #include "Interface1D/BPy_Stroke.h"
 #include "Interface1D/BPy_ViewEdge.h"
-#include "BPy_ViewShape.h"
+#include "Iterator/BPy_ChainingIterator.h"
+#include "Iterator/BPy_Interface0DIterator.h"
 
 #include "UnaryFunction0D/BPy_UnaryFunction0DDouble.h"
 #include "UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h"
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
index 5ddb8a605ff..c947f37397b 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
@@ -21,8 +21,8 @@
 #include "BPy_ViewVertex.h"
 
 #include "../BPy_Convert.h"
-#include "../Interface1D/BPy_ViewEdge.h"
 #include "../BPy_Nature.h"
+#include "../Interface1D/BPy_ViewEdge.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
index 07373c91726..b4c08714af0 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
@@ -20,8 +20,8 @@
 
 #include "BPy_StrokeVertex.h"
 
-#include "../../BPy_Freestyle.h"
 #include "../../BPy_Convert.h"
+#include "../../BPy_Freestyle.h"
 #include "../../BPy_StrokeAttribute.h"
 #include "../../Interface0D/BPy_SVertex.h"
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
index 8fa48e54b55..61755b4bbd8 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
@@ -21,10 +21,10 @@
 #include "BPy_TVertex.h"
 
 #include "../../BPy_Convert.h"
-#include "../BPy_SVertex.h"
 #include "../../BPy_Id.h"
 #include "../../Interface1D/BPy_FEdge.h"
 #include "../../Interface1D/BPy_ViewEdge.h"
+#include "../BPy_SVertex.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
index adbf01cd777..8a09e7722ea 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
@@ -22,9 +22,9 @@
 
 #include "../BPy_Convert.h"
 #include "../BPy_Id.h"
+#include "../BPy_Nature.h"
 #include "../Interface0D/BPy_SVertex.h"
 #include "../Interface1D/BPy_ViewEdge.h"
-#include "../BPy_Nature.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
index 661d9238edb..3a25ddb0252 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
@@ -22,10 +22,10 @@
 
 #include "../BPy_Convert.h"
 #include "../BPy_Id.h"
+#include "../BPy_MediumType.h"
 #include "../Interface0D/BPy_SVertex.h"
 #include "../Interface0D/CurvePoint/BPy_StrokeVertex.h"
 #include "../Iterator/BPy_StrokeVertexIterator.h"
-#include "../BPy_MediumType.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
index 0570d9790ab..58c2ba69c79 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp
@@ -22,11 +22,11 @@
 
 #include "../BPy_Convert.h"
 #include "../BPy_Id.h"
+#include "../BPy_Nature.h"
+#include "../BPy_ViewShape.h"
 #include "../Interface0D/BPy_ViewVertex.h"
 #include "../Interface1D/BPy_FEdge.h"
 #include "../Interface1D/BPy_ViewEdge.h"
-#include "../BPy_Nature.h"
-#include "../BPy_ViewShape.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
index 28b8e9d7c0a..164e1646934 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp
@@ -20,10 +20,10 @@
 
 #include "BPy_ChainPredicateIterator.h"
 
-#include "../BPy_Convert.h"
 #include "../BPy_BinaryPredicate1D.h"
-#include "../Interface1D/BPy_ViewEdge.h"
+#include "../BPy_Convert.h"
 #include "../BPy_UnaryPredicate1D.h"
+#include "../Interface1D/BPy_ViewEdge.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
index 586f7ec40e5..4f559a09ba9 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
@@ -23,8 +23,8 @@
 
 #include "../BPy_UnaryFunction0D.h"
 
-#include <vector>
 #include "../../view_map/ViewMap.h"
+#include <vector>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
index 543375fa85b..fb887371c3a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
@@ -21,8 +21,8 @@
 #include "BPy_UnaryFunction1DDouble.h"
 
 #include "../BPy_Convert.h"
-#include "../BPy_Interface1D.h"
 #include "../BPy_IntegrationType.h"
+#include "../BPy_Interface1D.h"
 
 #include "UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h"
 #include "UnaryFunction1D_double/BPy_DensityF1D.h"
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
index fcc72cf7b71..e2a55d49a06 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp
@@ -21,8 +21,8 @@
 #include "BPy_UnaryFunction1DEdgeNature.h"
 
 #include "../BPy_Convert.h"
-#include "../BPy_Interface1D.h"
 #include "../BPy_IntegrationType.h"
+#include "../BPy_Interface1D.h"
 
 #include "UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h"
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
index ef4de9a77dc..2eb4f9349da 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp
@@ -21,8 +21,8 @@
 #include "BPy_UnaryFunction1DFloat.h"
 
 #include "../BPy_Convert.h"
-#include "../BPy_Interface1D.h"
 #include "../BPy_IntegrationType.h"
+#include "../BPy_Interface1D.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
index 5be9e2dee28..ff306652036 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp
@@ -21,8 +21,8 @@
 #include "BPy_UnaryFunction1DUnsigned.h"
 
 #include "../BPy_Convert.h"
-#include "../BPy_Interface1D.h"
 #include "../BPy_IntegrationType.h"
+#include "../BPy_Interface1D.h"
 
 #include "UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h"
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
index 58ab705e8c1..1469b0a6e33 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp
@@ -21,8 +21,8 @@
 #include "BPy_UnaryFunction1DVec2f.h"
 
 #include "../BPy_Convert.h"
-#include "../BPy_Interface1D.h"
 #include "../BPy_IntegrationType.h"
+#include "../BPy_Interface1D.h"
 
 #include "UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h"
 #include "UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h"
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
index e1f64e7cd82..63cd0584adb 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
@@ -21,8 +21,8 @@
 #include "BPy_UnaryFunction1DVec3f.h"
 
 #include "../BPy_Convert.h"
-#include "../BPy_Interface1D.h"
 #include "../BPy_IntegrationType.h"
+#include "../BPy_Interface1D.h"
 
 #include "UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h"
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
index 12b985bc707..cb94d6b75e2 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp
@@ -21,8 +21,8 @@
 #include "BPy_UnaryFunction1DVectorViewShape.h"
 
 #include "../BPy_Convert.h"
-#include "../BPy_Interface1D.h"
 #include "../BPy_IntegrationType.h"
+#include "../BPy_Interface1D.h"
 
 #include "UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h"
 #include "UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h"
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
index 2869b364ea6..80511e7c145 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
@@ -23,8 +23,8 @@
 
 #include "../BPy_UnaryFunction1D.h"
 
-#include <vector>
 #include "../../view_map/ViewMap.h"
+#include <vector>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
index 3b55a20939e..216b1305556 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp
@@ -21,8 +21,8 @@
 #include "BPy_UnaryFunction1DVoid.h"
 
 #include "../BPy_Convert.h"
-#include "../BPy_Interface1D.h"
 #include "../BPy_IntegrationType.h"
+#include "../BPy_Interface1D.h"
 
 #include "UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h"
 #include "UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h"
diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.h b/source/blender/freestyle/intern/scene_graph/SceneHash.h
index cf24c5a21fb..53d1381da60 100644
--- a/source/blender/freestyle/intern/scene_graph/SceneHash.h
+++ b/source/blender/freestyle/intern/scene_graph/SceneHash.h
@@ -22,8 +22,8 @@
  */
 
 #include "IndexedFaceSet.h"
-#include "NodeViewLayer.h"
 #include "NodeCamera.h"
+#include "NodeViewLayer.h"
 #include "SceneVisitor.h"
 
 #include "BLI_sys_types.h"