Code style clean-up.

157 files changed, 734 insertions, 734 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_BBox.h b/source/blender/freestyle/intern/python/BPy_BBox.h
index cd3d1efcf26..6bd466ac1f1 100644
--- a/source/blender/freestyle/intern/python/BPy_BBox.h
+++ b/source/blender/freestyle/intern/python/BPy_BBox.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_BBOX_H
-#define FREESTYLE_PYTHON_BBOX_H
+#ifndef __FREESTYLE_PYTHON_BBOX_H__
+#define __FREESTYLE_PYTHON_BBOX_H__
 
 #include <Python.h>
 
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject BBox_Type;
 
-#define BPy_BBox_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BBox_Type)  )
+#define BPy_BBox_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&BBox_Type))
 
 /*---------------------------Python BPy_BBox structure definition----------*/
 typedef struct {
@@ -56,7 +56,7 @@ typedef struct {
 
 /*---------------------------Python BPy_BBox visible prototypes-----------*/
 
-int BBox_Init( PyObject *module );
+int BBox_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -66,4 +66,4 @@ int BBox_Init( PyObject *module );
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_BBOX_H */
+#endif /* __FREESTYLE_PYTHON_BBOX_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
index 7d2b5a81b23..3df74492c3e 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_BINARYPREDICATE0D_H
-#define FREESTYLE_PYTHON_BINARYPREDICATE0D_H
+#ifndef __FREESTYLE_PYTHON_BINARYPREDICATE0D_H__
+#define __FREESTYLE_PYTHON_BINARYPREDICATE0D_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject BinaryPredicate0D_Type;
 
-#define BPy_BinaryPredicate0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate0D_Type)  )
+#define BPy_BinaryPredicate0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&BinaryPredicate0D_Type))
 
 /*---------------------------Python BPy_BinaryPredicate0D structure definition----------*/
 typedef struct {
@@ -54,7 +54,7 @@ typedef struct {
 
 /*---------------------------Python BPy_BinaryPredicate0D visible prototypes-----------*/
 
-int BinaryPredicate0D_Init( PyObject *module );
+int BinaryPredicate0D_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -64,4 +64,4 @@ int BinaryPredicate0D_Init( PyObject *module );
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_BINARYPREDICATE0D_H */
+#endif /* __FREESTYLE_PYTHON_BINARYPREDICATE0D_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
index 3d536961ebd..1f4511e0815 100644
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_BINARYPREDICATE1D_H
-#define FREESTYLE_PYTHON_BINARYPREDICATE1D_H
+#ifndef __FREESTYLE_PYTHON_BINARYPREDICATE1D_H__
+#define __FREESTYLE_PYTHON_BINARYPREDICATE1D_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject BinaryPredicate1D_Type;
 
-#define BPy_BinaryPredicate1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate1D_Type)  )
+#define BPy_BinaryPredicate1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&BinaryPredicate1D_Type))
 
 /*---------------------------Python BPy_BinaryPredicate1D structure definition----------*/
 typedef struct {
@@ -54,7 +54,7 @@ typedef struct {
 
 /*---------------------------Python BPy_BinaryPredicate1D visible prototypes-----------*/
 
-int BinaryPredicate1D_Init( PyObject *module );
+int BinaryPredicate1D_Init(PyObject *module);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -63,4 +63,4 @@ int BinaryPredicate1D_Init( PyObject *module );
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_BINARYPREDICATE1D_H */
+#endif /* __FREESTYLE_PYTHON_BINARYPREDICATE1D_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
index 01d92ea7295..9f124dc970a 100644
--- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
+++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H
-#define FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H
+#ifndef __FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H__
+#define __FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H__
 
 #include <Python.h>
 
@@ -40,10 +40,10 @@ extern "C" {
 
 /*---------------------------Python BPy_ContextFunctions visible prototypes-----------*/
 
-int ContextFunctions_Init( PyObject *module );
+int ContextFunctions_Init(PyObject *module);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H */
+#endif /* __FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index 0f9d97b62b4..187af216685 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CONVERT_H
-#define FREESTYLE_PYTHON_CONVERT_H
+#ifndef __FREESTYLE_PYTHON_CONVERT_H__
+#define __FREESTYLE_PYTHON_CONVERT_H__
 
 #include <Python.h>
 #include <typeinfo>
@@ -99,74 +99,74 @@ extern "C" {
 // C++ => Python
 //==============================
 
-PyObject * PyBool_from_bool( bool b );
-PyObject * Vector_from_Vec2f( Vec2f& v );
-PyObject * Vector_from_Vec3f( Vec3f& v );
-PyObject * Vector_from_Vec3r( Vec3r& v );
+PyObject * PyBool_from_bool(bool b);
+PyObject * Vector_from_Vec2f(Vec2f& v);
+PyObject * Vector_from_Vec3f(Vec3f& v);
+PyObject * Vector_from_Vec3r(Vec3r& v);
 
-PyObject * Any_BPy_Interface0D_from_Interface0D( Interface0D& if0D );
-PyObject * Any_BPy_Interface1D_from_Interface1D( Interface1D& if1D );
-PyObject * Any_BPy_FEdge_from_FEdge( FEdge& fe );
-PyObject * Any_BPy_ViewVertex_from_ViewVertex( ViewVertex& vv );
+PyObject * Any_BPy_Interface0D_from_Interface0D(Interface0D& if0D);
+PyObject * Any_BPy_Interface1D_from_Interface1D(Interface1D& if1D);
+PyObject * Any_BPy_FEdge_from_FEdge(FEdge& fe);
+PyObject * Any_BPy_ViewVertex_from_ViewVertex(ViewVertex& vv);
 
 PyObject * BPy_BBox_from_BBox(const BBox< Vec3r > &bb);
-PyObject * BPy_CurvePoint_from_CurvePoint( CurvePoint& cp );
-PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewEdge& dve );
-PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
-PyObject * BPy_FEdgeSharp_from_FEdgeSharp( FEdgeSharp& fes );
-PyObject * BPy_FEdgeSmooth_from_FEdgeSmooth( FEdgeSmooth& fes );
-PyObject * BPy_Id_from_Id( Id& id );
-PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
-PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D );
-PyObject * BPy_IntegrationType_from_IntegrationType( IntegrationType i );
+PyObject * BPy_CurvePoint_from_CurvePoint(CurvePoint& cp);
+PyObject * BPy_directedViewEdge_from_directedViewEdge(ViewVertex::directedViewEdge& dve);
+PyObject * BPy_FEdge_from_FEdge(FEdge& fe);
+PyObject * BPy_FEdgeSharp_from_FEdgeSharp(FEdgeSharp& fes);
+PyObject * BPy_FEdgeSmooth_from_FEdgeSmooth(FEdgeSmooth& fes);
+PyObject * BPy_Id_from_Id(Id& id);
+PyObject * BPy_Interface0D_from_Interface0D(Interface0D& if0D);
+PyObject * BPy_Interface1D_from_Interface1D(Interface1D& if1D);
+PyObject * BPy_IntegrationType_from_IntegrationType(IntegrationType i);
 PyObject * BPy_FrsMaterial_from_FrsMaterial(const FrsMaterial& m);
-PyObject * BPy_Nature_from_Nature( unsigned short n );
-PyObject * BPy_MediumType_from_MediumType( Stroke::MediumType n );
-PyObject * BPy_SShape_from_SShape( SShape& ss );
-PyObject * BPy_Stroke_from_Stroke( Stroke& s );
-PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );
-PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
-PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
-PyObject * BPy_ViewVertex_from_ViewVertex( ViewVertex& vv );
-PyObject * BPy_NonTVertex_from_NonTVertex( NonTVertex& ntv );
-PyObject * BPy_TVertex_from_TVertex( TVertex& tv );
-PyObject * BPy_ViewEdge_from_ViewEdge( ViewEdge& ve );
-PyObject * BPy_Chain_from_Chain( Chain& c );
-PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs );
-
-PyObject * BPy_AdjacencyIterator_from_AdjacencyIterator( AdjacencyIterator& a_it );
-PyObject * BPy_Interface0DIterator_from_Interface0DIterator( Interface0DIterator& if0D_it, int reversed );
-PyObject * BPy_CurvePointIterator_from_CurvePointIterator( CurveInternal::CurvePointIterator& cp_it );
-PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator( StrokeInternal::StrokeVertexIterator& sv_it, int reversed);
-PyObject * BPy_SVertexIterator_from_SVertexIterator( ViewEdgeInternal::SVertexIterator& sv_it );
-PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ViewVertexInternal::orientedViewEdgeIterator& ove_it, int reversed );
-PyObject * BPy_ViewEdgeIterator_from_ViewEdgeIterator( ViewEdgeInternal::ViewEdgeIterator& ve_it );
-PyObject * BPy_ChainingIterator_from_ChainingIterator( ChainingIterator& c_it );
-PyObject * BPy_ChainPredicateIterator_from_ChainPredicateIterator( ChainPredicateIterator& cp_it );
-PyObject * BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator( ChainSilhouetteIterator& cs_it );
+PyObject * BPy_Nature_from_Nature(unsigned short n);
+PyObject * BPy_MediumType_from_MediumType(Stroke::MediumType n);
+PyObject * BPy_SShape_from_SShape(SShape& ss);
+PyObject * BPy_Stroke_from_Stroke(Stroke& s);
+PyObject * BPy_StrokeAttribute_from_StrokeAttribute(StrokeAttribute& sa);
+PyObject * BPy_StrokeVertex_from_StrokeVertex(StrokeVertex& sv);
+PyObject * BPy_SVertex_from_SVertex(SVertex& sv);
+PyObject * BPy_ViewVertex_from_ViewVertex(ViewVertex& vv);
+PyObject * BPy_NonTVertex_from_NonTVertex(NonTVertex& ntv);
+PyObject * BPy_TVertex_from_TVertex(TVertex& tv);
+PyObject * BPy_ViewEdge_from_ViewEdge(ViewEdge& ve);
+PyObject * BPy_Chain_from_Chain(Chain& c);
+PyObject * BPy_ViewShape_from_ViewShape(ViewShape& vs);
+
+PyObject * BPy_AdjacencyIterator_from_AdjacencyIterator(AdjacencyIterator& a_it);
+PyObject * BPy_Interface0DIterator_from_Interface0DIterator(Interface0DIterator& if0D_it, int reversed);
+PyObject * BPy_CurvePointIterator_from_CurvePointIterator(CurveInternal::CurvePointIterator& cp_it);
+PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator(StrokeInternal::StrokeVertexIterator& sv_it, int reversed);
+PyObject * BPy_SVertexIterator_from_SVertexIterator(ViewEdgeInternal::SVertexIterator& sv_it);
+PyObject * BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator(ViewVertexInternal::orientedViewEdgeIterator& ove_it, int reversed);
+PyObject * BPy_ViewEdgeIterator_from_ViewEdgeIterator(ViewEdgeInternal::ViewEdgeIterator& ve_it);
+PyObject * BPy_ChainingIterator_from_ChainingIterator(ChainingIterator& c_it);
+PyObject * BPy_ChainPredicateIterator_from_ChainPredicateIterator(ChainPredicateIterator& cp_it);
+PyObject * BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator(ChainSilhouetteIterator& cs_it);
 
 //==============================
 // Python => C++
 //==============================
 
-bool bool_from_PyBool( PyObject *b );
-IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj );
-Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj );
-Nature::EdgeNature EdgeNature_from_BPy_Nature( PyObject* obj );
-Vec2f * Vec2f_ptr_from_PyObject( PyObject* obj );
-Vec3f * Vec3f_ptr_from_PyObject( PyObject* obj );
-Vec3r * Vec3r_ptr_from_PyObject( PyObject* obj );
-Vec2f * Vec2f_ptr_from_Vector( PyObject* obj );
-Vec3f * Vec3f_ptr_from_Vector( PyObject* obj );
-Vec3r * Vec3r_ptr_from_Vector( PyObject* obj );
-Vec3f * Vec3f_ptr_from_Color( PyObject* obj );
-Vec3r * Vec3r_ptr_from_Color( PyObject* obj );
-Vec2f * Vec2f_ptr_from_PyList( PyObject* obj );
-Vec3f * Vec3f_ptr_from_PyList( PyObject* obj );
-Vec3r * Vec3r_ptr_from_PyList( PyObject* obj );
-Vec2f * Vec2f_ptr_from_PyTuple( PyObject* obj );
-Vec3f * Vec3f_ptr_from_PyTuple( PyObject* obj );
-Vec3r * Vec3r_ptr_from_PyTuple( PyObject* obj );
+bool bool_from_PyBool(PyObject *b);
+IntegrationType IntegrationType_from_BPy_IntegrationType(PyObject* obj);
+Stroke::MediumType MediumType_from_BPy_MediumType(PyObject* obj);
+Nature::EdgeNature EdgeNature_from_BPy_Nature(PyObject* obj);
+Vec2f * Vec2f_ptr_from_PyObject(PyObject* obj);
+Vec3f * Vec3f_ptr_from_PyObject(PyObject* obj);
+Vec3r * Vec3r_ptr_from_PyObject(PyObject* obj);
+Vec2f * Vec2f_ptr_from_Vector(PyObject* obj);
+Vec3f * Vec3f_ptr_from_Vector(PyObject* obj);
+Vec3r * Vec3r_ptr_from_Vector(PyObject* obj);
+Vec3f * Vec3f_ptr_from_Color(PyObject* obj);
+Vec3r * Vec3r_ptr_from_Color(PyObject* obj);
+Vec2f * Vec2f_ptr_from_PyList(PyObject* obj);
+Vec3f * Vec3f_ptr_from_PyList(PyObject* obj);
+Vec3r * Vec3r_ptr_from_PyList(PyObject* obj);
+Vec2f * Vec2f_ptr_from_PyTuple(PyObject* obj);
+Vec3f * Vec3f_ptr_from_PyTuple(PyObject* obj);
+Vec3r * Vec3r_ptr_from_PyTuple(PyObject* obj);
 
 int float_array_from_PyObject(PyObject *obj, float *v, int n);
 
@@ -178,4 +178,4 @@ int float_array_from_PyObject(PyObject *obj, float *v, int n);
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_CONVERT_H */
+#endif /* __FREESTYLE_PYTHON_CONVERT_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.h b/source/blender/freestyle/intern/python/BPy_Freestyle.h
index 86155d08b62..8fa1f19a57b 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.h
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_FREESTYLE_H
-#define FREESTYLE_PYTHON_FREESTYLE_H
+#ifndef __FREESTYLE_PYTHON_FREESTYLE_H__
+#define __FREESTYLE_PYTHON_FREESTYLE_H__
 
 #include <Python.h>
 
@@ -42,7 +42,7 @@ extern "C" {
 
 /*---------------------------Python BPy_Freestyle visible prototypes-----------*/
 
-PyObject *Freestyle_Init( void );
+PyObject *Freestyle_Init(void);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -50,4 +50,4 @@ PyObject *Freestyle_Init( void );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_FREESTYLE_H */
+#endif /* __FREESTYLE_PYTHON_FREESTYLE_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
index 3dff19155eb..90eb4a99b8c 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_FRSMATERIAL_H
-#define FREESTYLE_PYTHON_FRSMATERIAL_H
+#ifndef __FREESTYLE_PYTHON_FRSMATERIAL_H__
+#define __FREESTYLE_PYTHON_FRSMATERIAL_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject FrsMaterial_Type;
 
-#define BPy_FrsMaterial_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsMaterial_Type)  )
+#define BPy_FrsMaterial_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FrsMaterial_Type))
 
 /*---------------------------Python BPy_FrsMaterial structure definition----------*/
 typedef struct {
@@ -54,7 +54,7 @@ typedef struct {
 
 /*---------------------------Python BPy_FrsMaterial visible prototypes-----------*/
 
-int FrsMaterial_Init( PyObject *module );
+int FrsMaterial_Init(PyObject *module);
 void FrsMaterial_mathutils_register_callback();
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -64,4 +64,4 @@ void FrsMaterial_mathutils_register_callback();
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_FRSMATERIAL_H */
+#endif /* __FREESTYLE_PYTHON_FRSMATERIAL_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.h b/source/blender/freestyle/intern/python/BPy_FrsNoise.h
index 064526b0349..91d29eab602 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsNoise.h
+++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_FRSNOISE_H
-#define FREESTYLE_PYTHON_FRSNOISE_H
+#ifndef __FREESTYLE_PYTHON_FRSNOISE_H__
+#define __FREESTYLE_PYTHON_FRSNOISE_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject FrsNoise_Type;
 
-#define BPy_FrsNoise_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsNoise_Type)  )
+#define BPy_FrsNoise_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FrsNoise_Type))
 
 /*---------------------------Python BPy_FrsNoise structure definition----------*/
 typedef struct {
@@ -54,7 +54,7 @@ typedef struct {
 
 /*---------------------------Python BPy_FrsNoise visible prototypes-----------*/
 
-int FrsNoise_Init( PyObject *module );
+int FrsNoise_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -64,4 +64,4 @@ int FrsNoise_Init( PyObject *module );
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_FRSNOISE_H */
+#endif /* __FREESTYLE_PYTHON_FRSNOISE_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_Id.h b/source/blender/freestyle/intern/python/BPy_Id.h
index 58a1f4159cb..9b9ec5b6e2d 100644
--- a/source/blender/freestyle/intern/python/BPy_Id.h
+++ b/source/blender/freestyle/intern/python/BPy_Id.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_ID_H
-#define FREESTYLE_PYTHON_ID_H
+#ifndef __FREESTYLE_PYTHON_ID_H__
+#define __FREESTYLE_PYTHON_ID_H__
 
 #include <Python.h>
 #include <iostream>
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject Id_Type;
 
-#define BPy_Id_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Id_Type)  )
+#define BPy_Id_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Id_Type))
 
 /*---------------------------Python BPy_Id structure definition----------*/
 typedef struct {
@@ -56,7 +56,7 @@ typedef struct {
 
 /*---------------------------Python BPy_Id visible prototypes-----------*/
 
-int Id_Init( PyObject *module );
+int Id_Init(PyObject *module);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -64,4 +64,4 @@ int Id_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_ID_H */
+#endif /* __FREESTYLE_PYTHON_ID_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.h b/source/blender/freestyle/intern/python/BPy_IntegrationType.h
index b427e810b89..6b5db759297 100644
--- a/source/blender/freestyle/intern/python/BPy_IntegrationType.h
+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_INTEGRATIONTYPE_H
-#define FREESTYLE_PYTHON_INTEGRATIONTYPE_H
+#ifndef __FREESTYLE_PYTHON_INTEGRATIONTYPE_H__
+#define __FREESTYLE_PYTHON_INTEGRATIONTYPE_H__
 
 #include <Python.h>
 
@@ -44,11 +44,11 @@ extern "C" {
 
 extern PyTypeObject IntegrationType_Type;
 
-#define BPy_IntegrationType_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &IntegrationType_Type)  )
+#define BPy_IntegrationType_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&IntegrationType_Type))
 
 /*---------------------------Python BPy_IntegrationType visible prototypes-----------*/
 
-int IntegrationType_Init( PyObject *module );
+int IntegrationType_Init(PyObject *module);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -56,4 +56,4 @@ int IntegrationType_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_INTEGRATIONTYPE_H */
+#endif /* __FREESTYLE_PYTHON_INTEGRATIONTYPE_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.h b/source/blender/freestyle/intern/python/BPy_Interface0D.h
index a5e27eb014b..9b24b9d8631 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.h
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_INTERFACE0D_H
-#define FREESTYLE_PYTHON_INTERFACE0D_H
+#ifndef __FREESTYLE_PYTHON_INTERFACE0D_H__
+#define __FREESTYLE_PYTHON_INTERFACE0D_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject Interface0D_Type;
 
-#define BPy_Interface0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface0D_Type)  )
+#define BPy_Interface0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Interface0D_Type))
 
 /*---------------------------Python BPy_Interface0D structure definition----------*/
 typedef struct {
@@ -55,7 +55,7 @@ typedef struct {
 
 /*---------------------------Python BPy_Interface0D visible prototypes-----------*/
 
-int Interface0D_Init( PyObject *module );
+int Interface0D_Init(PyObject *module);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -63,4 +63,4 @@ int Interface0D_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_INTERFACE0D_H */
+#endif /* __FREESTYLE_PYTHON_INTERFACE0D_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.h b/source/blender/freestyle/intern/python/BPy_Interface1D.h
index d12a7c6ed7d..a7a81374d22 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.h
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_INTERFACE1D_H
-#define FREESTYLE_PYTHON_INTERFACE1D_H
+#ifndef __FREESTYLE_PYTHON_INTERFACE1D_H__
+#define __FREESTYLE_PYTHON_INTERFACE1D_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject Interface1D_Type;
 
-#define BPy_Interface1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface1D_Type)  )
+#define BPy_Interface1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Interface1D_Type))
 
 /*---------------------------Python BPy_Interface1D structure definition----------*/
 typedef struct {
@@ -55,7 +55,7 @@ typedef struct {
 
 /*---------------------------Python BPy_Interface1D visible prototypes-----------*/
 
-int Interface1D_Init( PyObject *module );
+int Interface1D_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -64,4 +64,4 @@ int Interface1D_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_INTERFACE1D_H */
+#endif /* __FREESTYLE_PYTHON_INTERFACE1D_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.h b/source/blender/freestyle/intern/python/BPy_Iterator.h
index 8f6fe5e1dae..f301a0b83b0 100644
--- a/source/blender/freestyle/intern/python/BPy_Iterator.h
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_ITERATOR_H
-#define FREESTYLE_PYTHON_ITERATOR_H
+#ifndef __FREESTYLE_PYTHON_ITERATOR_H__
+#define __FREESTYLE_PYTHON_ITERATOR_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject Iterator_Type;
 
-#define BPy_Iterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Iterator_Type)  )
+#define BPy_Iterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Iterator_Type))
 
 /*---------------------------Python BPy_Iterator structure definition----------*/
 typedef struct {
@@ -54,7 +54,7 @@ typedef struct {
 
 /*---------------------------Python BPy_Iterator visible prototypes-----------*/
 
-int Iterator_Init( PyObject *module );
+int Iterator_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -63,4 +63,4 @@ int Iterator_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_ITERATOR_H */
+#endif /* __FREESTYLE_PYTHON_ITERATOR_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_MediumType.h b/source/blender/freestyle/intern/python/BPy_MediumType.h
index 3436faf7dd0..a7db5b15505 100644
--- a/source/blender/freestyle/intern/python/BPy_MediumType.h
+++ b/source/blender/freestyle/intern/python/BPy_MediumType.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_MEDIUMTYPE_H
-#define FREESTYLE_PYTHON_MEDIUMTYPE_H
+#ifndef __FREESTYLE_PYTHON_MEDIUMTYPE_H__
+#define __FREESTYLE_PYTHON_MEDIUMTYPE_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject MediumType_Type;
 
-#define BPy_MediumType_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &MediumType_Type)  )
+#define BPy_MediumType_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&MediumType_Type))
 
 /*---------------------------Python BPy_MediumType structure definition----------*/
 typedef struct {
@@ -53,7 +53,7 @@ typedef struct {
 
 /*---------------------------Python BPy_MediumType visible prototypes-----------*/
 
-int MediumType_Init( PyObject *module );
+int MediumType_Init(PyObject *module);
 
 // internal constants
 extern PyLongObject _BPy_MediumType_DRY_MEDIUM;
@@ -70,4 +70,4 @@ extern PyLongObject _BPy_MediumType_OPAQUE_MEDIUM;
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_MEDIUMTYPE_H */
+#endif /* __FREESTYLE_PYTHON_MEDIUMTYPE_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_Nature.h b/source/blender/freestyle/intern/python/BPy_Nature.h
index 0cbe6f26662..a454af86d25 100644
--- a/source/blender/freestyle/intern/python/BPy_Nature.h
+++ b/source/blender/freestyle/intern/python/BPy_Nature.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_NATURE_H
-#define FREESTYLE_PYTHON_NATURE_H
+#ifndef __FREESTYLE_PYTHON_NATURE_H__
+#define __FREESTYLE_PYTHON_NATURE_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject Nature_Type;
 
-#define BPy_Nature_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Nature_Type)  )
+#define BPy_Nature_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Nature_Type))
 
 /*---------------------------Python BPy_Nature structure definition----------*/
 typedef struct {
@@ -53,7 +53,7 @@ typedef struct {
 
 /*---------------------------Python BPy_Nature visible prototypes-----------*/
 
-int Nature_Init( PyObject *module );
+int Nature_Init(PyObject *module);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -61,4 +61,4 @@ int Nature_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_NATURE_H */
+#endif /* __FREESTYLE_PYTHON_NATURE_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_Operators.h b/source/blender/freestyle/intern/python/BPy_Operators.h
index 7fc7185e54e..e1c2f5be363 100644
--- a/source/blender/freestyle/intern/python/BPy_Operators.h
+++ b/source/blender/freestyle/intern/python/BPy_Operators.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_OPERATORS_H
-#define FREESTYLE_PYTHON_OPERATORS_H
+#ifndef __FREESTYLE_PYTHON_OPERATORS_H__
+#define __FREESTYLE_PYTHON_OPERATORS_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject Operators_Type;
 
-#define BPy_Operators_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Operators_Type)  )
+#define BPy_Operators_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Operators_Type))
 
 /*---------------------------Python BPy_Operators structure definition----------*/
 typedef struct {
@@ -53,7 +53,7 @@ typedef struct {
 
 /*---------------------------Python BPy_Operators visible prototypes-----------*/
 
-int Operators_Init( PyObject *module );
+int Operators_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -62,4 +62,4 @@ int Operators_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_OPERATORS_H */
+#endif /* __FREESTYLE_PYTHON_OPERATORS_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_SShape.h b/source/blender/freestyle/intern/python/BPy_SShape.h
index 4c0a57436fa..3f253c33da5 100644
--- a/source/blender/freestyle/intern/python/BPy_SShape.h
+++ b/source/blender/freestyle/intern/python/BPy_SShape.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_SSHAPE_H
-#define FREESTYLE_PYTHON_SSHAPE_H
+#ifndef __FREESTYLE_PYTHON_SSHAPE_H__
+#define __FREESTYLE_PYTHON_SSHAPE_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject SShape_Type;
 
-#define BPy_SShape_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SShape_Type)  )
+#define BPy_SShape_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SShape_Type))
 
 /*---------------------------Python BPy_SShape structure definition----------*/
 typedef struct {
@@ -55,7 +55,7 @@ typedef struct {
 
 /*---------------------------Python BPy_SShape visible prototypes-----------*/
 
-int SShape_Init( PyObject *module );
+int SShape_Init(PyObject *module);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -63,4 +63,4 @@ int SShape_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_SSHAPE_H */
+#endif /* __FREESTYLE_PYTHON_SSHAPE_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
index 5f41af3adf7..c87c38af6d1 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_STROKEATTRIBUTE_H
-#define FREESTYLE_PYTHON_STROKEATTRIBUTE_H
+#ifndef __FREESTYLE_PYTHON_STROKEATTRIBUTE_H__
+#define __FREESTYLE_PYTHON_STROKEATTRIBUTE_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject StrokeAttribute_Type;
 
-#define BPy_StrokeAttribute_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeAttribute_Type)  )
+#define BPy_StrokeAttribute_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&StrokeAttribute_Type))
 
 /*---------------------------Python BPy_StrokeAttribute structure definition----------*/
 typedef struct {
@@ -55,7 +55,7 @@ typedef struct {
 
 /*---------------------------Python BPy_StrokeAttribute visible prototypes-----------*/
 
-int StrokeAttribute_Init( PyObject *module );
+int StrokeAttribute_Init(PyObject *module);
 void StrokeAttribute_mathutils_register_callback();
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -64,4 +64,4 @@ void StrokeAttribute_mathutils_register_callback();
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_STROKEATTRIBUTE_H */
+#endif /* __FREESTYLE_PYTHON_STROKEATTRIBUTE_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_StrokeShader.h b/source/blender/freestyle/intern/python/BPy_StrokeShader.h
index fb4085d7ef7..690fdf7e424 100644
--- a/source/blender/freestyle/intern/python/BPy_StrokeShader.h
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_STROKESHADER_H
-#define FREESTYLE_PYTHON_STROKESHADER_H
+#ifndef __FREESTYLE_PYTHON_STROKESHADER_H__
+#define __FREESTYLE_PYTHON_STROKESHADER_H__
 
 #include <Python.h>
 
@@ -48,7 +48,7 @@ extern "C" {
 
 extern PyTypeObject StrokeShader_Type;
 
-#define BPy_StrokeShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeShader_Type)  )
+#define BPy_StrokeShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&StrokeShader_Type))
 
 /*---------------------------Python BPy_StrokeShader structure definition----------*/
 typedef struct {
@@ -58,7 +58,7 @@ typedef struct {
 
 /*---------------------------Python BPy_StrokeShader visible prototypes-----------*/
 
-int StrokeShader_Init( PyObject *module );
+int StrokeShader_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -68,4 +68,4 @@ int StrokeShader_Init( PyObject *module );
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_STROKESHADER_H */
+#endif /* __FREESTYLE_PYTHON_STROKESHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
index 589994a751a..a3a4cd1c201 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0D_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION0D_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0D_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION0D_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0D_Type;
 
-#define BPy_UnaryFunction0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0D_Type)  )
+#define BPy_UnaryFunction0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0D_Type))
 
 /*---------------------------Python BPy_UnaryFunction0D structure definition----------*/
 typedef struct {
@@ -54,7 +54,7 @@ typedef struct {
 
 /*---------------------------Python BPy_UnaryFunction0D visible prototypes-----------*/
 
-int UnaryFunction0D_Init( PyObject *module );
+int UnaryFunction0D_Init(PyObject *module);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -62,4 +62,4 @@ int UnaryFunction0D_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0D_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0D_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
index fd7f73c8afc..40712a40961 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1D_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION1D_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1D_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION1D_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1D_Type;
 
-#define BPy_UnaryFunction1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1D_Type)  )
+#define BPy_UnaryFunction1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction1D_Type))
 
 /*---------------------------Python BPy_UnaryFunction1D structure definition----------*/
 typedef struct {
@@ -54,7 +54,7 @@ typedef struct {
 
 /*---------------------------Python BPy_UnaryFunction1D visible prototypes-----------*/
 
-int UnaryFunction1D_Init( PyObject *module );
+int UnaryFunction1D_Init(PyObject *module);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -62,4 +62,4 @@ int UnaryFunction1D_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1D_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1D_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
index 885de576797..b30516aff26 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYPREDICATE0D_H
-#define FREESTYLE_PYTHON_UNARYPREDICATE0D_H
+#ifndef __FREESTYLE_PYTHON_UNARYPREDICATE0D_H__
+#define __FREESTYLE_PYTHON_UNARYPREDICATE0D_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject UnaryPredicate0D_Type;
 
-#define BPy_UnaryPredicate0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryPredicate0D_Type)  )
+#define BPy_UnaryPredicate0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryPredicate0D_Type))
 
 /*---------------------------Python BPy_UnaryPredicate0D structure definition----------*/
 typedef struct {
@@ -54,7 +54,7 @@ typedef struct {
 
 /*---------------------------Python BPy_UnaryPredicate0D visible prototypes-----------*/
 
-int UnaryPredicate0D_Init( PyObject *module );
+int UnaryPredicate0D_Init(PyObject *module);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -62,4 +62,4 @@ int UnaryPredicate0D_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYPREDICATE0D_H */
+#endif /* __FREESTYLE_PYTHON_UNARYPREDICATE0D_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
index e592009afb5..4f755f4d481 100644
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYPREDICATE1D_H
-#define FREESTYLE_PYTHON_UNARYPREDICATE1D_H
+#ifndef __FREESTYLE_PYTHON_UNARYPREDICATE1D_H__
+#define __FREESTYLE_PYTHON_UNARYPREDICATE1D_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject UnaryPredicate1D_Type;
 
-#define BPy_UnaryPredicate1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryPredicate1D_Type)  )
+#define BPy_UnaryPredicate1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryPredicate1D_Type))
 
 /*---------------------------Python BPy_UnaryPredicate1D structure definition----------*/
 typedef struct {
@@ -54,7 +54,7 @@ typedef struct {
 
 /*---------------------------Python BPy_UnaryPredicate1D visible prototypes-----------*/
 
-int UnaryPredicate1D_Init( PyObject *module );
+int UnaryPredicate1D_Init(PyObject *module);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -62,4 +62,4 @@ int UnaryPredicate1D_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYPREDICATE1D_H */
+#endif /* __FREESTYLE_PYTHON_UNARYPREDICATE1D_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.h b/source/blender/freestyle/intern/python/BPy_ViewMap.h
index d9800287c53..03c6bca2e16 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewMap.h
+++ b/source/blender/freestyle/intern/python/BPy_ViewMap.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_VIEWMAP_H
-#define FREESTYLE_PYTHON_VIEWMAP_H
+#ifndef __FREESTYLE_PYTHON_VIEWMAP_H__
+#define __FREESTYLE_PYTHON_VIEWMAP_H__
 
 #include <Python.h>
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ViewMap_Type;
 
-#define BPy_ViewMap_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewMap_Type)  )
+#define BPy_ViewMap_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewMap_Type))
 
 /*---------------------------Python BPy_ViewMap structure definition----------*/
 typedef struct {
@@ -54,7 +54,7 @@ typedef struct {
 
 /*---------------------------Python BPy_ViewMap visible prototypes-----------*/
 
-int ViewMap_Init( PyObject *module );
+int ViewMap_Init(PyObject *module);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -62,4 +62,4 @@ int ViewMap_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_VIEWMAP_H */
+#endif /* __FREESTYLE_PYTHON_VIEWMAP_H__ */
diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.h b/source/blender/freestyle/intern/python/BPy_ViewShape.h
index 929e8005258..e18f7cb23dd 100644
--- a/source/blender/freestyle/intern/python/BPy_ViewShape.h
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_VIEWSHAPE_H
-#define FREESTYLE_PYTHON_VIEWSHAPE_H
+#ifndef __FREESTYLE_PYTHON_VIEWSHAPE_H__
+#define __FREESTYLE_PYTHON_VIEWSHAPE_H__
 
 #include <Python.h>
 
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject ViewShape_Type;
 
-#define BPy_ViewShape_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewShape_Type)  )
+#define BPy_ViewShape_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewShape_Type))
 
 /*---------------------------Python BPy_ViewShape structure definition----------*/
 typedef struct {
@@ -58,7 +58,7 @@ typedef struct {
 
 /*---------------------------Python BPy_ViewShape visible prototypes-----------*/
 
-int ViewShape_Init( PyObject *module );
+int ViewShape_Init(PyObject *module);
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
@@ -66,4 +66,4 @@ int ViewShape_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_VIEWSHAPE_H */
+#endif /* __FREESTYLE_PYTHON_VIEWSHAPE_H__ */
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
index e0e069325b5..952266091b8 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_FALSEBP1D_H
-#define FREESTYLE_PYTHON_FALSEBP1D_H
+#ifndef __FREESTYLE_PYTHON_FALSEBP1D_H__
+#define __FREESTYLE_PYTHON_FALSEBP1D_H__
 
 #include "../BPy_BinaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject FalseBP1D_Type;
 
-#define BPy_FalseBP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FalseBP1D_Type)  )
+#define BPy_FalseBP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FalseBP1D_Type))
 
 /*---------------------------Python BPy_FalseBP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_FALSEBP1D_H */
+#endif /* __FREESTYLE_PYTHON_FALSEBP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
index 752e585337c..69c7706db48 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_LENGTH2DBP1D_H
-#define FREESTYLE_PYTHON_LENGTH2DBP1D_H
+#ifndef __FREESTYLE_PYTHON_LENGTH2DBP1D_H__
+#define __FREESTYLE_PYTHON_LENGTH2DBP1D_H__
 
 #include "../BPy_BinaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject Length2DBP1D_Type;
 
-#define BPy_Length2DBP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Length2DBP1D_Type)  )
+#define BPy_Length2DBP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Length2DBP1D_Type))
 
 /*---------------------------Python BPy_Length2DBP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_LENGTH2DBP1D_H */
+#endif /* __FREESTYLE_PYTHON_LENGTH2DBP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
index 4d108cba59c..0a4b6ebb556 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_SAMESHAPEIDBP1D_H
-#define FREESTYLE_PYTHON_SAMESHAPEIDBP1D_H
+#ifndef __FREESTYLE_PYTHON_SAMESHAPEIDBP1D_H__
+#define __FREESTYLE_PYTHON_SAMESHAPEIDBP1D_H__
 
 #include "../BPy_BinaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject SameShapeIdBP1D_Type;
 
-#define BPy_SameShapeIdBP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SameShapeIdBP1D_Type)  )
+#define BPy_SameShapeIdBP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SameShapeIdBP1D_Type))
 
 /*---------------------------Python BPy_SameShapeIdBP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_SAMESHAPEIDBP1D_H */
+#endif /* __FREESTYLE_PYTHON_SAMESHAPEIDBP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
index 713e95c6473..cf568d7b33e 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_TRUEBP1D_H
-#define FREESTYLE_PYTHON_TRUEBP1D_H
+#ifndef __FREESTYLE_PYTHON_TRUEBP1D_H__
+#define __FREESTYLE_PYTHON_TRUEBP1D_H__
 
 #include "../BPy_BinaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject TrueBP1D_Type;
 
-#define BPy_TrueBP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TrueBP1D_Type)  )
+#define BPy_TrueBP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TrueBP1D_Type))
 
 /*---------------------------Python BPy_TrueBP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_TRUEBP1D_H */
+#endif /* __FREESTYLE_PYTHON_TRUEBP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
index cb1fba23f84..70eba3e2bc0 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_VIEWMAPGRADIENTNORMBP1D_H
-#define FREESTYLE_PYTHON_VIEWMAPGRADIENTNORMBP1D_H
+#ifndef __FREESTYLE_PYTHON_VIEWMAPGRADIENTNORMBP1D_H__
+#define __FREESTYLE_PYTHON_VIEWMAPGRADIENTNORMBP1D_H__
 
 #include "../BPy_BinaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ViewMapGradientNormBP1D_Type;
 
-#define BPy_ViewMapGradientNormBP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewMapGradientNormBP1D_Type)  )
+#define BPy_ViewMapGradientNormBP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewMapGradientNormBP1D_Type))
 
 /*---------------------------Python BPy_ViewMapGradientNormBP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_VIEWMAPGRADIENTNORMBP1D_H */
+#endif /* __FREESTYLE_PYTHON_VIEWMAPGRADIENTNORMBP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/Director.h b/source/blender/freestyle/intern/python/Director.h
index 97b0f06a0a6..939d14c6b47 100644
--- a/source/blender/freestyle/intern/python/Director.h
+++ b/source/blender/freestyle/intern/python/Director.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef  FREESTYLE_PYTHON_DIRECTOR
-# define FREESTYLE_PYTHON_DIRECTOR
+#ifndef  __FREESTYLE_PYTHON_DIRECTOR
+# define __FREESTYLE_PYTHON_DIRECTOR
 
 class UnaryPredicate0D;
 class UnaryPredicate1D;
@@ -55,26 +55,26 @@ extern "C" {
 #endif
 
 //   BinaryPredicate0D: __call__
-int Director_BPy_BinaryPredicate0D___call__( BinaryPredicate0D *bp0D, Interface0D& i1, Interface0D& i2 );
+int Director_BPy_BinaryPredicate0D___call__(BinaryPredicate0D *bp0D, Interface0D& i1, Interface0D& i2);
 
 //   BinaryPredicate1D: __call__
-int Director_BPy_BinaryPredicate1D___call__( BinaryPredicate1D *bp1D, Interface1D& i1, Interface1D& i2 );
+int Director_BPy_BinaryPredicate1D___call__(BinaryPredicate1D *bp1D, Interface1D& i1, Interface1D& i2);
 
 //	UnaryFunction{0D,1D}: __call__
-int Director_BPy_UnaryFunction0D___call__( void *uf0D, PyObject *obj, Interface0DIterator& if0D_it);
-int Director_BPy_UnaryFunction1D___call__( void *uf1D, PyObject *obj, Interface1D& if1D);
+int Director_BPy_UnaryFunction0D___call__(void *uf0D, PyObject *obj, Interface0DIterator& if0D_it);
+int Director_BPy_UnaryFunction1D___call__(void *uf1D, PyObject *obj, Interface1D& if1D);
 
 //   UnaryPredicate0D: __call__
-int Director_BPy_UnaryPredicate0D___call__( UnaryPredicate0D *up0D, Interface0DIterator& if0D_it );
+int Director_BPy_UnaryPredicate0D___call__(UnaryPredicate0D *up0D, Interface0DIterator& if0D_it);
 	
 //   UnaryPredicate1D: __call__
-int Director_BPy_UnaryPredicate1D___call__( UnaryPredicate1D *up1D, Interface1D& if1D );
+int Director_BPy_UnaryPredicate1D___call__(UnaryPredicate1D *up1D, Interface1D& if1D);
 
 //   StrokeShader: shade
-int Director_BPy_StrokeShader_shade( StrokeShader *ss, Stroke& s );
+int Director_BPy_StrokeShader_shade(StrokeShader *ss, Stroke& s);
 
 //   ChainingIterator: init, traverse
-int Director_BPy_ChainingIterator_init( ChainingIterator *c_it );
-int Director_BPy_ChainingIterator_traverse( ChainingIterator *c_it, AdjacencyIterator& a_it );
+int Director_BPy_ChainingIterator_init(ChainingIterator *c_it);
+int Director_BPy_ChainingIterator_traverse(ChainingIterator *c_it, AdjacencyIterator& a_it);
 
-#endif // FREESTYLE_PYTHON_DIRECTOR
+#endif // __FREESTYLE_PYTHON_DIRECTOR
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
index d851d93b8b9..3bd39fc0162 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CURVEPOINT_H
-#define FREESTYLE_PYTHON_CURVEPOINT_H
+#ifndef __FREESTYLE_PYTHON_CURVEPOINT_H__
+#define __FREESTYLE_PYTHON_CURVEPOINT_H__
 
 #include "../BPy_Interface0D.h"
 #include "../../stroke/Curve.h"
@@ -45,7 +45,7 @@ extern "C" {
 
 extern PyTypeObject CurvePoint_Type;
 
-#define BPy_CurvePoint_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &CurvePoint_Type)  )
+#define BPy_CurvePoint_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CurvePoint_Type))
 
 /*---------------------------Python BPy_CurvePoint structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CURVEPOINT_H */
+#endif /* __FREESTYLE_PYTHON_CURVEPOINT_H__ */
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
index 60353da6abc..7c8270e0985 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_SVERTEX_H
-#define FREESTYLE_PYTHON_SVERTEX_H
+#ifndef __FREESTYLE_PYTHON_SVERTEX_H__
+#define __FREESTYLE_PYTHON_SVERTEX_H__
 
 #include "../../view_map/Silhouette.h"
 #include "../BPy_Interface0D.h"
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject SVertex_Type;
 
-#define BPy_SVertex_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SVertex_Type)  )
+#define BPy_SVertex_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SVertex_Type))
 
 /*---------------------------Python BPy_SVertex structure definition----------*/
 typedef struct {
@@ -64,4 +64,4 @@ void SVertex_mathutils_register_callback();
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_SVERTEX_H */
+#endif /* __FREESTYLE_PYTHON_SVERTEX_H__ */
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
index 58bd1e7a365..fcc12c7614a 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_VIEWVERTEX_H
-#define FREESTYLE_PYTHON_VIEWVERTEX_H
+#ifndef __FREESTYLE_PYTHON_VIEWVERTEX_H__
+#define __FREESTYLE_PYTHON_VIEWVERTEX_H__
 
 #include "../../view_map/ViewMap.h"
 #include "../BPy_Interface0D.h"
@@ -45,7 +45,7 @@ extern "C" {
 
 extern PyTypeObject ViewVertex_Type;
 
-#define BPy_ViewVertex_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewVertex_Type)  )
+#define BPy_ViewVertex_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewVertex_Type))
 
 /*---------------------------Python BPy_ViewVertex structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_VIEWVERTEX_H */
+#endif /* __FREESTYLE_PYTHON_VIEWVERTEX_H__ */
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
index 492dce6b93e..466a40e1fca 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_STROKEVERTEX_H
-#define FREESTYLE_PYTHON_STROKEVERTEX_H
+#ifndef __FREESTYLE_PYTHON_STROKEVERTEX_H__
+#define __FREESTYLE_PYTHON_STROKEVERTEX_H__
 
 #include "../BPy_CurvePoint.h"
 #include "../../../stroke/Stroke.h"
@@ -45,7 +45,7 @@ extern "C" {
 
 extern PyTypeObject StrokeVertex_Type;
 
-#define BPy_StrokeVertex_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeVertex_Type)  )
+#define BPy_StrokeVertex_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&StrokeVertex_Type))
 
 /*---------------------------Python BPy_StrokeVertex structure definition----------*/
 typedef struct {
@@ -63,4 +63,4 @@ void StrokeVertex_mathutils_register_callback();
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_STROKEVERTEX_H */
+#endif /* __FREESTYLE_PYTHON_STROKEVERTEX_H__ */
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h
index 4f74b770224..4bc59d3597e 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_NONTVERTEX_H
-#define FREESTYLE_PYTHON_NONTVERTEX_H
+#ifndef __FREESTYLE_PYTHON_NONTVERTEX_H__
+#define __FREESTYLE_PYTHON_NONTVERTEX_H__
 
 #include "../BPy_ViewVertex.h"
 #include "../../../view_map/ViewMap.h"
@@ -45,7 +45,7 @@ extern "C" {
 
 extern PyTypeObject NonTVertex_Type;
 
-#define BPy_NonTVertex_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &NonTVertex_Type)  )
+#define BPy_NonTVertex_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&NonTVertex_Type))
 
 /*---------------------------Python BPy_NonTVertex structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_NONTVERTEX_H */
+#endif /* __FREESTYLE_PYTHON_NONTVERTEX_H__ */
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h
index 8b9b81e2704..4d832b2f67f 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_TVERTEX_H
-#define FREESTYLE_PYTHON_TVERTEX_H
+#ifndef __FREESTYLE_PYTHON_TVERTEX_H__
+#define __FREESTYLE_PYTHON_TVERTEX_H__
 
 #include "../BPy_ViewVertex.h"
 #include "../../../view_map/ViewMap.h"
@@ -45,7 +45,7 @@ extern "C" {
 
 extern PyTypeObject TVertex_Type;
 
-#define BPy_TVertex_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TVertex_Type)  )
+#define BPy_TVertex_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TVertex_Type))
 
 /*---------------------------Python BPy_TVertex structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_TVERTEX_H */
+#endif /* __FREESTYLE_PYTHON_TVERTEX_H__ */
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
index 50f6315887d..468136736ca 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_FEDGE_H
-#define FREESTYLE_PYTHON_FEDGE_H
+#ifndef __FREESTYLE_PYTHON_FEDGE_H__
+#define __FREESTYLE_PYTHON_FEDGE_H__
 
 #include "../BPy_Interface1D.h"
 #include "../../view_map/Silhouette.h"
@@ -45,7 +45,7 @@ extern "C" {
 
 extern PyTypeObject FEdge_Type;
 
-#define BPy_FEdge_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FEdge_Type)  )
+#define BPy_FEdge_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FEdge_Type))
 
 /*---------------------------Python BPy_FEdge structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_FEDGE_H */
+#endif /* __FREESTYLE_PYTHON_FEDGE_H__ */
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h
index b594002ae42..3622870af9a 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_FRSCURVE_H
-#define FREESTYLE_PYTHON_FRSCURVE_H
+#ifndef __FREESTYLE_PYTHON_FRSCURVE_H__
+#define __FREESTYLE_PYTHON_FRSCURVE_H__
 
 #include "../BPy_Interface1D.h"
 #include "../../stroke/Curve.h"
@@ -45,7 +45,7 @@ extern "C" {
 
 extern PyTypeObject FrsCurve_Type;
 
-#define BPy_FrsCurve_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsCurve_Type)  )
+#define BPy_FrsCurve_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FrsCurve_Type))
 
 /*---------------------------Python BPy_FrsCurve structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_FRSCURVE_H */
+#endif /* __FREESTYLE_PYTHON_FRSCURVE_H__ */
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h
index 188d7a00da0..5ad894ce636 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_STROKE_H
-#define FREESTYLE_PYTHON_STROKE_H
+#ifndef __FREESTYLE_PYTHON_STROKE_H__
+#define __FREESTYLE_PYTHON_STROKE_H__
 
 #include "../BPy_Interface1D.h"
 #include "../../stroke/Stroke.h"
@@ -45,7 +45,7 @@ extern "C" {
 
 extern PyTypeObject Stroke_Type;
 
-#define BPy_Stroke_Check(v)	(( (PyObject *) v)->ob_type == &Stroke_Type)
+#define BPy_Stroke_Check(v)	(((PyObject *)v)->ob_type == &Stroke_Type)
 
 /*---------------------------Python BPy_Stroke structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_STROKE_H */
+#endif /* __FREESTYLE_PYTHON_STROKE_H__ */
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h
index 1d779f71b36..e5bb0c891cf 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_VIEWEDGE_H
-#define FREESTYLE_PYTHON_VIEWEDGE_H
+#ifndef __FREESTYLE_PYTHON_VIEWEDGE_H__
+#define __FREESTYLE_PYTHON_VIEWEDGE_H__
 
 #include "../../view_map/ViewMap.h"
 
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject ViewEdge_Type;
 
-#define BPy_ViewEdge_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewEdge_Type)  )
+#define BPy_ViewEdge_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewEdge_Type))
 
 /*---------------------------Python BPy_ViewEdge structure definition----------*/
 typedef struct {
@@ -60,4 +60,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_VIEWEDGE_H */
+#endif /* __FREESTYLE_PYTHON_VIEWEDGE_H__ */
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
index 5fa7e6d3089..bfc72e6aaec 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
+++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CHAIN_H
-#define FREESTYLE_PYTHON_CHAIN_H
+#ifndef __FREESTYLE_PYTHON_CHAIN_H__
+#define __FREESTYLE_PYTHON_CHAIN_H__
 
 #include "../BPy_FrsCurve.h"
 #include "../../../stroke/Chain.h"
@@ -45,7 +45,7 @@ extern "C" {
 
 extern PyTypeObject Chain_Type;
 
-#define BPy_Chain_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Chain_Type)  )
+#define BPy_Chain_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Chain_Type))
 
 /*---------------------------Python BPy_Chain structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CHAIN_H */
+#endif /* __FREESTYLE_PYTHON_CHAIN_H__ */
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
index 38c6f4f0449..f82dc352050 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_FEDGESHARP_H
-#define FREESTYLE_PYTHON_FEDGESHARP_H
+#ifndef __FREESTYLE_PYTHON_FEDGESHARP_H__
+#define __FREESTYLE_PYTHON_FEDGESHARP_H__
 
 #include "../BPy_FEdge.h"
 #include "../../../view_map/Silhouette.h"
@@ -45,7 +45,7 @@ extern "C" {
 
 extern PyTypeObject FEdgeSharp_Type;
 
-#define BPy_FEdgeSharp_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FEdgeSharp_Type)  )
+#define BPy_FEdgeSharp_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FEdgeSharp_Type))
 
 /*---------------------------Python BPy_FEdgeSharp structure definition----------*/
 typedef struct {
@@ -63,4 +63,4 @@ void FEdgeSharp_mathutils_register_callback();
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_FEDGESHARP_H */
+#endif /* __FREESTYLE_PYTHON_FEDGESHARP_H__ */
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
index 2c134a53294..2484ef80e35 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_FEDGESMOOTH_H
-#define FREESTYLE_PYTHON_FEDGESMOOTH_H
+#ifndef __FREESTYLE_PYTHON_FEDGESMOOTH_H__
+#define __FREESTYLE_PYTHON_FEDGESMOOTH_H__
 
 #include "../BPy_FEdge.h"
 #include "../../../view_map/Silhouette.h"
@@ -45,7 +45,7 @@ extern "C" {
 
 extern PyTypeObject FEdgeSmooth_Type;
 
-#define BPy_FEdgeSmooth_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FEdgeSmooth_Type)  )
+#define BPy_FEdgeSmooth_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FEdgeSmooth_Type))
 
 /*---------------------------Python BPy_FEdgeSmooth structure definition----------*/
 typedef struct {
@@ -63,4 +63,4 @@ void FEdgeSmooth_mathutils_register_callback();
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_FEDGESMOOTH_H */
+#endif /* __FREESTYLE_PYTHON_FEDGESMOOTH_H__ */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
index d77e5322b73..d47a6f987e8 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_ADJACENCYITERATOR_H
-#define FREESTYLE_PYTHON_ADJACENCYITERATOR_H
+#ifndef __FREESTYLE_PYTHON_ADJACENCYITERATOR_H__
+#define __FREESTYLE_PYTHON_ADJACENCYITERATOR_H__
 
 #include "../../stroke/ChainingIterators.h"
 #include "../BPy_Iterator.h"
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject AdjacencyIterator_Type;
 
-#define BPy_AdjacencyIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &AdjacencyIterator_Type)  )
+#define BPy_AdjacencyIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&AdjacencyIterator_Type))
 
 /*---------------------------Python BPy_AdjacencyIterator structure definition----------*/
 typedef struct {
@@ -60,4 +60,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_ADJACENCYITERATOR_H */
+#endif /* __FREESTYLE_PYTHON_ADJACENCYITERATOR_H__ */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
index 64dfd609f6e..90bc9123694 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H
-#define FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H
+#ifndef __FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H__
+#define __FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H__
 
 
 #include "../../stroke/ChainingIterators.h"
@@ -47,7 +47,7 @@ extern "C" {
 
 extern PyTypeObject ChainPredicateIterator_Type;
 
-#define BPy_ChainPredicateIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ChainPredicateIterator_Type)  )
+#define BPy_ChainPredicateIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainPredicateIterator_Type))
 
 /*---------------------------Python BPy_ChainPredicateIterator structure definition----------*/
 typedef struct {
@@ -63,4 +63,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H */
+#endif /* __FREESTYLE_PYTHON_CHAINPREDICATEITERATOR_H__ */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h
index 0c02b1dc1a7..8c6f2983d3e 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H
-#define FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H
+#ifndef __FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H__
+#define __FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H__
 
 
 #include "../../stroke/ChainingIterators.h"
@@ -47,7 +47,7 @@ extern "C" {
 
 extern PyTypeObject ChainSilhouetteIterator_Type;
 
-#define BPy_ChainSilhouetteIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ChainSilhouetteIterator_Type)  )
+#define BPy_ChainSilhouetteIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainSilhouetteIterator_Type))
 
 /*---------------------------Python BPy_ChainSilhouetteIterator structure definition----------*/
 typedef struct {
@@ -61,4 +61,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H */
+#endif /* __FREESTYLE_PYTHON_CHAINSILHOUETTEITERATOR_H__ */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
index fec44026457..b791e96a10c 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CHAININGITERATOR_H
-#define FREESTYLE_PYTHON_CHAININGITERATOR_H
+#ifndef __FREESTYLE_PYTHON_CHAININGITERATOR_H__
+#define __FREESTYLE_PYTHON_CHAININGITERATOR_H__
 
 
 #include "../../stroke/ChainingIterators.h"
@@ -47,7 +47,7 @@ extern "C" {
 
 extern PyTypeObject ChainingIterator_Type;
 
-#define BPy_ChainingIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ChainingIterator_Type)  )
+#define BPy_ChainingIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainingIterator_Type))
 
 /*---------------------------Python BPy_ChainingIterator structure definition----------*/
 typedef struct {
@@ -61,4 +61,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CHAININGITERATOR_H */
+#endif /* __FREESTYLE_PYTHON_CHAININGITERATOR_H__ */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
index a4a8eb059ea..65b736aee12 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CURVEPOINTITERATOR_H
-#define FREESTYLE_PYTHON_CURVEPOINTITERATOR_H
+#ifndef __FREESTYLE_PYTHON_CURVEPOINTITERATOR_H__
+#define __FREESTYLE_PYTHON_CURVEPOINTITERATOR_H__
 
 #include "../../stroke/CurveIterators.h"
 
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject CurvePointIterator_Type;
 
-#define BPy_CurvePointIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &CurvePointIterator_Type)  )
+#define BPy_CurvePointIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CurvePointIterator_Type))
 
 /*---------------------------Python BPy_CurvePointIterator structure definition----------*/
 typedef struct {
@@ -60,4 +60,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CURVEPOINTITERATOR_H */
+#endif /* __FREESTYLE_PYTHON_CURVEPOINTITERATOR_H__ */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h
index 0a4afb495b7..72e827fce49 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_INTERFACE0DITERATOR_H
-#define FREESTYLE_PYTHON_INTERFACE0DITERATOR_H
+#ifndef __FREESTYLE_PYTHON_INTERFACE0DITERATOR_H__
+#define __FREESTYLE_PYTHON_INTERFACE0DITERATOR_H__
 
 #include "../../view_map/Interface0D.h"
 #include "../BPy_Iterator.h"
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject Interface0DIterator_Type;
 
-#define BPy_Interface0DIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface0DIterator_Type)  )
+#define BPy_Interface0DIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Interface0DIterator_Type))
 
 /*---------------------------Python BPy_Interface0DIterator structure definition----------*/
 typedef struct {
@@ -61,4 +61,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_INTERFACE0DITERATOR_H */
+#endif /* __FREESTYLE_PYTHON_INTERFACE0DITERATOR_H__ */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
index 3a4056e4f10..435559e6b44 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_SVERTEXITERATOR_H
-#define FREESTYLE_PYTHON_SVERTEXITERATOR_H
+#ifndef __FREESTYLE_PYTHON_SVERTEXITERATOR_H__
+#define __FREESTYLE_PYTHON_SVERTEXITERATOR_H__
 
 #include "../../view_map/ViewMapIterators.h"
 
@@ -47,7 +47,7 @@ extern "C" {
 
 extern PyTypeObject SVertexIterator_Type;
 
-#define BPy_SVertexIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SVertexIterator_Type)  )
+#define BPy_SVertexIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SVertexIterator_Type))
 
 /*---------------------------Python BPy_SVertexIterator structure definition----------*/
 typedef struct {
@@ -61,4 +61,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_SVERTEXITERATOR_H */
+#endif /* __FREESTYLE_PYTHON_SVERTEXITERATOR_H__ */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
index 6fc7ba2bdd4..0c9bb0d0be7 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H
-#define FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H
+#ifndef __FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H__
+#define __FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H__
 
 #include "../../stroke/StrokeIterators.h"
 
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject StrokeVertexIterator_Type;
 
-#define BPy_StrokeVertexIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeVertexIterator_Type)  )
+#define BPy_StrokeVertexIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&StrokeVertexIterator_Type))
 
 /*---------------------------Python BPy_StrokeVertexIterator structure definition----------*/
 typedef struct {
@@ -61,4 +61,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H */
+#endif /* __FREESTYLE_PYTHON_STROKEVERTEXITERATOR_H__ */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
index 1390e683cc6..dd8b1971e82 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_VIEWEDGEITERATOR_H
-#define FREESTYLE_PYTHON_VIEWEDGEITERATOR_H
+#ifndef __FREESTYLE_PYTHON_VIEWEDGEITERATOR_H__
+#define __FREESTYLE_PYTHON_VIEWEDGEITERATOR_H__
 
 
 #include "../../view_map/ViewMapIterators.h"
@@ -47,7 +47,7 @@ extern "C" {
 
 extern PyTypeObject ViewEdgeIterator_Type;
 
-#define BPy_ViewEdgeIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewEdgeIterator_Type)  )
+#define BPy_ViewEdgeIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ViewEdgeIterator_Type))
 
 /*---------------------------Python BPy_ViewEdgeIterator structure definition----------*/
 typedef struct {
@@ -61,4 +61,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_VIEWEDGEITERATOR_H */
+#endif /* __FREESTYLE_PYTHON_VIEWEDGEITERATOR_H__ */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
index bb26fd915e5..84451a29347 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H
-#define FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H
+#ifndef __FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H__
+#define __FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H__
 
 #include "../../stroke/Stroke.h"
 #include "../../view_map/ViewMapIterators.h"
@@ -47,7 +47,7 @@ extern "C" {
 
 extern PyTypeObject orientedViewEdgeIterator_Type;
 
-#define BPy_orientedViewEdgeIterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &orientedViewEdgeIterator_Type)  )
+#define BPy_orientedViewEdgeIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&orientedViewEdgeIterator_Type))
 
 /*---------------------------Python BPy_orientedViewEdgeIterator structure definition----------*/
 typedef struct {
@@ -62,4 +62,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H */
+#endif /* __FREESTYLE_PYTHON_ORIENTEDVIEWEDGEITERATOR_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
index 061ddfd25c8..f906f0cb61a 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H
-#define FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H
+#ifndef __FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H__
+#define __FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject BackboneStretcherShader_Type;
 
-#define BPy_BackboneStretcherShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BackboneStretcherShader_Type)  )
+#define BPy_BackboneStretcherShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&BackboneStretcherShader_Type))
 
 /*---------------------------Python BPy_BackboneStretcherShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H */
+#endif /* __FREESTYLE_PYTHON_BACKBONESTRETCHERSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
index 6a54e45784c..6e11d84e30f 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_BEZIERCURVESHADER_H
-#define FREESTYLE_PYTHON_BEZIERCURVESHADER_H
+#ifndef __FREESTYLE_PYTHON_BEZIERCURVESHADER_H__
+#define __FREESTYLE_PYTHON_BEZIERCURVESHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject BezierCurveShader_Type;
 
-#define BPy_BezierCurveShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BezierCurveShader_Type)  )
+#define BPy_BezierCurveShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&BezierCurveShader_Type))
 
 /*---------------------------Python BPy_BezierCurveShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_BEZIERCURVESHADER_H */
+#endif /* __FREESTYLE_PYTHON_BEZIERCURVESHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
index 6233b22f6eb..74dca914473 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H
-#define FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H
+#ifndef __FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H__
+#define __FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject CalligraphicShader_Type;
 
-#define BPy_CalligraphicShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &CalligraphicShader_Type)
+#define BPy_CalligraphicShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CalligraphicShader_Type)
 
 /*---------------------------Python BPy_CalligraphicShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H */
+#endif /* __FREESTYLE_PYTHON_CALLIGRAPHICSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
index 72f9ca1c077..c1d1b7f384c 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_COLORNOISESHADER_H
-#define FREESTYLE_PYTHON_COLORNOISESHADER_H
+#ifndef __FREESTYLE_PYTHON_COLORNOISESHADER_H__
+#define __FREESTYLE_PYTHON_COLORNOISESHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ColorNoiseShader_Type;
 
-#define BPy_ColorNoiseShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ColorNoiseShader_Type)  )
+#define BPy_ColorNoiseShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ColorNoiseShader_Type))
 
 /*---------------------------Python BPy_ColorNoiseShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_COLORNOISESHADER_H */
+#endif /* __FREESTYLE_PYTHON_COLORNOISESHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
index fbae1f8c8b2..be70938aae6 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H
-#define FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H
+#ifndef __FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H__
+#define __FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ColorVariationPatternShader_Type;
 
-#define BPy_ColorVariationPatternShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ColorVariationPatternShader_Type)  )
+#define BPy_ColorVariationPatternShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ColorVariationPatternShader_Type))
 
 /*---------------------------Python BPy_ColorVariationPatternShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H */
+#endif /* __FREESTYLE_PYTHON_COLORVARIATIONPATTERNSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
index 9f9aac1dd19..ad81132fc4f 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H
-#define FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H
+#ifndef __FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H__
+#define __FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ConstantColorShader_Type;
 
-#define BPy_ConstantColorShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ConstantColorShader_Type)  )
+#define BPy_ConstantColorShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ConstantColorShader_Type))
 
 /*---------------------------Python BPy_ConstantColorShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H */
+#endif /* __FREESTYLE_PYTHON_CONSTANTCOLORSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
index 0507ae22b7a..686d52f0d03 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H
-#define FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H
+#ifndef __FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H__
+#define __FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ConstantThicknessShader_Type;
 
-#define BPy_ConstantThicknessShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ConstantThicknessShader_Type)  )
+#define BPy_ConstantThicknessShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ConstantThicknessShader_Type))
 
 /*---------------------------Python BPy_ConstantThicknessShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H */
+#endif /* __FREESTYLE_PYTHON_CONSTANTTHICKNESSSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
index b27339d9b01..f36489459be 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H
-#define FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H
+#ifndef __FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H__
+#define __FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ConstrainedIncreasingThicknessShader_Type;
 
-#define BPy_ConstrainedIncreasingThicknessShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ConstrainedIncreasingThicknessShader_Type)  )
+#define BPy_ConstrainedIncreasingThicknessShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ConstrainedIncreasingThicknessShader_Type))
 
 /*---------------------------Python BPy_ConstrainedIncreasingThicknessShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H */
+#endif /* __FREESTYLE_PYTHON_CONSTRAINEDINCREASINGTHICKNESSSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
index bf924d1ea33..0b7ca4a5217 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GUIDINGLINESSHADER_H
-#define FREESTYLE_PYTHON_GUIDINGLINESSHADER_H
+#ifndef __FREESTYLE_PYTHON_GUIDINGLINESSHADER_H__
+#define __FREESTYLE_PYTHON_GUIDINGLINESSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GuidingLinesShader_Type;
 
-#define BPy_GuidingLinesShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GuidingLinesShader_Type)  )
+#define BPy_GuidingLinesShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GuidingLinesShader_Type))
 
 /*---------------------------Python BPy_GuidingLinesShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_GUIDINGLINESSHADER_H */
+#endif /* __FREESTYLE_PYTHON_GUIDINGLINESSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
index 1b8c078a6ce..bc61c7c97d0 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H
-#define FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H
+#ifndef __FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H__
+#define __FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject IncreasingColorShader_Type;
 
-#define BPy_IncreasingColorShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &IncreasingColorShader_Type)  )
+#define BPy_IncreasingColorShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&IncreasingColorShader_Type))
 
 /*---------------------------Python BPy_IncreasingColorShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H */
+#endif /* __FREESTYLE_PYTHON_INCREASINGCOLORSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
index 463dfa3ace7..ee4d370aa39 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H
-#define FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H
+#ifndef __FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H__
+#define __FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject IncreasingThicknessShader_Type;
 
-#define BPy_IncreasingThicknessShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &IncreasingThicknessShader_Type)  )
+#define BPy_IncreasingThicknessShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&IncreasingThicknessShader_Type))
 
 /*---------------------------Python BPy_IncreasingThicknessShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H */
+#endif /* __FREESTYLE_PYTHON_INCREASINGTHICKNESSSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
index 747876e20d1..a79eab09743 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H
-#define FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H
+#ifndef __FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H__
+#define __FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject PolygonalizationShader_Type;
 
-#define BPy_PolygonalizationShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &PolygonalizationShader_Type)  )
+#define BPy_PolygonalizationShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&PolygonalizationShader_Type))
 
 /*---------------------------Python BPy_PolygonalizationShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H */
+#endif /* __FREESTYLE_PYTHON_POLYGONALIZATIONSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
index a315c7cdf1f..7e214ce22aa 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_SAMPLINGSHADER_H
-#define FREESTYLE_PYTHON_SAMPLINGSHADER_H
+#ifndef __FREESTYLE_PYTHON_SAMPLINGSHADER_H__
+#define __FREESTYLE_PYTHON_SAMPLINGSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject SamplingShader_Type;
 
-#define BPy_SamplingShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SamplingShader_Type)  )
+#define BPy_SamplingShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SamplingShader_Type))
 
 /*---------------------------Python BPy_SamplingShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_SAMPLINGSHADER_H */
+#endif /* __FREESTYLE_PYTHON_SAMPLINGSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h
index 52e454ee3ab..e00c0bac9de 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHONSMOOTHINGSHADER_H
-#define FREESTYLE_PYTHONSMOOTHINGSHADER_H
+#ifndef __FREESTYLE_PYTHONSMOOTHINGSHADER_H__
+#define __FREESTYLE_PYTHONSMOOTHINGSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject SmoothingShader_Type;
 
-#define BPy_SmoothingShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SmoothingShader_Type)  )
+#define BPy_SmoothingShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SmoothingShader_Type))
 
 /*---------------------------Python BPy_SmoothingShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHONSMOOTHINGSHADER_H */
+#endif /* __FREESTYLE_PYTHONSMOOTHINGSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
index c3f8be678d8..13b32ee7a31 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_SPATIALNOISESHADER_H
-#define FREESTYLE_PYTHON_SPATIALNOISESHADER_H
+#ifndef __FREESTYLE_PYTHON_SPATIALNOISESHADER_H__
+#define __FREESTYLE_PYTHON_SPATIALNOISESHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject SpatialNoiseShader_Type;
 
-#define BPy_SpatialNoiseShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SpatialNoiseShader_Type)  )
+#define BPy_SpatialNoiseShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&SpatialNoiseShader_Type))
 
 /*---------------------------Python BPy_SpatialNoiseShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_SPATIALNOISESHADER_H */
+#endif /* __FREESTYLE_PYTHON_SPATIALNOISESHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
index 8f71ff1d68f..5e28fb51390 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_STROKETEXTURESHADER_H
-#define FREESTYLE_PYTHON_STROKETEXTURESHADER_H
+#ifndef __FREESTYLE_PYTHON_STROKETEXTURESHADER_H__
+#define __FREESTYLE_PYTHON_STROKETEXTURESHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject StrokeTextureShader_Type;
 
-#define BPy_StrokeTextureShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeTextureShader_Type)  )
+#define BPy_StrokeTextureShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&StrokeTextureShader_Type))
 
 /*---------------------------Python BPy_StrokeTextureShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_STROKETEXTURESHADER_H */
+#endif /* __FREESTYLE_PYTHON_STROKETEXTURESHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
index e0c08318c5f..06070ecf3ee 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H
-#define FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H
+#ifndef __FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H__
+#define __FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject TextureAssignerShader_Type;
 
-#define BPy_TextureAssignerShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TextureAssignerShader_Type)  )
+#define BPy_TextureAssignerShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TextureAssignerShader_Type))
 
 /*---------------------------Python BPy_TextureAssignerShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H */
+#endif /* __FREESTYLE_PYTHON_TEXTUREASSIGNERSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
index 243d846d42c..0f68fed96c3 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_THICKNESSNOISESHADER_H
-#define FREESTYLE_PYTHON_THICKNESSNOISESHADER_H
+#ifndef __FREESTYLE_PYTHON_THICKNESSNOISESHADER_H__
+#define __FREESTYLE_PYTHON_THICKNESSNOISESHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ThicknessNoiseShader_Type;
 
-#define BPy_ThicknessNoiseShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ThicknessNoiseShader_Type)  )
+#define BPy_ThicknessNoiseShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ThicknessNoiseShader_Type))
 
 /*---------------------------Python BPy_ThicknessNoiseShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_THICKNESSNOISESHADER_H */
+#endif /* __FREESTYLE_PYTHON_THICKNESSNOISESHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
index 4b6d2d4cc54..469a78d8f1f 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H
-#define FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H
+#ifndef __FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H__
+#define __FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ThicknessVariationPatternShader_Type;
 
-#define BPy_ThicknessVariationPatternShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ThicknessVariationPatternShader_Type)  )
+#define BPy_ThicknessVariationPatternShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ThicknessVariationPatternShader_Type))
 
 /*---------------------------Python BPy_ThicknessVariationPatternShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H */
+#endif /* __FREESTYLE_PYTHON_THICKNESSVARIATIONPATTERNSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
index 858ececfa01..7a3d2063a33 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_TIPREMOVERSHADER_H
-#define FREESTYLE_PYTHON_TIPREMOVERSHADER_H
+#ifndef __FREESTYLE_PYTHON_TIPREMOVERSHADER_H__
+#define __FREESTYLE_PYTHON_TIPREMOVERSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject TipRemoverShader_Type;
 
-#define BPy_TipRemoverShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TipRemoverShader_Type)  )
+#define BPy_TipRemoverShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TipRemoverShader_Type))
 
 /*---------------------------Python BPy_TipRemoverShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_TIPREMOVERSHADER_H */
+#endif /* __FREESTYLE_PYTHON_TIPREMOVERSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
index bab12520b32..b795ca1c53c 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_FSTREAMSHADER_H
-#define FREESTYLE_PYTHON_FSTREAMSHADER_H
+#ifndef __FREESTYLE_PYTHON_FSTREAMSHADER_H__
+#define __FREESTYLE_PYTHON_FSTREAMSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject fstreamShader_Type;
 
-#define BPy_fstreamShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &fstreamShader_Type)  )
+#define BPy_fstreamShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&fstreamShader_Type))
 
 /*---------------------------Python BPy_fstreamShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_FSTREAMSHADER_H */
+#endif /* __FREESTYLE_PYTHON_FSTREAMSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
index 3e1451026cb..7cb9f0c5bf9 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
+++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_STREAMSHADER_H
-#define FREESTYLE_PYTHON_STREAMSHADER_H
+#ifndef __FREESTYLE_PYTHON_STREAMSHADER_H__
+#define __FREESTYLE_PYTHON_STREAMSHADER_H__
 
 #include "../BPy_StrokeShader.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject streamShader_Type;
 
-#define BPy_streamShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &streamShader_Type)  )
+#define BPy_streamShader_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&streamShader_Type))
 
 /*---------------------------Python BPy_streamShader structure definition----------*/
 typedef struct {
@@ -59,4 +59,4 @@ typedef struct {
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_STREAMSHADER_H */
+#endif /* __FREESTYLE_PYTHON_STREAMSHADER_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h
index 52d25b400c8..4da5cbff435 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DDOUBLE_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION0DDOUBLE_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DDOUBLE_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION0DDOUBLE_H__
 
 #include "../BPy_UnaryFunction0D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DDouble_Type;
 
-#define BPy_UnaryFunction0DDouble_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DDouble_Type)  )
+#define BPy_UnaryFunction0DDouble_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DDouble_Type))
 
 /*---------------------------Python BPy_UnaryFunction0DDouble structure definition----------*/
 typedef struct {
@@ -53,7 +53,7 @@ typedef struct {
 } BPy_UnaryFunction0DDouble;
 
 /*---------------------------Python BPy_UnaryFunction0DDouble visible prototypes-----------*/
-int UnaryFunction0DDouble_Init( PyObject *module );
+int UnaryFunction0DDouble_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -62,4 +62,4 @@ int UnaryFunction0DDouble_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DDOUBLE_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DDOUBLE_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h
index 4d3768b5013..521df1af98c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DEDGENATURE_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION0DEDGENATURE_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DEDGENATURE_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION0DEDGENATURE_H__
 
 #include "../BPy_UnaryFunction0D.h"
 
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DEdgeNature_Type;
 
-#define BPy_UnaryFunction0DEdgeNature_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DEdgeNature_Type)  )
+#define BPy_UnaryFunction0DEdgeNature_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DEdgeNature_Type))
 
 /*---------------------------Python BPy_UnaryFunction0DEdgeNature structure definition----------*/
 typedef struct {
@@ -55,7 +55,7 @@ typedef struct {
 } BPy_UnaryFunction0DEdgeNature;
 
 /*---------------------------Python BPy_UnaryFunction0DEdgeNature visible prototypes-----------*/
-int UnaryFunction0DEdgeNature_Init( PyObject *module );
+int UnaryFunction0DEdgeNature_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -64,4 +64,4 @@ int UnaryFunction0DEdgeNature_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DEDGENATURE_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DEDGENATURE_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h
index be451c8c318..cd80c14328a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DFLOAT_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION0DFLOAT_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DFLOAT_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION0DFLOAT_H__
 
 #include "../BPy_UnaryFunction0D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DFloat_Type;
 
-#define BPy_UnaryFunction0DFloat_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DFloat_Type)  )
+#define BPy_UnaryFunction0DFloat_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DFloat_Type))
 
 /*---------------------------Python BPy_UnaryFunction0DFloat structure definition----------*/
 typedef struct {
@@ -53,7 +53,7 @@ typedef struct {
 } BPy_UnaryFunction0DFloat;
 
 /*---------------------------Python BPy_UnaryFunction0DFloat visible prototypes-----------*/
-int UnaryFunction0DFloat_Init( PyObject *module );
+int UnaryFunction0DFloat_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -62,4 +62,4 @@ int UnaryFunction0DFloat_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DFLOAT_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DFLOAT_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h
index ccbf8e8f52c..3522abd174c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DID_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION0DID_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DID_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION0DID_H__
 
 #include "../BPy_UnaryFunction0D.h"
 
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DId_Type;
 
-#define BPy_UnaryFunction0DId_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DId_Type)  )
+#define BPy_UnaryFunction0DId_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DId_Type))
 
 /*---------------------------Python BPy_UnaryFunction0DId structure definition----------*/
 typedef struct {
@@ -55,7 +55,7 @@ typedef struct {
 } BPy_UnaryFunction0DId;
 
 /*---------------------------Python BPy_UnaryFunction0DId visible prototypes-----------*/
-int UnaryFunction0DId_Init( PyObject *module );
+int UnaryFunction0DId_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -64,4 +64,4 @@ int UnaryFunction0DId_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DID_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DID_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h
index 14b7554caf7..448be5ed2e3 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DMATERIAL_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION0DMATERIAL_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DMATERIAL_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION0DMATERIAL_H__
 
 #include "../BPy_UnaryFunction0D.h"
 
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DMaterial_Type;
 
-#define BPy_UnaryFunction0DMaterial_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DMaterial_Type)  )
+#define BPy_UnaryFunction0DMaterial_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DMaterial_Type))
 
 /*---------------------------Python BPy_UnaryFunction0DMaterial structure definition----------*/
 typedef struct {
@@ -55,7 +55,7 @@ typedef struct {
 } BPy_UnaryFunction0DMaterial;
 
 /*---------------------------Python BPy_UnaryFunction0DMaterial visible prototypes-----------*/
-int UnaryFunction0DMaterial_Init( PyObject *module );
+int UnaryFunction0DMaterial_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -64,4 +64,4 @@ int UnaryFunction0DMaterial_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DMATERIAL_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DMATERIAL_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h
index 69450913a3a..e51b97fcfbb 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DUNSIGNED_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION0DUNSIGNED_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DUNSIGNED_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION0DUNSIGNED_H__
 
 #include "../BPy_UnaryFunction0D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DUnsigned_Type;
 
-#define BPy_UnaryFunction0DUnsigned_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DUnsigned_Type)  )
+#define BPy_UnaryFunction0DUnsigned_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DUnsigned_Type))
 
 /*---------------------------Python BPy_UnaryFunction0DUnsigned structure definition----------*/
 typedef struct {
@@ -53,7 +53,7 @@ typedef struct {
 } BPy_UnaryFunction0DUnsigned;
 
 /*---------------------------Python BPy_UnaryFunction0DUnsigned visible prototypes-----------*/
-int UnaryFunction0DUnsigned_Init( PyObject *module );
+int UnaryFunction0DUnsigned_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -62,4 +62,4 @@ int UnaryFunction0DUnsigned_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DUNSIGNED_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DUNSIGNED_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h
index 10871c730cb..ab5b8e3fe09 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DVEC2F_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION0DVEC2F_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DVEC2F_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION0DVEC2F_H__
 
 #include "../BPy_UnaryFunction0D.h"
 
@@ -47,7 +47,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DVec2f_Type;
 
-#define BPy_UnaryFunction0DVec2f_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DVec2f_Type)  )
+#define BPy_UnaryFunction0DVec2f_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DVec2f_Type))
 
 /*---------------------------Python BPy_UnaryFunction0DVec2f structure definition----------*/
 typedef struct {
@@ -56,7 +56,7 @@ typedef struct {
 } BPy_UnaryFunction0DVec2f;
 
 /*---------------------------Python BPy_UnaryFunction0DVec2f visible prototypes-----------*/
-int UnaryFunction0DVec2f_Init( PyObject *module );
+int UnaryFunction0DVec2f_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -65,4 +65,4 @@ int UnaryFunction0DVec2f_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DVEC2F_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DVEC2F_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h
index 9add83c92a3..1beb0e97932 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DVEC3F_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION0DVEC3F_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DVEC3F_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION0DVEC3F_H__
 
 #include "../BPy_UnaryFunction0D.h"
 
@@ -47,7 +47,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DVec3f_Type;
 
-#define BPy_UnaryFunction0DVec3f_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DVec3f_Type)  )
+#define BPy_UnaryFunction0DVec3f_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DVec3f_Type))
 
 /*---------------------------Python BPy_UnaryFunction0DVec3f structure definition----------*/
 typedef struct {
@@ -56,7 +56,7 @@ typedef struct {
 } BPy_UnaryFunction0DVec3f;
 
 /*---------------------------Python BPy_UnaryFunction0DVec3f visible prototypes-----------*/
-int UnaryFunction0DVec3f_Init( PyObject *module );
+int UnaryFunction0DVec3f_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -65,4 +65,4 @@ int UnaryFunction0DVec3f_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DVEC3F_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DVEC3F_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
index 608a9efc230..ceb4f465d35 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DVECTORVIEWSHAPE_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION0DVECTORVIEWSHAPE_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DVECTORVIEWSHAPE_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION0DVECTORVIEWSHAPE_H__
 
 #include "../BPy_UnaryFunction0D.h"
 
@@ -47,7 +47,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DVectorViewShape_Type;
 
-#define BPy_UnaryFunction0DVectorViewShape_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DVectorViewShape_Type)  )
+#define BPy_UnaryFunction0DVectorViewShape_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DVectorViewShape_Type))
 
 /*---------------------------Python BPy_UnaryFunction0DVectorViewShape structure definition----------*/
 typedef struct {
@@ -56,7 +56,7 @@ typedef struct {
 } BPy_UnaryFunction0DVectorViewShape;
 
 /*---------------------------Python BPy_UnaryFunction0DVectorViewShape visible prototypes-----------*/
-int UnaryFunction0DVectorViewShape_Init( PyObject *module );
+int UnaryFunction0DVectorViewShape_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -65,4 +65,4 @@ int UnaryFunction0DVectorViewShape_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DVECTORVIEWSHAPE_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DVECTORVIEWSHAPE_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h
index 2911297c316..9a74346f70a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0DVIEWSHAPE_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION0DVIEWSHAPE_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION0DVIEWSHAPE_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION0DVIEWSHAPE_H__
 
 #include "../BPy_UnaryFunction0D.h"
 
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction0DViewShape_Type;
 
-#define BPy_UnaryFunction0DViewShape_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0DViewShape_Type)  )
+#define BPy_UnaryFunction0DViewShape_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction0DViewShape_Type))
 
 /*---------------------------Python BPy_UnaryFunction0DViewShape structure definition----------*/
 typedef struct {
@@ -55,7 +55,7 @@ typedef struct {
 } BPy_UnaryFunction0DViewShape;
 
 /*---------------------------Python BPy_UnaryFunction0DViewShape visible prototypes-----------*/
-int UnaryFunction0DViewShape_Init( PyObject *module );
+int UnaryFunction0DViewShape_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -64,4 +64,4 @@ int UnaryFunction0DViewShape_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0DVIEWSHAPE_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION0DVIEWSHAPE_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h
index 83fd07940f4..a32743d26a5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_SHAPEIDF0D_H
-#define FREESTYLE_PYTHON_SHAPEIDF0D_H
+#ifndef __FREESTYLE_PYTHON_SHAPEIDF0D_H__
+#define __FREESTYLE_PYTHON_SHAPEIDF0D_H__
 
 #include "../BPy_UnaryFunction0DId.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ShapeIdF0D_Type;
 
-#define BPy_ShapeIdF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ShapeIdF0D_Type)  )
+#define BPy_ShapeIdF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ShapeIdF0D_Type))
 
 /*---------------------------Python BPy_ShapeIdF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_SHAPEIDF0D_H */
+#endif /* __FREESTYLE_PYTHON_SHAPEIDF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h
index 07c343b8c2b..545fe0cee75 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_MATERIALF0D_H
-#define FREESTYLE_PYTHON_MATERIALF0D_H
+#ifndef __FREESTYLE_PYTHON_MATERIALF0D_H__
+#define __FREESTYLE_PYTHON_MATERIALF0D_H__
 
 #include "../BPy_UnaryFunction0DMaterial.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject MaterialF0D_Type;
 
-#define BPy_MaterialF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &MaterialF0D_Type)  )
+#define BPy_MaterialF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&MaterialF0D_Type))
 
 /*---------------------------Python BPy_MaterialF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_MATERIALF0D_H */
+#endif /* __FREESTYLE_PYTHON_MATERIALF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h
index 00234f11a76..9671a5b3223 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CURVENATUREF0D_H
-#define FREESTYLE_PYTHON_CURVENATUREF0D_H
+#ifndef __FREESTYLE_PYTHON_CURVENATUREF0D_H__
+#define __FREESTYLE_PYTHON_CURVENATUREF0D_H__
 
 #include "../BPy_UnaryFunction0DEdgeNature.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject CurveNatureF0D_Type;
 
-#define BPy_CurveNatureF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &CurveNatureF0D_Type)  )
+#define BPy_CurveNatureF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CurveNatureF0D_Type))
 
 /*---------------------------Python BPy_CurveNatureF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CURVENATUREF0D_H */
+#endif /* __FREESTYLE_PYTHON_CURVENATUREF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h
index 3bdf3d22257..2e1e578760d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_NORMAL2DF0D_H
-#define FREESTYLE_PYTHON_NORMAL2DF0D_H
+#ifndef __FREESTYLE_PYTHON_NORMAL2DF0D_H__
+#define __FREESTYLE_PYTHON_NORMAL2DF0D_H__
 
 #include "../BPy_UnaryFunction0DVec2f.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject Normal2DF0D_Type;
 
-#define BPy_Normal2DF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Normal2DF0D_Type)  )
+#define BPy_Normal2DF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Normal2DF0D_Type))
 
 /*---------------------------Python BPy_Normal2DF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_NORMAL2DF0D_H */
+#endif /* __FREESTYLE_PYTHON_NORMAL2DF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h
index df4219addbf..4d606acc2b4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_VERTEXORIENTATION2DF0D_H
-#define FREESTYLE_PYTHON_VERTEXORIENTATION2DF0D_H
+#ifndef __FREESTYLE_PYTHON_VERTEXORIENTATION2DF0D_H__
+#define __FREESTYLE_PYTHON_VERTEXORIENTATION2DF0D_H__
 
 #include "../BPy_UnaryFunction0DVec2f.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject VertexOrientation2DF0D_Type;
 
-#define BPy_VertexOrientation2DF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &VertexOrientation2DF0D_Type)  )
+#define BPy_VertexOrientation2DF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&VertexOrientation2DF0D_Type))
 
 /*---------------------------Python BPy_VertexOrientation2DF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_VERTEXORIENTATION2DF0D_H */
+#endif /* __FREESTYLE_PYTHON_VERTEXORIENTATION2DF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h
index 94ea4822917..418340708fa 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_VERTEXORIENTATION3DF0D_H
-#define FREESTYLE_PYTHON_VERTEXORIENTATION3DF0D_H
+#ifndef __FREESTYLE_PYTHON_VERTEXORIENTATION3DF0D_H__
+#define __FREESTYLE_PYTHON_VERTEXORIENTATION3DF0D_H__
 
 #include "../BPy_UnaryFunction0DVec3f.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject VertexOrientation3DF0D_Type;
 
-#define BPy_VertexOrientation3DF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &VertexOrientation3DF0D_Type)  )
+#define BPy_VertexOrientation3DF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&VertexOrientation3DF0D_Type))
 
 /*---------------------------Python BPy_VertexOrientation3DF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_VERTEXORIENTATION3DF0D_H */
+#endif /* __FREESTYLE_PYTHON_VERTEXORIENTATION3DF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h
index 9eb25f7e64d..7b4ed05e452 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETOCCLUDEEF0D_H
-#define FREESTYLE_PYTHON_GETOCCLUDEEF0D_H
+#ifndef __FREESTYLE_PYTHON_GETOCCLUDEEF0D_H__
+#define __FREESTYLE_PYTHON_GETOCCLUDEEF0D_H__
 
 #include "../BPy_UnaryFunction0DViewShape.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetOccludeeF0D_Type;
 
-#define BPy_GetOccludeeF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetOccludeeF0D_Type)  )
+#define BPy_GetOccludeeF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetOccludeeF0D_Type))
 
 /*---------------------------Python BPy_GetOccludeeF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETOCCLUDEEF0D_H */
+#endif /* __FREESTYLE_PYTHON_GETOCCLUDEEF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h
index 482294cf304..392b6deb00a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETSHAPEF0D_H
-#define FREESTYLE_PYTHON_GETSHAPEF0D_H
+#ifndef __FREESTYLE_PYTHON_GETSHAPEF0D_H__
+#define __FREESTYLE_PYTHON_GETSHAPEF0D_H__
 
 #include "../BPy_UnaryFunction0DViewShape.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetShapeF0D_Type;
 
-#define BPy_GetShapeF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetShapeF0D_Type)  )
+#define BPy_GetShapeF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetShapeF0D_Type))
 
 /*---------------------------Python BPy_GetShapeF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETSHAPEF0D_H */
+#endif /* __FREESTYLE_PYTHON_GETSHAPEF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h
index 5950e1e7a1f..d9b64e641f2 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CURVATURE2DANGLEF0D_H
-#define FREESTYLE_PYTHON_CURVATURE2DANGLEF0D_H
+#ifndef __FREESTYLE_PYTHON_CURVATURE2DANGLEF0D_H__
+#define __FREESTYLE_PYTHON_CURVATURE2DANGLEF0D_H__
 
 #include "../BPy_UnaryFunction0DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject Curvature2DAngleF0D_Type;
 
-#define BPy_Curvature2DAngleF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Curvature2DAngleF0D_Type)  )
+#define BPy_Curvature2DAngleF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Curvature2DAngleF0D_Type))
 
 /*---------------------------Python BPy_Curvature2DAngleF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CURVATURE2DANGLEF0D_H */
+#endif /* __FREESTYLE_PYTHON_CURVATURE2DANGLEF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h
index eb51b01e80f..54da109e985 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_DENSITYF0D_H
-#define FREESTYLE_PYTHON_DENSITYF0D_H
+#ifndef __FREESTYLE_PYTHON_DENSITYF0D_H__
+#define __FREESTYLE_PYTHON_DENSITYF0D_H__
 
 #include "../BPy_UnaryFunction0DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject DensityF0D_Type;
 
-#define BPy_DensityF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &DensityF0D_Type)  )
+#define BPy_DensityF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&DensityF0D_Type))
 
 /*---------------------------Python BPy_DensityF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_DENSITYF0D_H */
+#endif /* __FREESTYLE_PYTHON_DENSITYF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h
index 4e668036af6..101ebbb54be 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETPROJECTEDXF0D_H
-#define FREESTYLE_PYTHON_GETPROJECTEDXF0D_H
+#ifndef __FREESTYLE_PYTHON_GETPROJECTEDXF0D_H__
+#define __FREESTYLE_PYTHON_GETPROJECTEDXF0D_H__
 
 #include "../BPy_UnaryFunction0DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetProjectedXF0D_Type;
 
-#define BPy_GetProjectedXF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedXF0D_Type)  )
+#define BPy_GetProjectedXF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetProjectedXF0D_Type))
 
 /*---------------------------Python BPy_GetProjectedXF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETPROJECTEDXF0D_H */
+#endif /* __FREESTYLE_PYTHON_GETPROJECTEDXF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h
index d54e1bafaed..c09858f249a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETPROJECTEDYF0D_H
-#define FREESTYLE_PYTHON_GETPROJECTEDYF0D_H
+#ifndef __FREESTYLE_PYTHON_GETPROJECTEDYF0D_H__
+#define __FREESTYLE_PYTHON_GETPROJECTEDYF0D_H__
 
 #include "../BPy_UnaryFunction0DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetProjectedYF0D_Type;
 
-#define BPy_GetProjectedYF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedYF0D_Type)  )
+#define BPy_GetProjectedYF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetProjectedYF0D_Type))
 
 /*---------------------------Python BPy_GetProjectedYF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETPROJECTEDYF0D_H */
+#endif /* __FREESTYLE_PYTHON_GETPROJECTEDYF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h
index f68df367dd8..224b8544730 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETPROJECTEDZF0D_H
-#define FREESTYLE_PYTHON_GETPROJECTEDZF0D_H
+#ifndef __FREESTYLE_PYTHON_GETPROJECTEDZF0D_H__
+#define __FREESTYLE_PYTHON_GETPROJECTEDZF0D_H__
 
 #include "../BPy_UnaryFunction0DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetProjectedZF0D_Type;
 
-#define BPy_GetProjectedZF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedZF0D_Type)  )
+#define BPy_GetProjectedZF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetProjectedZF0D_Type))
 
 /*---------------------------Python BPy_GetProjectedZF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETPROJECTEDZF0D_H */
+#endif /* __FREESTYLE_PYTHON_GETPROJECTEDZF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h
index 486aae43380..5fa2bf83dcd 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETXF0D_H
-#define FREESTYLE_PYTHON_GETXF0D_H
+#ifndef __FREESTYLE_PYTHON_GETXF0D_H__
+#define __FREESTYLE_PYTHON_GETXF0D_H__
 
 #include "../BPy_UnaryFunction0DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetXF0D_Type;
 
-#define BPy_GetXF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetXF0D_Type)  )
+#define BPy_GetXF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetXF0D_Type))
 
 /*---------------------------Python BPy_GetXF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETXF0D_H */
+#endif /* __FREESTYLE_PYTHON_GETXF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h
index ec5f5ebc4fe..29289a13d1f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETYF0D_H
-#define FREESTYLE_PYTHON_GETYF0D_H
+#ifndef __FREESTYLE_PYTHON_GETYF0D_H__
+#define __FREESTYLE_PYTHON_GETYF0D_H__
 
 #include "../BPy_UnaryFunction0DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetYF0D_Type;
 
-#define BPy_GetYF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetYF0D_Type)  )
+#define BPy_GetYF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetYF0D_Type))
 
 /*---------------------------Python BPy_GetYF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETYF0D_H */
+#endif /* __FREESTYLE_PYTHON_GETYF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h
index c895ec61b9a..b385b7c006b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETZF0D_H
-#define FREESTYLE_PYTHON_GETZF0D_H
+#ifndef __FREESTYLE_PYTHON_GETZF0D_H__
+#define __FREESTYLE_PYTHON_GETZF0D_H__
 
 #include "../BPy_UnaryFunction0DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetZF0D_Type;
 
-#define BPy_GetZF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetZF0D_Type)  )
+#define BPy_GetZF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetZF0D_Type))
 
 /*---------------------------Python BPy_GetZF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETZF0D_H */
+#endif /* __FREESTYLE_PYTHON_GETZF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h
index 29ed3aef110..7eebf50a8a2 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF0D_H
-#define FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF0D_H
+#ifndef __FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF0D_H__
+#define __FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF0D_H__
 
 #include "../BPy_UnaryFunction0DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject LocalAverageDepthF0D_Type;
 
-#define BPy_LocalAverageDepthF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &LocalAverageDepthF0D_Type)  )
+#define BPy_LocalAverageDepthF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&LocalAverageDepthF0D_Type))
 
 /*---------------------------Python BPy_LocalAverageDepthF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF0D_H */
+#endif /* __FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h
index 79b33bd3e37..c1e648abb36 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_ZDISCONTINUITYF0D_H
-#define FREESTYLE_PYTHON_ZDISCONTINUITYF0D_H
+#ifndef __FREESTYLE_PYTHON_ZDISCONTINUITYF0D_H__
+#define __FREESTYLE_PYTHON_ZDISCONTINUITYF0D_H__
 
 #include "../BPy_UnaryFunction0DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ZDiscontinuityF0D_Type;
 
-#define BPy_ZDiscontinuityF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ZDiscontinuityF0D_Type)  )
+#define BPy_ZDiscontinuityF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ZDiscontinuityF0D_Type))
 
 /*---------------------------Python BPy_ZDiscontinuityF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_ZDISCONTINUITYF0D_H */
+#endif /* __FREESTYLE_PYTHON_ZDISCONTINUITYF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h
index d95ab546a76..4b8fc291a68 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETCURVILINEARABSCISSAF0D_H
-#define FREESTYLE_PYTHON_GETCURVILINEARABSCISSAF0D_H
+#ifndef __FREESTYLE_PYTHON_GETCURVILINEARABSCISSAF0D_H__
+#define __FREESTYLE_PYTHON_GETCURVILINEARABSCISSAF0D_H__
 
 #include "../BPy_UnaryFunction0DFloat.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetCurvilinearAbscissaF0D_Type;
 
-#define BPy_GetCurvilinearAbscissaF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetCurvilinearAbscissaF0D_Type)  )
+#define BPy_GetCurvilinearAbscissaF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetCurvilinearAbscissaF0D_Type))
 
 /*---------------------------Python BPy_GetCurvilinearAbscissaF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETCURVILINEARABSCISSAF0D_H */
+#endif /* __FREESTYLE_PYTHON_GETCURVILINEARABSCISSAF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h
index 76b8ef66052..6d87e229d39 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETPARAMETERF0D_H
-#define FREESTYLE_PYTHON_GETPARAMETERF0D_H
+#ifndef __FREESTYLE_PYTHON_GETPARAMETERF0D_H__
+#define __FREESTYLE_PYTHON_GETPARAMETERF0D_H__
 
 #include "../BPy_UnaryFunction0DFloat.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetParameterF0D_Type;
 
-#define BPy_GetParameterF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetParameterF0D_Type)  )
+#define BPy_GetParameterF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetParameterF0D_Type))
 
 /*---------------------------Python BPy_GetParameterF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETPARAMETERF0D_H */
+#endif /* __FREESTYLE_PYTHON_GETPARAMETERF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h
index a4450897083..96a31bd3f0c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF0D_H
-#define FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF0D_H
+#ifndef __FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF0D_H__
+#define __FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF0D_H__
 
 #include "../BPy_UnaryFunction0DFloat.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetViewMapGradientNormF0D_Type;
 
-#define BPy_GetViewMapGradientNormF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetViewMapGradientNormF0D_Type)  )
+#define BPy_GetViewMapGradientNormF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetViewMapGradientNormF0D_Type))
 
 /*---------------------------Python BPy_GetViewMapGradientNormF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF0D_H */
+#endif /* __FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h
index f00dbdc5e81..3150397006f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_READCOMPLETEVIEWMAPPIXELF0D_H
-#define FREESTYLE_PYTHON_READCOMPLETEVIEWMAPPIXELF0D_H
+#ifndef __FREESTYLE_PYTHON_READCOMPLETEVIEWMAPPIXELF0D_H__
+#define __FREESTYLE_PYTHON_READCOMPLETEVIEWMAPPIXELF0D_H__
 
 #include "../BPy_UnaryFunction0DFloat.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ReadCompleteViewMapPixelF0D_Type;
 
-#define BPy_ReadCompleteViewMapPixelF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ReadCompleteViewMapPixelF0D_Type)  )
+#define BPy_ReadCompleteViewMapPixelF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ReadCompleteViewMapPixelF0D_Type))
 
 /*---------------------------Python BPy_ReadCompleteViewMapPixelF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_READCOMPLETEVIEWMAPPIXELF0D_H */
+#endif /* __FREESTYLE_PYTHON_READCOMPLETEVIEWMAPPIXELF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h
index 41e1f05ff20..1c80b9c9bb6 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_READMAPPIXELF0D_H
-#define FREESTYLE_PYTHON_READMAPPIXELF0D_H
+#ifndef __FREESTYLE_PYTHON_READMAPPIXELF0D_H__
+#define __FREESTYLE_PYTHON_READMAPPIXELF0D_H__
 
 #include "../BPy_UnaryFunction0DFloat.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ReadMapPixelF0D_Type;
 
-#define BPy_ReadMapPixelF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ReadMapPixelF0D_Type)  )
+#define BPy_ReadMapPixelF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ReadMapPixelF0D_Type))
 
 /*---------------------------Python BPy_ReadMapPixelF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_READMAPPIXELF0D_H */
+#endif /* __FREESTYLE_PYTHON_READMAPPIXELF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h
index 5573c43d354..e7a995ae256 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_READSTEERABLEVIEWMAPPIXELF0D_H
-#define FREESTYLE_PYTHON_READSTEERABLEVIEWMAPPIXELF0D_H
+#ifndef __FREESTYLE_PYTHON_READSTEERABLEVIEWMAPPIXELF0D_H__
+#define __FREESTYLE_PYTHON_READSTEERABLEVIEWMAPPIXELF0D_H__
 
 #include "../BPy_UnaryFunction0DFloat.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ReadSteerableViewMapPixelF0D_Type;
 
-#define BPy_ReadSteerableViewMapPixelF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ReadSteerableViewMapPixelF0D_Type)  )
+#define BPy_ReadSteerableViewMapPixelF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ReadSteerableViewMapPixelF0D_Type))
 
 /*---------------------------Python BPy_ReadSteerableViewMapPixelF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_READSTEERABLEVIEWMAPPIXELF0D_H */
+#endif /* __FREESTYLE_PYTHON_READSTEERABLEVIEWMAPPIXELF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h
index 551f1e1cc15..e986aa9f540 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF0D_H
-#define FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF0D_H
+#ifndef __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF0D_H__
+#define __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF0D_H__
 
 #include "../BPy_UnaryFunction0DUnsigned.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject QuantitativeInvisibilityF0D_Type;
 
-#define BPy_QuantitativeInvisibilityF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &QuantitativeInvisibilityF0D_Type)  )
+#define BPy_QuantitativeInvisibilityF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&QuantitativeInvisibilityF0D_Type))
 
 /*---------------------------Python BPy_QuantitativeInvisibilityF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF0D_H */
+#endif /* __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h
index 38283775570..64d2bdd64c5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETOCCLUDERSF0D_H
-#define FREESTYLE_PYTHON_GETOCCLUDERSF0D_H
+#ifndef __FREESTYLE_PYTHON_GETOCCLUDERSF0D_H__
+#define __FREESTYLE_PYTHON_GETOCCLUDERSF0D_H__
 
 #include "../BPy_UnaryFunction0DVectorViewShape.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetOccludersF0D_Type;
 
-#define BPy_GetOccludersF0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetOccludersF0D_Type)  )
+#define BPy_GetOccludersF0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetOccludersF0D_Type))
 
 /*---------------------------Python BPy_GetOccludersF0D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETOCCLUDERSF0D_H */
+#endif /* __FREESTYLE_PYTHON_GETOCCLUDERSF0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h
index 2e6dc6da718..aef3885a3eb 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DDOUBLE_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION1DDOUBLE_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DDOUBLE_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION1DDOUBLE_H__
 
 #include "../BPy_UnaryFunction1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DDouble_Type;
 
-#define BPy_UnaryFunction1DDouble_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DDouble_Type)  )
+#define BPy_UnaryFunction1DDouble_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction1DDouble_Type))
 
 /*---------------------------Python BPy_UnaryFunction1DDouble structure definition----------*/
 typedef struct {
@@ -53,7 +53,7 @@ typedef struct {
 } BPy_UnaryFunction1DDouble;
 
 /*---------------------------Python BPy_UnaryFunction1DDouble visible prototypes-----------*/
-int UnaryFunction1DDouble_Init( PyObject *module );
+int UnaryFunction1DDouble_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -62,4 +62,4 @@ int UnaryFunction1DDouble_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DDOUBLE_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DDOUBLE_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h
index 5eca860f221..5b0eff75870 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DEDGENATURE_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION1DEDGENATURE_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DEDGENATURE_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION1DEDGENATURE_H__
 
 #include "../BPy_UnaryFunction1D.h"
 
@@ -46,7 +46,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DEdgeNature_Type;
 
-#define BPy_UnaryFunction1DEdgeNature_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DEdgeNature_Type)  )
+#define BPy_UnaryFunction1DEdgeNature_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction1DEdgeNature_Type))
 
 /*---------------------------Python BPy_UnaryFunction1DEdgeNature structure definition----------*/
 typedef struct {
@@ -55,7 +55,7 @@ typedef struct {
 } BPy_UnaryFunction1DEdgeNature;
 
 /*---------------------------Python BPy_UnaryFunction1DEdgeNature visible prototypes-----------*/
-int UnaryFunction1DEdgeNature_Init( PyObject *module );
+int UnaryFunction1DEdgeNature_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -64,4 +64,4 @@ int UnaryFunction1DEdgeNature_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DEDGENATURE_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DEDGENATURE_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h
index f4d5c60ab67..694435b98b5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DFLOAT_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION1DFLOAT_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DFLOAT_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION1DFLOAT_H__
 
 #include "../BPy_UnaryFunction1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DFloat_Type;
 
-#define BPy_UnaryFunction1DFloat_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DFloat_Type)  )
+#define BPy_UnaryFunction1DFloat_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction1DFloat_Type))
 
 /*---------------------------Python BPy_UnaryFunction1DFloat structure definition----------*/
 typedef struct {
@@ -53,7 +53,7 @@ typedef struct {
 } BPy_UnaryFunction1DFloat;
 
 /*---------------------------Python BPy_UnaryFunction1DFloat visible prototypes-----------*/
-int UnaryFunction1DFloat_Init( PyObject *module );
+int UnaryFunction1DFloat_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -62,4 +62,4 @@ int UnaryFunction1DFloat_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DFLOAT_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DFLOAT_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h
index 6ca75a7bd6f..7f94723f6b5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DUNSIGNED_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION1DUNSIGNED_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DUNSIGNED_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION1DUNSIGNED_H__
 
 #include "../BPy_UnaryFunction1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DUnsigned_Type;
 
-#define BPy_UnaryFunction1DUnsigned_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DUnsigned_Type)  )
+#define BPy_UnaryFunction1DUnsigned_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction1DUnsigned_Type))
 
 /*---------------------------Python BPy_UnaryFunction1DUnsigned structure definition----------*/
 typedef struct {
@@ -53,7 +53,7 @@ typedef struct {
 } BPy_UnaryFunction1DUnsigned;
 
 /*---------------------------Python BPy_UnaryFunction1DUnsigned visible prototypes-----------*/
-int UnaryFunction1DUnsigned_Init( PyObject *module );
+int UnaryFunction1DUnsigned_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -62,4 +62,4 @@ int UnaryFunction1DUnsigned_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DUNSIGNED_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DUNSIGNED_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h
index ac6c5ced18a..61c85d7c9f5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DVEC2F_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION1DVEC2F_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DVEC2F_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION1DVEC2F_H__
 
 #include "../BPy_UnaryFunction1D.h"
 
@@ -47,7 +47,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DVec2f_Type;
 
-#define BPy_UnaryFunction1DVec2f_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DVec2f_Type)  )
+#define BPy_UnaryFunction1DVec2f_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction1DVec2f_Type))
 
 /*---------------------------Python BPy_UnaryFunction1DVec2f structure definition----------*/
 typedef struct {
@@ -56,7 +56,7 @@ typedef struct {
 } BPy_UnaryFunction1DVec2f;
 
 /*---------------------------Python BPy_UnaryFunction1DVec2f visible prototypes-----------*/
-int UnaryFunction1DVec2f_Init( PyObject *module );
+int UnaryFunction1DVec2f_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -65,4 +65,4 @@ int UnaryFunction1DVec2f_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DVEC2F_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DVEC2F_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h
index 2976bc28200..67ce5faef7f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DVEC3F_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION1DVEC3F_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DVEC3F_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION1DVEC3F_H__
 
 #include "../BPy_UnaryFunction1D.h"
 
@@ -47,7 +47,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DVec3f_Type;
 
-#define BPy_UnaryFunction1DVec3f_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DVec3f_Type)  )
+#define BPy_UnaryFunction1DVec3f_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction1DVec3f_Type))
 
 /*---------------------------Python BPy_UnaryFunction1DVec3f structure definition----------*/
 typedef struct {
@@ -56,7 +56,7 @@ typedef struct {
 } BPy_UnaryFunction1DVec3f;
 
 /*---------------------------Python BPy_UnaryFunction1DVec3f visible prototypes-----------*/
-int UnaryFunction1DVec3f_Init( PyObject *module );
+int UnaryFunction1DVec3f_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -65,4 +65,4 @@ int UnaryFunction1DVec3f_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DVEC3F_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DVEC3F_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
index 940822fe834..e3412535118 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DVECTORVIEWSHAPE_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION1DVECTORVIEWSHAPE_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DVECTORVIEWSHAPE_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION1DVECTORVIEWSHAPE_H__
 
 #include "../BPy_UnaryFunction1D.h"
 
@@ -47,7 +47,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DVectorViewShape_Type;
 
-#define BPy_UnaryFunction1DVectorViewShape_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DVectorViewShape_Type)  )
+#define BPy_UnaryFunction1DVectorViewShape_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction1DVectorViewShape_Type))
 
 /*---------------------------Python BPy_UnaryFunction1DVectorViewShape structure definition----------*/
 typedef struct {
@@ -56,7 +56,7 @@ typedef struct {
 } BPy_UnaryFunction1DVectorViewShape;
 
 /*---------------------------Python BPy_UnaryFunction1DVectorViewShape visible prototypes-----------*/
-int UnaryFunction1DVectorViewShape_Init( PyObject *module );
+int UnaryFunction1DVectorViewShape_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -65,4 +65,4 @@ int UnaryFunction1DVectorViewShape_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DVECTORVIEWSHAPE_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DVECTORVIEWSHAPE_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
index 628e1106f29..40569885e4c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_UNARYFUNCTION1DVOID_H
-#define FREESTYLE_PYTHON_UNARYFUNCTION1DVOID_H
+#ifndef __FREESTYLE_PYTHON_UNARYFUNCTION1DVOID_H__
+#define __FREESTYLE_PYTHON_UNARYFUNCTION1DVOID_H__
 
 #include "../BPy_UnaryFunction1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject UnaryFunction1DVoid_Type;
 
-#define BPy_UnaryFunction1DVoid_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1DVoid_Type)  )
+#define BPy_UnaryFunction1DVoid_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&UnaryFunction1DVoid_Type))
 
 /*---------------------------Python BPy_UnaryFunction1DVoid structure definition----------*/
 typedef struct {
@@ -53,7 +53,7 @@ typedef struct {
 } BPy_UnaryFunction1DVoid;
 
 /*---------------------------Python BPy_UnaryFunction1DVoid visible prototypes-----------*/
-int UnaryFunction1DVoid_Init( PyObject *module );
+int UnaryFunction1DVoid_Init(PyObject *module);
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -62,4 +62,4 @@ int UnaryFunction1DVoid_Init( PyObject *module );
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_UNARYFUNCTION1DVOID_H */
+#endif /* __FREESTYLE_PYTHON_UNARYFUNCTION1DVOID_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h
index 3382e23be95..dbdb1180ee8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CURVENATUREF1D_H
-#define FREESTYLE_PYTHON_CURVENATUREF1D_H
+#ifndef __FREESTYLE_PYTHON_CURVENATUREF1D_H__
+#define __FREESTYLE_PYTHON_CURVENATUREF1D_H__
 
 #include "../BPy_UnaryFunction1DEdgeNature.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject CurveNatureF1D_Type;
 
-#define BPy_CurveNatureF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &CurveNatureF1D_Type)  )
+#define BPy_CurveNatureF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CurveNatureF1D_Type))
 
 /*---------------------------Python BPy_CurveNatureF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CURVENATUREF1D_H */
+#endif /* __FREESTYLE_PYTHON_CURVENATUREF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h
index 9b212c68bd1..9d49b10c616 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_NORMAL2DF1D_H
-#define FREESTYLE_PYTHON_NORMAL2DF1D_H
+#ifndef __FREESTYLE_PYTHON_NORMAL2DF1D_H__
+#define __FREESTYLE_PYTHON_NORMAL2DF1D_H__
 
 #include "../BPy_UnaryFunction1DVec2f.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject Normal2DF1D_Type;
 
-#define BPy_Normal2DF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Normal2DF1D_Type)  )
+#define BPy_Normal2DF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Normal2DF1D_Type))
 
 /*---------------------------Python BPy_Normal2DF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_NORMAL2DF1D_H */
+#endif /* __FREESTYLE_PYTHON_NORMAL2DF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h
index fdf5bc6d54e..ccf69ab394c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_ORIENTATION2DF1D_H
-#define FREESTYLE_PYTHON_ORIENTATION2DF1D_H
+#ifndef __FREESTYLE_PYTHON_ORIENTATION2DF1D_H__
+#define __FREESTYLE_PYTHON_ORIENTATION2DF1D_H__
 
 #include "../BPy_UnaryFunction1DVec2f.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject Orientation2DF1D_Type;
 
-#define BPy_Orientation2DF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Orientation2DF1D_Type)  )
+#define BPy_Orientation2DF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Orientation2DF1D_Type))
 
 /*---------------------------Python BPy_Orientation2DF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_ORIENTATION2DF1D_H */
+#endif /* __FREESTYLE_PYTHON_ORIENTATION2DF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h
index 7240a2d4741..cfce5afdfbd 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_ORIENTATION3DF1D_H
-#define FREESTYLE_PYTHON_ORIENTATION3DF1D_H
+#ifndef __FREESTYLE_PYTHON_ORIENTATION3DF1D_H__
+#define __FREESTYLE_PYTHON_ORIENTATION3DF1D_H__
 
 #include "../BPy_UnaryFunction1DVec3f.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject Orientation3DF1D_Type;
 
-#define BPy_Orientation3DF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Orientation3DF1D_Type)  )
+#define BPy_Orientation3DF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Orientation3DF1D_Type))
 
 /*---------------------------Python BPy_Orientation3DF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_ORIENTATION3DF1D_H */
+#endif /* __FREESTYLE_PYTHON_ORIENTATION3DF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h
index c64de18a7e8..3f14d6545f9 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CURVATURE2DANGLEF1D_H
-#define FREESTYLE_PYTHON_CURVATURE2DANGLEF1D_H
+#ifndef __FREESTYLE_PYTHON_CURVATURE2DANGLEF1D_H__
+#define __FREESTYLE_PYTHON_CURVATURE2DANGLEF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject Curvature2DAngleF1D_Type;
 
-#define BPy_Curvature2DAngleF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Curvature2DAngleF1D_Type)  )
+#define BPy_Curvature2DAngleF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&Curvature2DAngleF1D_Type))
 
 /*---------------------------Python BPy_Curvature2DAngleF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CURVATURE2DANGLEF1D_H */
+#endif /* __FREESTYLE_PYTHON_CURVATURE2DANGLEF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h
index 4a223cff46b..88cbe5f47f0 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_DENSITYF1D_H
-#define FREESTYLE_PYTHON_DENSITYF1D_H
+#ifndef __FREESTYLE_PYTHON_DENSITYF1D_H__
+#define __FREESTYLE_PYTHON_DENSITYF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject DensityF1D_Type;
 
-#define BPy_DensityF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &DensityF1D_Type)  )
+#define BPy_DensityF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&DensityF1D_Type))
 
 /*---------------------------Python BPy_DensityF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_DENSITYF1D_H */
+#endif /* __FREESTYLE_PYTHON_DENSITYF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h
index 594c736c085..a40e15a8239 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETCOMPLETEVIEWMAPDENSITYF1D_H
-#define FREESTYLE_PYTHON_GETCOMPLETEVIEWMAPDENSITYF1D_H
+#ifndef __FREESTYLE_PYTHON_GETCOMPLETEVIEWMAPDENSITYF1D_H__
+#define __FREESTYLE_PYTHON_GETCOMPLETEVIEWMAPDENSITYF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetCompleteViewMapDensityF1D_Type;
 
-#define BPy_GetCompleteViewMapDensityF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetCompleteViewMapDensityF1D_Type)  )
+#define BPy_GetCompleteViewMapDensityF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetCompleteViewMapDensityF1D_Type))
 
 /*---------------------------Python BPy_GetCompleteViewMapDensityF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETCOMPLETEVIEWMAPDENSITYF1D_H */
+#endif /* __FREESTYLE_PYTHON_GETCOMPLETEVIEWMAPDENSITYF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h
index c778024915a..e18012fdcb4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETDIRECTIONALVIEWMAPDENSITYF1D_H
-#define FREESTYLE_PYTHON_GETDIRECTIONALVIEWMAPDENSITYF1D_H
+#ifndef __FREESTYLE_PYTHON_GETDIRECTIONALVIEWMAPDENSITYF1D_H__
+#define __FREESTYLE_PYTHON_GETDIRECTIONALVIEWMAPDENSITYF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetDirectionalViewMapDensityF1D_Type;
 
-#define BPy_GetDirectionalViewMapDensityF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetDirectionalViewMapDensityF1D_Type)  )
+#define BPy_GetDirectionalViewMapDensityF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetDirectionalViewMapDensityF1D_Type))
 
 /*---------------------------Python BPy_GetDirectionalViewMapDensityF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETDIRECTIONALVIEWMAPDENSITYF1D_H */
+#endif /* __FREESTYLE_PYTHON_GETDIRECTIONALVIEWMAPDENSITYF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h
index fd8a4d55235..2e45eecc04d 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETPROJECTEDXF1D_H
-#define FREESTYLE_PYTHON_GETPROJECTEDXF1D_H
+#ifndef __FREESTYLE_PYTHON_GETPROJECTEDXF1D_H__
+#define __FREESTYLE_PYTHON_GETPROJECTEDXF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetProjectedXF1D_Type;
 
-#define BPy_GetProjectedXF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedXF1D_Type)  )
+#define BPy_GetProjectedXF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetProjectedXF1D_Type))
 
 /*---------------------------Python BPy_GetProjectedXF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETPROJECTEDXF1D_H */
+#endif /* __FREESTYLE_PYTHON_GETPROJECTEDXF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h
index 4e8bf3b1c30..0ab3ea8e82b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETPROJECTEDYF1D_H
-#define FREESTYLE_PYTHON_GETPROJECTEDYF1D_H
+#ifndef __FREESTYLE_PYTHON_GETPROJECTEDYF1D_H__
+#define __FREESTYLE_PYTHON_GETPROJECTEDYF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetProjectedYF1D_Type;
 
-#define BPy_GetProjectedYF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedYF1D_Type)  )
+#define BPy_GetProjectedYF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetProjectedYF1D_Type))
 
 /*---------------------------Python BPy_GetProjectedYF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETPROJECTEDYF1D_H */
+#endif /* __FREESTYLE_PYTHON_GETPROJECTEDYF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h
index 2b2feede20f..d65160dcfe8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETPROJECTEDZF1D_H
-#define FREESTYLE_PYTHON_GETPROJECTEDZF1D_H
+#ifndef __FREESTYLE_PYTHON_GETPROJECTEDZF1D_H__
+#define __FREESTYLE_PYTHON_GETPROJECTEDZF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetProjectedZF1D_Type;
 
-#define BPy_GetProjectedZF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedZF1D_Type)  )
+#define BPy_GetProjectedZF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetProjectedZF1D_Type))
 
 /*---------------------------Python BPy_GetProjectedZF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETPROJECTEDZF1D_H */
+#endif /* __FREESTYLE_PYTHON_GETPROJECTEDZF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h
index 93bf33d045c..30668a08e8f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETSTEERABLEVIEWMAPDENSITYF1D_H
-#define FREESTYLE_PYTHON_GETSTEERABLEVIEWMAPDENSITYF1D_H
+#ifndef __FREESTYLE_PYTHON_GETSTEERABLEVIEWMAPDENSITYF1D_H__
+#define __FREESTYLE_PYTHON_GETSTEERABLEVIEWMAPDENSITYF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetSteerableViewMapDensityF1D_Type;
 
-#define BPy_GetSteerableViewMapDensityF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetSteerableViewMapDensityF1D_Type)  )
+#define BPy_GetSteerableViewMapDensityF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetSteerableViewMapDensityF1D_Type))
 /*---------------------------Python BPy_GetSteerableViewMapDensityF1D structure definition----------*/
 typedef struct {
 	BPy_UnaryFunction1DDouble py_uf1D_double;
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETSTEERABLEVIEWMAPDENSITYF1D_H */
+#endif /* __FREESTYLE_PYTHON_GETSTEERABLEVIEWMAPDENSITYF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h
index 23cd18f29ca..ffcc8faf952 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF1D_H
-#define FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF1D_H
+#ifndef __FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF1D_H__
+#define __FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetViewMapGradientNormF1D_Type;
 
-#define BPy_GetViewMapGradientNormF1D_Check(v)	( ((PyObject *) v)->ob_type == PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetViewMapGradientNormF1D_Type)  )
+#define BPy_GetViewMapGradientNormF1D_Check(v)	(((PyObject *)v)->ob_type == PyObject_IsInstance((PyObject *)v, (PyObject *)&GetViewMapGradientNormF1D_Type))
 
 /*---------------------------Python BPy_GetViewMapGradientNormF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF1D_H */
+#endif /* __FREESTYLE_PYTHON_GETVIEWMAPGRADIENTNORMF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h
index 1e83b375beb..aa1aa123cc9 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETXF1D_H
-#define FREESTYLE_PYTHON_GETXF1D_H
+#ifndef __FREESTYLE_PYTHON_GETXF1D_H__
+#define __FREESTYLE_PYTHON_GETXF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetXF1D_Type;
 
-#define BPy_GetXF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetXF1D_Type)  )
+#define BPy_GetXF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetXF1D_Type))
 
 /*---------------------------Python BPy_GetXF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETXF1D_H */
+#endif /* __FREESTYLE_PYTHON_GETXF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h
index 87f8cbb765e..4a704b199ec 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETYF1D_H
-#define FREESTYLE_PYTHON_GETYF1D_H
+#ifndef __FREESTYLE_PYTHON_GETYF1D_H__
+#define __FREESTYLE_PYTHON_GETYF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetYF1D_Type;
 
-#define BPy_GetYF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetYF1D_Type)  )
+#define BPy_GetYF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetYF1D_Type))
 
 /*---------------------------Python BPy_GetYF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETYF1D_H */
+#endif /* __FREESTYLE_PYTHON_GETYF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h
index bb72c7f0ff2..3810a5810ab 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETZF1D_H
-#define FREESTYLE_PYTHON_GETZF1D_H
+#ifndef __FREESTYLE_PYTHON_GETZF1D_H__
+#define __FREESTYLE_PYTHON_GETZF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetZF1D_Type;
 
-#define BPy_GetZF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetZF1D_Type)  )
+#define BPy_GetZF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetZF1D_Type))
 
 /*---------------------------Python BPy_GetZF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETZF1D_H */
+#endif /* __FREESTYLE_PYTHON_GETZF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h
index 0255b3a14a0..bd91b66d3ac 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF1D_H
-#define FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF1D_H
+#ifndef __FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF1D_H__
+#define __FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject LocalAverageDepthF1D_Type;
 
-#define BPy_LocalAverageDepthF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &LocalAverageDepthF1D_Type)  )
+#define BPy_LocalAverageDepthF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&LocalAverageDepthF1D_Type))
 
 /*---------------------------Python BPy_LocalAverageDepthF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF1D_H */
+#endif /* __FREESTYLE_PYTHON_LOCALAVERAGEDEPTHF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h
index 21f201fee56..b5e22e3b990 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_ZDISCONTINUITYF1D_H
-#define FREESTYLE_PYTHON_ZDISCONTINUITYF1D_H
+#ifndef __FREESTYLE_PYTHON_ZDISCONTINUITYF1D_H__
+#define __FREESTYLE_PYTHON_ZDISCONTINUITYF1D_H__
 
 #include "../BPy_UnaryFunction1DDouble.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ZDiscontinuityF1D_Type;
 
-#define BPy_ZDiscontinuityF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ZDiscontinuityF1D_Type)  )
+#define BPy_ZDiscontinuityF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ZDiscontinuityF1D_Type))
 
 /*---------------------------Python BPy_ZDiscontinuityF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_ZDISCONTINUITYF1D_H */
+#endif /* __FREESTYLE_PYTHON_ZDISCONTINUITYF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h
index b97f11b90e3..21c56c40a3a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF1D_H
-#define FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF1D_H
+#ifndef __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF1D_H__
+#define __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF1D_H__
 
 #include "../BPy_UnaryFunction1DUnsigned.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject QuantitativeInvisibilityF1D_Type;
 
-#define BPy_QuantitativeInvisibilityF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &QuantitativeInvisibilityF1D_Type)  )
+#define BPy_QuantitativeInvisibilityF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&QuantitativeInvisibilityF1D_Type))
 
 /*---------------------------Python BPy_QuantitativeInvisibilityF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF1D_H */
+#endif /* __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h
index 9569664332c..bd789f3a474 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETOCCLUDEEF1D_H
-#define FREESTYLE_PYTHON_GETOCCLUDEEF1D_H
+#ifndef __FREESTYLE_PYTHON_GETOCCLUDEEF1D_H__
+#define __FREESTYLE_PYTHON_GETOCCLUDEEF1D_H__
 
 #include "../BPy_UnaryFunction1DVectorViewShape.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetOccludeeF1D_Type;
 
-#define BPy_GetOccludeeF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetOccludeeF1D_Type)  )
+#define BPy_GetOccludeeF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetOccludeeF1D_Type))
 
 /*---------------------------Python BPy_GetOccludeeF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETOCCLUDEEF1D_H */
+#endif /* __FREESTYLE_PYTHON_GETOCCLUDEEF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h
index acf1f41acef..aa52b86dbb9 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETOCCLUDERSF1D_H
-#define FREESTYLE_PYTHON_GETOCCLUDERSF1D_H
+#ifndef __FREESTYLE_PYTHON_GETOCCLUDERSF1D_H__
+#define __FREESTYLE_PYTHON_GETOCCLUDERSF1D_H__
 
 #include "../BPy_UnaryFunction1DVectorViewShape.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetOccludersF1D_Type;
 
-#define BPy_GetOccludersF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetOccludersF1D_Type)  )
+#define BPy_GetOccludersF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetOccludersF1D_Type))
 
 /*---------------------------Python BPy_GetOccludersF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETOCCLUDERSF1D_H */
+#endif /* __FREESTYLE_PYTHON_GETOCCLUDERSF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h
index 7b2d8a63cca..d13320727b7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_GETSHAPEF1D_H
-#define FREESTYLE_PYTHON_GETSHAPEF1D_H
+#ifndef __FREESTYLE_PYTHON_GETSHAPEF1D_H__
+#define __FREESTYLE_PYTHON_GETSHAPEF1D_H__
 
 #include "../BPy_UnaryFunction1DVectorViewShape.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject GetShapeF1D_Type;
 
-#define BPy_GetShapeF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetShapeF1D_Type)  )
+#define BPy_GetShapeF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&GetShapeF1D_Type))
 
 /*---------------------------Python BPy_GetShapeF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_GETSHAPEF1D_H */
+#endif /* __FREESTYLE_PYTHON_GETSHAPEF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h
index 14931bec3f4..3cca577bcd8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H
-#define FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H
+#ifndef __FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H__
+#define __FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H__
 
 #include "../BPy_UnaryFunction1DVoid.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ChainingTimeStampF1D_Type;
 
-#define BPy_ChainingTimeStampF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ChainingTimeStampF1D_Type)  )
+#define BPy_ChainingTimeStampF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainingTimeStampF1D_Type))
 
 /*---------------------------Python BPy_ChainingTimeStampF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H */
+#endif /* __FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h
index 80871ef1ff6..bf7d0791a7c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_INCREMENTCHAININGTIMESTAMPF1D_H
-#define FREESTYLE_PYTHON_INCREMENTCHAININGTIMESTAMPF1D_H
+#ifndef __FREESTYLE_PYTHON_INCREMENTCHAININGTIMESTAMPF1D_H__
+#define __FREESTYLE_PYTHON_INCREMENTCHAININGTIMESTAMPF1D_H__
 
 #include "../BPy_UnaryFunction1DVoid.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject IncrementChainingTimeStampF1D_Type;
 
-#define BPy_IncrementChainingTimeStampF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &IncrementChainingTimeStampF1D_Type)  )
+#define BPy_IncrementChainingTimeStampF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&IncrementChainingTimeStampF1D_Type))
 
 /*---------------------------Python BPy_IncrementChainingTimeStampF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_INCREMENTCHAININGTIMESTAMPF1D_H */
+#endif /* __FREESTYLE_PYTHON_INCREMENTCHAININGTIMESTAMPF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h
index fb0167b92b5..eef28f2b644 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_TIMESTAMPF1D_H
-#define FREESTYLE_PYTHON_TIMESTAMPF1D_H
+#ifndef __FREESTYLE_PYTHON_TIMESTAMPF1D_H__
+#define __FREESTYLE_PYTHON_TIMESTAMPF1D_H__
 
 #include "../BPy_UnaryFunction1DVoid.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject TimeStampF1D_Type;
 
-#define BPy_TimeStampF1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TimeStampF1D_Type)  )
+#define BPy_TimeStampF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TimeStampF1D_Type))
 
 /*---------------------------Python BPy_TimeStampF1D structure definition----------*/
 typedef struct {
@@ -58,4 +58,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H */
+#endif /* __FREESTYLE_PYTHON_CHAININGTIMESTAMPF1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h
index ca88b0969df..be61eaa0754 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_FALSEUP0D_H
-#define FREESTYLE_PYTHON_FALSEUP0D_H
+#ifndef __FREESTYLE_PYTHON_FALSEUP0D_H__
+#define __FREESTYLE_PYTHON_FALSEUP0D_H__
 
 #include "../BPy_UnaryPredicate0D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject FalseUP0D_Type;
 
-#define BPy_FalseUP0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FalseUP0D_Type)  )
+#define BPy_FalseUP0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FalseUP0D_Type))
 
 /*---------------------------Python BPy_FalseUP0D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_FALSEUP0D_H */
+#endif /* __FREESTYLE_PYTHON_FALSEUP0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h
index 3901577cae4..ae690b9fd54 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_TRUEUP0D_H
-#define FREESTYLE_PYTHON_TRUEUP0D_H
+#ifndef __FREESTYLE_PYTHON_TRUEUP0D_H__
+#define __FREESTYLE_PYTHON_TRUEUP0D_H__
 
 #include "../BPy_UnaryPredicate0D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject TrueUP0D_Type;
 
-#define BPy_TrueUP0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TrueUP0D_Type)  )
+#define BPy_TrueUP0D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TrueUP0D_Type))
 
 /*---------------------------Python BPy_TrueUP0D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_TRUEUP0D_H */
+#endif /* __FREESTYLE_PYTHON_TRUEUP0D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
index f2e1484b17f..a1a37b1526d 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_CONTOURUP1D_H
-#define FREESTYLE_PYTHON_CONTOURUP1D_H
+#ifndef __FREESTYLE_PYTHON_CONTOURUP1D_H__
+#define __FREESTYLE_PYTHON_CONTOURUP1D_H__
 
 #include "../BPy_UnaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ContourUP1D_Type;
 
-#define BPy_ContourUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ContourUP1D_Type)  )
+#define BPy_ContourUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ContourUP1D_Type))
 
 /*---------------------------Python BPy_ContourUP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_CONTOURUP1D_H */
+#endif /* __FREESTYLE_PYTHON_CONTOURUP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
index 30e53bef9c9..65aeb24cec9 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_DENSITYLOWERTHANUP1D_H
-#define FREESTYLE_PYTHON_DENSITYLOWERTHANUP1D_H
+#ifndef __FREESTYLE_PYTHON_DENSITYLOWERTHANUP1D_H__
+#define __FREESTYLE_PYTHON_DENSITYLOWERTHANUP1D_H__
 
 #include "../BPy_UnaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject DensityLowerThanUP1D_Type;
 
-#define BPy_DensityLowerThanUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &DensityLowerThanUP1D_Type)  )
+#define BPy_DensityLowerThanUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&DensityLowerThanUP1D_Type))
 
 /*---------------------------Python BPy_DensityLowerThanUP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_DENSITYLOWERTHANUP1D_H */
+#endif /* __FREESTYLE_PYTHON_DENSITYLOWERTHANUP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
index a6827dcd6be..ae55215c1dd 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_EQUALTOCHAININGTIMESTAMPUP1D_H
-#define FREESTYLE_PYTHON_EQUALTOCHAININGTIMESTAMPUP1D_H
+#ifndef __FREESTYLE_PYTHON_EQUALTOCHAININGTIMESTAMPUP1D_H__
+#define __FREESTYLE_PYTHON_EQUALTOCHAININGTIMESTAMPUP1D_H__
 
 #include "../BPy_UnaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject EqualToChainingTimeStampUP1D_Type;
 
-#define BPy_EqualToChainingTimeStampUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &EqualToChainingTimeStampUP1D_Type)  )
+#define BPy_EqualToChainingTimeStampUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&EqualToChainingTimeStampUP1D_Type))
 
 /*---------------------------Python BPy_EqualToChainingTimeStampUP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_EQUALTOCHAININGTIMESTAMPUP1D_H */
+#endif /* __FREESTYLE_PYTHON_EQUALTOCHAININGTIMESTAMPUP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
index 34e90e996c3..07bd9c43cfa 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_EQUALTOTIMESTAMPUP1D_H
-#define FREESTYLE_PYTHON_EQUALTOTIMESTAMPUP1D_H
+#ifndef __FREESTYLE_PYTHON_EQUALTOTIMESTAMPUP1D_H__
+#define __FREESTYLE_PYTHON_EQUALTOTIMESTAMPUP1D_H__
 
 #include "../BPy_UnaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject EqualToTimeStampUP1D_Type;
 
-#define BPy_EqualToTimeStampUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &EqualToTimeStampUP1D_Type)  )
+#define BPy_EqualToTimeStampUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&EqualToTimeStampUP1D_Type))
 
 /*---------------------------Python BPy_EqualToTimeStampUP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_EQUALTOTIMESTAMPUP1D_H */
+#endif /* __FREESTYLE_PYTHON_EQUALTOTIMESTAMPUP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
index 873feaec36c..738f978555d 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_EXTERNALCONTOURUP1D_H
-#define FREESTYLE_PYTHON_EXTERNALCONTOURUP1D_H
+#ifndef __FREESTYLE_PYTHON_EXTERNALCONTOURUP1D_H__
+#define __FREESTYLE_PYTHON_EXTERNALCONTOURUP1D_H__
 
 #include "../BPy_UnaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ExternalContourUP1D_Type;
 
-#define BPy_ExternalContourUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ExternalContourUP1D_Type)  )
+#define BPy_ExternalContourUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ExternalContourUP1D_Type))
 
 /*---------------------------Python BPy_ExternalContourUP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_EXTERNALCONTOURUP1D_H */
+#endif /* __FREESTYLE_PYTHON_EXTERNALCONTOURUP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
index 2a8886b8215..6d8412d16f5 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_FALSEUP1D_H
-#define FREESTYLE_PYTHON_FALSEUP1D_H
+#ifndef __FREESTYLE_PYTHON_FALSEUP1D_H__
+#define __FREESTYLE_PYTHON_FALSEUP1D_H__
 
 #include "../BPy_UnaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject FalseUP1D_Type;
 
-#define BPy_FalseUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FalseUP1D_Type)  )
+#define BPy_FalseUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&FalseUP1D_Type))
 
 /*---------------------------Python BPy_FalseUP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_FALSEUP1D_H */
+#endif /* __FREESTYLE_PYTHON_FALSEUP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
index aaaa4b5cde4..fa2ebf9d369 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYUP1D_H
-#define FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYUP1D_H
+#ifndef __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYUP1D_H__
+#define __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYUP1D_H__
 
 #include "../BPy_UnaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject QuantitativeInvisibilityUP1D_Type;
 
-#define BPy_QuantitativeInvisibilityUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &QuantitativeInvisibilityUP1D_Type)  )
+#define BPy_QuantitativeInvisibilityUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&QuantitativeInvisibilityUP1D_Type))
 
 /*---------------------------Python BPy_QuantitativeInvisibilityUP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYUP1D_H */
+#endif /* __FREESTYLE_PYTHON_QUANTITATIVEINVISIBILITYUP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
index 35d5863f699..0d6f58534b2 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_SHAPEUP1D_H
-#define FREESTYLE_PYTHON_SHAPEUP1D_H
+#ifndef __FREESTYLE_PYTHON_SHAPEUP1D_H__
+#define __FREESTYLE_PYTHON_SHAPEUP1D_H__
 
 #include "../BPy_UnaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject ShapeUP1D_Type;
 
-#define BPy_ShapeUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ShapeUP1D_Type)  )
+#define BPy_ShapeUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ShapeUP1D_Type))
 
 /*---------------------------Python BPy_ShapeUP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_SHAPEUP1D_H */
+#endif /* __FREESTYLE_PYTHON_SHAPEUP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h
index 41127c3ed0a..ceed608d059 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_TRUEUP1D_H
-#define FREESTYLE_PYTHON_TRUEUP1D_H
+#ifndef __FREESTYLE_PYTHON_TRUEUP1D_H__
+#define __FREESTYLE_PYTHON_TRUEUP1D_H__
 
 #include "../BPy_UnaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject TrueUP1D_Type;
 
-#define BPy_TrueUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &TrueUP1D_Type)  )
+#define BPy_TrueUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&TrueUP1D_Type))
 
 /*---------------------------Python BPy_TrueUP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_TRUEUP1D_H */
+#endif /* __FREESTYLE_PYTHON_TRUEUP1D_H__ */
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h
index ec70e5ca1cd..cfab9981cbd 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_WithinImageBoundaryUP1D.h
@@ -29,8 +29,8 @@
  *  \ingroup freestyle
  */
 
-#ifndef FREESTYLE_PYTHON_WITHINIMAGEBOUNDARYUP1D_H
-#define FREESTYLE_PYTHON_WITHINIMAGEBOUNDARYUP1D_H
+#ifndef __FREESTYLE_PYTHON_WITHINIMAGEBOUNDARYUP1D_H__
+#define __FREESTYLE_PYTHON_WITHINIMAGEBOUNDARYUP1D_H__
 
 #include "../BPy_UnaryPredicate1D.h"
 
@@ -44,7 +44,7 @@ extern "C" {
 
 extern PyTypeObject WithinImageBoundaryUP1D_Type;
 
-#define BPy_WithinImageBoundaryUP1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &WithinImageBoundaryUP1D_Type)  )
+#define BPy_WithinImageBoundaryUP1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&WithinImageBoundaryUP1D_Type))
 
 /*---------------------------Python BPy_WithinImageBoundaryUP1D structure definition----------*/
 typedef struct {
@@ -57,4 +57,4 @@ typedef struct {
 }
 #endif
 
-#endif /* FREESTYLE_PYTHON_WITHINIMAGEBOUNDARYUP1D_H */
+#endif /* __FREESTYLE_PYTHON_WITHINIMAGEBOUNDARYUP1D_H__ */