Cleanup: tweak Freestyle #includes in preparation for clang-format sorting

38 files changed, 78 insertions, 1 deletions

diff --git a/source/blender/freestyle/FRS_precomp.h b/source/blender/freestyle/FRS_precomp.h
index 37b15ae4504..52f5b58aed0 100644
--- a/source/blender/freestyle/FRS_precomp.h
+++ b/source/blender/freestyle/FRS_precomp.h
@@ -1,4 +1,6 @@
 /* Pre-compiled headers, see: D2606. */
+
+/* clang-format off */
 #include <Python.h>
 #include <pthread.h>
 #include <string>
@@ -45,3 +47,5 @@
 #include "intern/python/BPy_ViewMap.h"
 #include "intern/python/BPy_ViewShape.h"
 #include "intern/python/Director.h"
+
+/* clang-format on */
diff --git a/source/blender/freestyle/intern/application/AppCanvas.cpp b/source/blender/freestyle/intern/application/AppCanvas.cpp
index b9f1d915e34..1f3aea65e24 100644
--- a/source/blender/freestyle/intern/application/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/application/AppCanvas.cpp
@@ -18,6 +18,7 @@
  * \ingroup freestyle
  */
 
+/* clang-format off */
 #include "Controller.h"
 #include "AppView.h"
 #include "../image/Image.h"
@@ -28,7 +29,7 @@
 #include "../stroke/StyleModule.h"
 
 #include "../system/StringUtils.h"
-
+/* clang-format on */
 namespace Freestyle {
 
 AppCanvas::AppCanvas() : Canvas()
diff --git a/source/blender/freestyle/intern/application/AppConfig.h b/source/blender/freestyle/intern/application/AppConfig.h
index 9369ed81d50..725b29e7dd8 100644
--- a/source/blender/freestyle/intern/application/AppConfig.h
+++ b/source/blender/freestyle/intern/application/AppConfig.h
@@ -22,6 +22,7 @@
  * \brief Configuration file
  */
 
+/* clang-format off */
 #include <string>
 #include <algorithm>
 #include "../system/Precision.h"
@@ -29,6 +30,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/application/AppView.cpp b/source/blender/freestyle/intern/application/AppView.cpp
index e352e77f7ea..771d4b0fca8 100644
--- a/source/blender/freestyle/intern/application/AppView.cpp
+++ b/source/blender/freestyle/intern/application/AppView.cpp
@@ -18,6 +18,7 @@
  * \ingroup freestyle
  */
 
+/* clang-format off */
 #include <iostream>
 
 #include "Controller.h"
@@ -45,6 +46,7 @@ extern "C" {
 
 #include "FRS_freestyle.h"
 }
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/application/AppView.h b/source/blender/freestyle/intern/application/AppView.h
index deb099349cb..4c60b1515f3 100644
--- a/source/blender/freestyle/intern/application/AppView.h
+++ b/source/blender/freestyle/intern/application/AppView.h
@@ -21,6 +21,7 @@
  * \ingroup freestyle
  */
 
+/* clang-format off */
 #include "AppConfig.h"
 #include "../geometry/Geom.h"
 #include "../geometry/BBox.h"
@@ -32,6 +33,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index c852cda6c8c..f7da64624e0 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -18,6 +18,7 @@
  * \ingroup freestyle
  */
 
+/* clang-format off */
 extern "C" {
 #include <Python.h>
 }
@@ -69,6 +70,7 @@ extern "C" {
 #include "DNA_freestyle_types.h"
 
 #include "FRS_freestyle.h"
+/* clang-format off */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
index 7bdf607d981..fe93b179eb6 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
@@ -21,6 +21,7 @@
  * \ingroup freestyle
  */
 
+/* clang-format off */
 #include <string.h>
 #include <float.h>
 
@@ -63,6 +64,7 @@ extern "C" {
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 9073be55291..c88d5f24b5d 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -18,6 +18,7 @@
  * \ingroup freestyle
  */
 
+/* clang-format off */
 #include "BlenderStrokeRenderer.h"
 
 #include "../application/AppConfig.h"
@@ -67,6 +68,7 @@ extern "C" {
 }
 
 #include <limits.h>
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/geometry/BBox.h b/source/blender/freestyle/intern/geometry/BBox.h
index 71384d33bc6..0031a7ce860 100644
--- a/source/blender/freestyle/intern/geometry/BBox.h
+++ b/source/blender/freestyle/intern/geometry/BBox.h
@@ -22,6 +22,7 @@
  * \brief A class to hold a bounding box
  */
 
+/* clang-format off */
 #include <stdlib.h>
 #include <algorithm>
 
@@ -30,6 +31,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp
index e7d67756535..bfc5e16aa2a 100644
--- a/source/blender/freestyle/intern/geometry/FitCurve.cpp
+++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp
@@ -20,11 +20,13 @@
  * \brief from "Graphics Gems", Academic Press, 1990
  */
 
+/* clang-format off */
 #include <cstdlib>  // for malloc and free
 #include <stdio.h>
 #include <math.h>
 
 #include "FitCurve.h"
+/* clang-format on */
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
index 9fb830c056c..a7db17a4015 100644
--- a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
+++ b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
@@ -19,6 +19,7 @@
  * \brief Class to define a cleaner of geometry providing a set of useful tools
  */
 
+/* clang-format off */
 #if 0
 #  if defined(__GNUC__) && (__GNUC__ >= 3)
 // hash_map is not part of the C++ standard anymore;
@@ -38,6 +39,7 @@
 #include "../system/TimeUtils.h"
 
 #include "BKE_global.h"
+/* clang-format on */
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/geometry/normal_cycle.cpp b/source/blender/freestyle/intern/geometry/normal_cycle.cpp
index 25a39619a04..5820bdc4865 100644
--- a/source/blender/freestyle/intern/geometry/normal_cycle.cpp
+++ b/source/blender/freestyle/intern/geometry/normal_cycle.cpp
@@ -29,8 +29,10 @@
  * \ingroup freestyle
  */
 
+/* clang-format off */
 #include "matrix_util.h"
 #include "normal_cycle.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp
index 4cb00b18f60..8159279a846 100644
--- a/source/blender/freestyle/intern/stroke/Canvas.cpp
+++ b/source/blender/freestyle/intern/stroke/Canvas.cpp
@@ -19,6 +19,7 @@
  * \brief Class to define a canvas designed to draw style modules
  */
 
+/* clang-format off */
 #include <sstream>
 #include <vector>
 
@@ -45,6 +46,7 @@ extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 }
+/* clang-format on */
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/stroke/Chain.cpp b/source/blender/freestyle/intern/stroke/Chain.cpp
index 79d174d8117..94c0b753985 100644
--- a/source/blender/freestyle/intern/stroke/Chain.cpp
+++ b/source/blender/freestyle/intern/stroke/Chain.cpp
@@ -19,10 +19,12 @@
  * \brief Class to define a chain of viewedges.
  */
 
+/* clang-format off */
 #include "Chain.h"
 
 #include "../view_map/ViewMapIterators.h"
 #include "../view_map/ViewMapAdvancedIterators.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h
index 3cc322a2a4b..569ca6fcf1d 100644
--- a/source/blender/freestyle/intern/stroke/ChainingIterators.h
+++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h
@@ -22,6 +22,7 @@
  * \brief Chaining iterators
  */
 
+/* clang-format off */
 #include <iostream>
 
 #include "Predicates1D.h"
@@ -31,6 +32,7 @@
 #include "../view_map/ViewMap.h"
 #include "../view_map/ViewMapIterators.h"
 #include "../view_map/ViewMapAdvancedIterators.h"
+/* clang-format on */
 
 // using namespace ViewEdgeInternal;
 
diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp
index a5d87632ad3..294f332d48d 100644
--- a/source/blender/freestyle/intern/stroke/Curve.cpp
+++ b/source/blender/freestyle/intern/stroke/Curve.cpp
@@ -19,6 +19,7 @@
  * \brief Class to define a container for curves
  */
 
+/* clang-format off */
 #include <stdio.h> /* printf */
 
 #include "Curve.h"
@@ -27,6 +28,7 @@
 
 #include "BKE_global.h"
 #include "BLI_utildefines.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp
index 84d2d3315f1..b0d3f26bce4 100644
--- a/source/blender/freestyle/intern/stroke/Operators.cpp
+++ b/source/blender/freestyle/intern/stroke/Operators.cpp
@@ -19,6 +19,7 @@
  * \brief Class gathering stroke creation algorithms
  */
 
+/* clang-format off */
 #include <algorithm>
 #include <stdexcept>
 
@@ -29,6 +30,7 @@
 #include "CurveIterators.h"
 
 #include "BKE_global.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
index 670388f5d52..ff43e5986b3 100644
--- a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
@@ -19,8 +19,10 @@
  * \brief Class to define the Postscript rendering of a stroke
  */
 
+/* clang-format off */
 #include "Canvas.h"
 #include "PSStrokeRenderer.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/Predicates1D.h b/source/blender/freestyle/intern/stroke/Predicates1D.h
index fe3649111f5..d549e960bd9 100644
--- a/source/blender/freestyle/intern/stroke/Predicates1D.h
+++ b/source/blender/freestyle/intern/stroke/Predicates1D.h
@@ -22,6 +22,7 @@
  * \brief Class gathering stroke creation algorithms
  */
 
+/* clang-format off */
 #include <string>
 
 #include "AdvancedFunctions1D.h"
@@ -34,6 +35,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp
index d18de1a7073..0bd25c20ca5 100644
--- a/source/blender/freestyle/intern/stroke/Stroke.cpp
+++ b/source/blender/freestyle/intern/stroke/Stroke.cpp
@@ -19,6 +19,7 @@
  * \brief Classes to define a stroke
  */
 
+/* clang-format off */
 #include "Stroke.h"
 #include "StrokeIterators.h"
 #include "StrokeAdvancedIterators.h"
@@ -26,6 +27,7 @@
 
 #include "BKE_global.h"
 #include "BKE_node.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/StrokeLayer.cpp b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp
index c89e7143c89..95598654dfe 100644
--- a/source/blender/freestyle/intern/stroke/StrokeLayer.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp
@@ -19,9 +19,11 @@
  * \brief Class to define a layer of strokes.
  */
 
+/* clang-format off */
 #include "Canvas.h"
 #include "Stroke.h"
 #include "StrokeLayer.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h
index e0eb0351a80..615d59ce6aa 100644
--- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h
+++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h
@@ -22,6 +22,7 @@
  * \brief Classes to render a stroke with OpenGL
  */
 
+/* clang-format off */
 #include <map>
 #include <string.h>
 #include <algorithm>
@@ -36,6 +37,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
index aaf8a4b7ef5..81e69c6e34c 100644
--- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
@@ -19,6 +19,7 @@
  * \brief Class to define the representation of a stroke (for display purpose)
  */
 
+/* clang-format off */
 #include "Stroke.h"
 #include "StrokeIterators.h"
 #include "StrokeAdvancedIterators.h"
@@ -26,6 +27,7 @@
 #include "StrokeRep.h"
 
 #include "BKE_global.h"
+/* clang-format on */
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
index d4d184e2ce1..4f58827e941 100644
--- a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
@@ -19,12 +19,14 @@
  * \brief Class to build a Node Tree designed to be displayed from a set of strokes structure.
  */
 
+/* clang-format off */
 #include "StrokeAdvancedIterators.h"
 #include "StrokeTesselator.h"
 
 #include "../scene_graph/OrientedLineRep.h"
 #include "../scene_graph/NodeGroup.h"
 #include "../scene_graph/NodeShape.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
index c5af09ef598..4669067c3f5 100644
--- a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
+++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
@@ -34,9 +34,11 @@
 #ifndef TEXTSTROKERENDERER_H
 #define TEXTSTROKERENDERER_H
 
+/* clang-format off */
 #include "StrokeRenderer.h"
 #include "../system/FreestyleConfig.h"
 #include <fstream>
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h
index af4ab18d0e8..785bc0f4330 100644
--- a/source/blender/freestyle/intern/system/PythonInterpreter.h
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.h
@@ -22,6 +22,7 @@
  * \brief Python Interpreter
  */
 
+/* clang-format off */
 #include <iostream>
 
 extern "C" {
@@ -48,6 +49,7 @@ extern "C" {
 
 #include "bpy_capi_utils.h"
 }
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/system/StringUtils.cpp b/source/blender/freestyle/intern/system/StringUtils.cpp
index 23f454c0a04..58d84010574 100644
--- a/source/blender/freestyle/intern/system/StringUtils.cpp
+++ b/source/blender/freestyle/intern/system/StringUtils.cpp
@@ -19,10 +19,12 @@
  * \brief String utilities
  */
 
+/* clang-format off */
 // soc #include <qfileinfo.h>
 
 #include "FreestyleConfig.h"
 #include "StringUtils.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/system/StringUtils.h b/source/blender/freestyle/intern/system/StringUtils.h
index 575d26597ee..16944e47335 100644
--- a/source/blender/freestyle/intern/system/StringUtils.h
+++ b/source/blender/freestyle/intern/system/StringUtils.h
@@ -22,6 +22,7 @@
  * \brief String utilities
  */
 
+/* clang-format off */
 #include <cstring>
 #include <iostream>
 #include <sstream>
@@ -32,6 +33,7 @@ extern "C" {
 #include "BLI_string.h"
 #include "BLI_path_util.h"
 }
+/* clang-format on */
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/view_map/GridDensityProvider.h b/source/blender/freestyle/intern/view_map/GridDensityProvider.h
index 8d6ba521dde..26b76006686 100644
--- a/source/blender/freestyle/intern/view_map/GridDensityProvider.h
+++ b/source/blender/freestyle/intern/view_map/GridDensityProvider.h
@@ -22,6 +22,7 @@
  * \brief Class to define a cell grid surrounding the projected image of a scene
  */
 
+/* clang-format off */
 #include <stdexcept>
 #include <algorithm>
 #include <memory>
@@ -36,6 +37,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
index 66af24507d7..2c7560259fe 100644
--- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
+++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
@@ -20,6 +20,7 @@
  * implies that this geom engine has as member data the viewpoint, transformations, projections...
  */
 
+/* clang-format off */
 #include <cstring>
 #include <cstdio>
 
@@ -29,6 +30,7 @@
 #include "../geometry/GeomUtils.h"
 
 #include "BKE_global.h"
+/* clang-format on */
 
 using namespace std;
 
diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.h b/source/blender/freestyle/intern/view_map/SphericalGrid.h
index c32ceb09805..3c1ca3b5992 100644
--- a/source/blender/freestyle/intern/view_map/SphericalGrid.h
+++ b/source/blender/freestyle/intern/view_map/SphericalGrid.h
@@ -24,6 +24,7 @@
 
 #define SPHERICAL_GRID_LOGGING 0
 
+/* clang-format off */
 // I would like to avoid using deque because including ViewMap.h and <deque> or <vector> separately
 // results in redefinitions of identifiers. ViewMap.h already includes <vector> so it should be a
 // safe fall-back.
@@ -47,6 +48,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
index bc2597c02d5..fd8f7958e83 100644
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
@@ -20,6 +20,7 @@
  * to.
  */
 
+/* clang-format off */
 #include <sstream>
 
 #include "Silhouette.h"
@@ -37,6 +38,7 @@ extern "C" {
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 }
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp
index c371eba4b94..5ea28e4ac41 100644
--- a/source/blender/freestyle/intern/view_map/ViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp
@@ -19,6 +19,7 @@
  * \brief Classes to define a View Map (ViewVertex, ViewEdge, etc.)
  */
 
+/* clang-format off */
 #include <float.h>
 
 #include "ViewMap.h"
@@ -26,6 +27,7 @@
 #include "ViewMapAdvancedIterators.h"
 
 #include "../geometry/GeomUtils.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
index c67be4f97b3..681237399a8 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
@@ -19,6 +19,7 @@
  * \brief Class to build silhouette edges from a Winged-Edge structure
  */
 
+/* clang-format off */
 #include <algorithm>
 #include <memory>
 #include <stdexcept>
@@ -39,6 +40,7 @@
 #include "../winged_edge/WFillGrid.h"
 
 #include "BKE_global.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
index 1b99c270095..33ef6858541 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
@@ -22,6 +22,7 @@
  * \brief Class to build a Node Tree designed to be displayed from a Silhouette View Map structure.
  */
 
+/* clang-format off */
 #include "Silhouette.h"
 #include "ViewMap.h"
 
@@ -36,6 +37,7 @@
 #ifdef WITH_CXX_GUARDEDALLOC
 #  include "MEM_guardedalloc.h"
 #endif
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp b/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp
index c6b32e0a89c..b6dfb183d0f 100644
--- a/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp
@@ -19,8 +19,10 @@
  * \brief Class to fill in a grid from a SceneGraph (uses only the WingedEdge structures)
  */
 
+/* clang-format off */
 #include "WEdge.h"
 #include "WFillGrid.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
index 404a1ae6181..2fa9e51fa7f 100644
--- a/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
@@ -19,8 +19,10 @@
  * \brief Class to fill in a grid from a SceneGraph (uses only the WingedEdge structures)
  */
 
+/* clang-format off */
 #include "WEdge.h"
 #include "WSFillGrid.h"
+/* clang-format on */
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
index db3719b8d2c..e6062a605ba 100644
--- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
@@ -20,8 +20,10 @@
  * info (silhouette etc...)) structure from a polygonal model
  */
 
+/* clang-format off */
 #include "WXEdge.h"
 #include "WXEdgeBuilder.h"
+/* clang-format on */
 
 namespace Freestyle {