Got rid of a number of compiler warnings with regard to redefinitions

of _POSIX_C_SOURCE and _XOPEN_SOURCE. There are no functional changes. Tested with GCC 4.4.1 on Ubuntu 9.10 (karmic).
2010-04-07 23:28:29 +00:00
parent f85bcac8ae
commit 7ed7524c91
65 changed files with 94 additions and 114 deletions
--- a/source/blender/freestyle/intern/application/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/application/AppCanvas.cpp
@@ -19,12 +19,11 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

+#include "Controller.h"
 #include "../rendering/GLBlendEquation.h"
-
 #include "AppView.h"
 #include "../image/Image.h"
 #include "../system/TimeStamp.h"
-#include "Controller.h"
 #include "../stroke/StrokeRenderer.h"
 #include "AppCanvas.h"
 #include "../rendering/GLRenderer.h"
--- a/source/blender/freestyle/intern/application/AppView.cpp
+++ b/source/blender/freestyle/intern/application/AppView.cpp
@@ -19,6 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

+#include "Controller.h"
+
 extern "C" {
 #include "BLI_jitter.h"
 }
@@ -27,7 +29,6 @@ extern "C" {
 #include "../stroke/Canvas.h"
 #include "AppView.h"
 #include "../scene_graph/NodeLight.h"
-#include "Controller.h"
 #include "../view_map/Silhouette.h"
 #include "../view_map/ViewMap.h"
 #include "../scene_graph/LineRep.h"
--- a/source/blender/freestyle/intern/application/Controller.h
+++ b/source/blender/freestyle/intern/application/Controller.h
@@ -30,11 +30,11 @@
 #ifndef  CONTROLLER_H
 # define CONTROLLER_H

+# include "../view_map/ViewMapBuilder.h"
 # include <string>
 //# include "ConfigIO.h"
 # include "../geometry/FastGrid.h"
 # include "../geometry/HashGrid.h"
-# include "../view_map/ViewMapBuilder.h"
 # include "../system/TimeUtils.h"
 # include "../system/ProgressBar.h"
 # include "../system/Precision.h"
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
@@ -1,8 +1,8 @@
 #ifndef  BLENDERSTROKERENDERER_H
 # define BLENDERSTROKERENDERER_H

-# include "../system/FreestyleConfig.h"
 # include "../stroke/StrokeRenderer.h"
+# include "../system/FreestyleConfig.h"

 #ifdef __cplusplus
 extern "C" {
--- a/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
+++ b/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
@@ -1,9 +1,9 @@
 #ifndef  BLENDERTEXTUREMANAGER_H
 #define BLENDERTEXTUREMANAGER_H

-# include "../system/FreestyleConfig.h"
 # include "../stroke/StrokeRenderer.h"
 # include "../stroke/StrokeRep.h"
+# include "../system/FreestyleConfig.h"

 /*! Class to load textures
 */
--- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
+++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
@@ -1,5 +1,5 @@
-#include "../application/AppView.h"
 #include "../application/Controller.h"
+#include "../application/AppView.h"
 #include "../application/AppConfig.h"
 #include "../application/AppCanvas.h"

--- a/source/blender/freestyle/intern/python/BPy_BBox.h
+++ b/source/blender/freestyle/intern/python/BPy_BBox.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_BBOX_H
 #define FREESTYLE_PYTHON_BBOX_H

+#include <Python.h>
+
 #include "../geometry/BBox.h"
 #include "../geometry/Geom.h"
 using namespace Geometry;
@@ -11,8 +13,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject BBox_Type;

 #define BPy_BBox_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BBox_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_BINARYPREDICATE0D_H
 #define FREESTYLE_PYTHON_BINARYPREDICATE0D_H

+#include <Python.h>
+
 #include "../stroke/Predicates0D.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject BinaryPredicate0D_Type;

 #define BPy_BinaryPredicate0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate0D_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_BINARYPREDICATE1D_H
 #define FREESTYLE_PYTHON_BINARYPREDICATE1D_H

+#include <Python.h>
+
 #include "../stroke/Predicates1D.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject BinaryPredicate1D_Type;

 #define BPy_BinaryPredicate1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &BinaryPredicate1D_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
+++ b/source/blender/freestyle/intern/python/BPy_ContextFunctions.h
@@ -1,12 +1,12 @@
 #ifndef FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H
 #define FREESTYLE_PYTHON_CONTEXTFUNCTIONS_H

+#include <Python.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-#include <Python.h>
-
 /*---------------------------Python BPy_ContextFunctions visible prototypes-----------*/

 int ContextFunctions_Init( PyObject *module );
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -1,6 +1,7 @@
 #ifndef FREESTYLE_PYTHON_CONVERT_H
 #define FREESTYLE_PYTHON_CONVERT_H

+#include <Python.h>
 #include <typeinfo>

 #include "../geometry/Geom.h"
@@ -61,7 +62,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
 #include "generic/Mathutils.h"

 //==============================
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.h
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.h
@@ -1,14 +1,14 @@
 #ifndef FREESTYLE_PYTHON_FREESTYLE_H
 #define FREESTYLE_PYTHON_FREESTYLE_H

+#include <Python.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 /*---------------------------Python BPy_Freestyle visible prototypes-----------*/

 PyObject *Freestyle_Init( void );
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_FRSMATERIAL_H
 #define FREESTYLE_PYTHON_FRSMATERIAL_H

+#include <Python.h>
+
 #include "../scene_graph/FrsMaterial.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject FrsMaterial_Type;

 #define BPy_FrsMaterial_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsMaterial_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_FrsNoise.h
+++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_FRSNOISE_H
 #define FREESTYLE_PYTHON_FRSNOISE_H

+#include <Python.h>
+
 #include "../geometry/Noise.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject FrsNoise_Type;

 #define BPy_FrsNoise_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsNoise_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_Id.h
+++ b/source/blender/freestyle/intern/python/BPy_Id.h
@@ -1,6 +1,7 @@
 #ifndef FREESTYLE_PYTHON_ID_H
 #define FREESTYLE_PYTHON_ID_H

+#include <Python.h>
 #include <iostream>
 using namespace std;

@@ -12,8 +13,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject Id_Type;

 #define BPy_Id_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Id_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_IntegrationType.h
+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_INTEGRATIONTYPE_H
 #define FREESTYLE_PYTHON_INTEGRATIONTYPE_H

+#include <Python.h>
+
 #include "../view_map/Interface1D.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject IntegrationType_Type;

 #define BPy_IntegrationType_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &IntegrationType_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_Interface0D.h
+++ b/source/blender/freestyle/intern/python/BPy_Interface0D.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_INTERFACE0D_H
 #define FREESTYLE_PYTHON_INTERFACE0D_H

+#include <Python.h>
+
 #include "../view_map/Interface0D.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject Interface0D_Type;

 #define BPy_Interface0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface0D_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.h
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_INTERFACE1D_H
 #define FREESTYLE_PYTHON_INTERFACE1D_H

+#include <Python.h>
+
 #include "../view_map/Interface1D.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject Interface1D_Type;

 #define BPy_Interface1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Interface1D_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_Iterator.h
+++ b/source/blender/freestyle/intern/python/BPy_Iterator.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_ITERATOR_H
 #define FREESTYLE_PYTHON_ITERATOR_H

+#include <Python.h>
+
 #include "../system/Iterator.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject Iterator_Type;

 #define BPy_Iterator_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Iterator_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_MediumType.h
+++ b/source/blender/freestyle/intern/python/BPy_MediumType.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_MEDIUMTYPE_H
 #define FREESTYLE_PYTHON_MEDIUMTYPE_H

+#include <Python.h>
+
 #include "../stroke/Stroke.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject MediumType_Type;

 #define BPy_MediumType_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &MediumType_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_Nature.h
+++ b/source/blender/freestyle/intern/python/BPy_Nature.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_NATURE_H
 #define FREESTYLE_PYTHON_NATURE_H

+#include <Python.h>
+
 #include "../winged_edge/Nature.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject Nature_Type;

 #define BPy_Nature_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Nature_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_Operators.h
+++ b/source/blender/freestyle/intern/python/BPy_Operators.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_OPERATORS_H
 #define FREESTYLE_PYTHON_OPERATORS_H

+#include <Python.h>
+
 #include "../stroke/Operators.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject Operators_Type;

 #define BPy_Operators_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Operators_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_SShape.h
+++ b/source/blender/freestyle/intern/python/BPy_SShape.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_SSHAPE_H
 #define FREESTYLE_PYTHON_SSHAPE_H

+#include <Python.h>
+
 #include "../view_map/Silhouette.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject SShape_Type;

 #define BPy_SShape_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &SShape_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
+++ b/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_STROKEATTRIBUTE_H
 #define FREESTYLE_PYTHON_STROKEATTRIBUTE_H

+#include <Python.h>
+
 #include "../stroke/Stroke.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject StrokeAttribute_Type;

 #define BPy_StrokeAttribute_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeAttribute_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_StrokeShader.h
+++ b/source/blender/freestyle/intern/python/BPy_StrokeShader.h
@@ -1,6 +1,7 @@
 #ifndef FREESTYLE_PYTHON_STROKESHADER_H
 #define FREESTYLE_PYTHON_STROKESHADER_H

+#include <Python.h>

 #include "../system/FreestyleConfig.h"

@@ -14,8 +15,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject StrokeShader_Type;

 #define BPy_StrokeShader_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &StrokeShader_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_UNARYFUNCTION0D_H
 #define FREESTYLE_PYTHON_UNARYFUNCTION0D_H

+#include <Python.h>
+
 #include "../view_map/Functions0D.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject UnaryFunction0D_Type;

 #define BPy_UnaryFunction0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction0D_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_UNARYFUNCTION1D_H
 #define FREESTYLE_PYTHON_UNARYFUNCTION1D_H

+#include <Python.h>
+
 #include "../view_map/Functions1D.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject UnaryFunction1D_Type;

 #define BPy_UnaryFunction1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryFunction1D_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_UNARYPREDICATE0D_H
 #define FREESTYLE_PYTHON_UNARYPREDICATE0D_H

+#include <Python.h>
+
 #include "../stroke/Predicates0D.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject UnaryPredicate0D_Type;

 #define BPy_UnaryPredicate0D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryPredicate0D_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
+++ b/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_UNARYPREDICATE1D_H
 #define FREESTYLE_PYTHON_UNARYPREDICATE1D_H

+#include <Python.h>
+
 #include "../stroke/Predicates1D.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject UnaryPredicate1D_Type;

 #define BPy_UnaryPredicate1D_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &UnaryPredicate1D_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_ViewMap.h
+++ b/source/blender/freestyle/intern/python/BPy_ViewMap.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_VIEWMAP_H
 #define FREESTYLE_PYTHON_VIEWMAP_H

+#include <Python.h>
+
 #include "../view_map/ViewMap.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject ViewMap_Type;

 #define BPy_ViewMap_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewMap_Type)  )
--- a/source/blender/freestyle/intern/python/BPy_ViewShape.h
+++ b/source/blender/freestyle/intern/python/BPy_ViewShape.h
@@ -1,6 +1,8 @@
 #ifndef FREESTYLE_PYTHON_VIEWSHAPE_H
 #define FREESTYLE_PYTHON_VIEWSHAPE_H

+#include <Python.h>
+
 #include "../view_map/ViewMap.h"

 #ifdef __cplusplus
@@ -9,8 +11,6 @@ extern "C" {

 ///////////////////////////////////////////////////////////////////////////////////////////

-#include <Python.h>
-
 extern PyTypeObject ViewShape_Type;

 #define BPy_ViewShape_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &ViewShape_Type)  )
--- a/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp
@@ -19,6 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

+#include "GLDebugRenderer.h"
+
 #include <stdio.h>
 #include "../scene_graph/VertexRep.h"
 #include "../scene_graph/NodeShape.h"
@@ -26,8 +28,6 @@
 #include "../scene_graph/LineRep.h"
 #include "../geometry/Grid.h"

-#include "GLDebugRenderer.h"
-
 #ifdef __MACH__
 #include <GLUT/glut.h>
 #else
--- a/source/blender/freestyle/intern/rendering/GLDebugRenderer.h
+++ b/source/blender/freestyle/intern/rendering/GLDebugRenderer.h
@@ -31,10 +31,10 @@
 #ifndef  GLDEBUGRENDERER_H
 # define GLDEBUGRENDERER_H

+# include "../view_map/Silhouette.h"
 # include <float.h>
 # include "../system/FreestyleConfig.h"
 # include "GLRenderer.h"
-# include "../view_map/Silhouette.h"
 # include "../winged_edge/Curvature.h"

 class WSMeshShape;
--- a/source/blender/freestyle/intern/rendering/GLRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLRenderer.cpp
@@ -19,6 +19,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

+#include "../stroke/Stroke.h"
 #include "../scene_graph/IndexedFaceSet.h"
 #include "../scene_graph/NodeDrawingStyle.h"
 #include "../scene_graph/NodeLight.h"
@@ -27,7 +28,6 @@
 #include "../scene_graph/NodeShape.h"
 #include "../scene_graph/OrientedLineRep.h"
 #include "../scene_graph/VertexRep.h"
-#include "../stroke/Stroke.h"

 #include "../scene_graph/TriangleRep.h"

--- a/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h
+++ b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h
@@ -30,9 +30,9 @@
 #ifndef  GLSTROKERENDERER_H
 # define GLSTROKERENDERER_H

-# include "../system/FreestyleConfig.h"
 # include "../stroke/StrokeRenderer.h"
 # include "../stroke/StrokeRep.h"
+# include "../system/FreestyleConfig.h"

 #include "GLBlendEquation.h"

--- a/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
+++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
@@ -31,8 +31,8 @@
 # define ADVANCED_FUNCTIONS1D_HPP


-# include "AdvancedFunctions0D.h"
 # include "../view_map/Functions1D.h"
+# include "AdvancedFunctions0D.h"

 //
 // Functions definitions
--- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
@@ -19,9 +19,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

+#include "AdvancedStrokeShaders.h"
 #include "../system/PseudoNoise.h"
 #include "../system/RandGen.h"
-#include "AdvancedStrokeShaders.h"
 #include "StrokeIterators.h"

 /////////////////////////////////////////
--- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
@@ -19,6 +19,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

+#include "StrokeRenderer.h"
 #include <fstream>
 #include "BasicStrokeShaders.h"
 #include "../system/PseudoNoise.h"
@@ -29,7 +30,6 @@
 #include "AdvancedFunctions1D.h"
 #include "StrokeIterators.h"
 #include "../system/StringUtils.h"
-#include "StrokeRenderer.h"
 #include "StrokeIO.h"

 //soc #include <qimage.h>
--- a/source/blender/freestyle/intern/stroke/Canvas.cpp
+++ b/source/blender/freestyle/intern/stroke/Canvas.cpp
@@ -19,9 +19,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

+#include "StrokeRenderer.h"
 #include <vector>
 #include "../system/FreestyleConfig.h"
-#include "StrokeRenderer.h"
 #include "../system/TimeStamp.h"
 #include "../system/PseudoNoise.h"
 #include "Canvas.h"
--- a/source/blender/freestyle/intern/stroke/ChainingIterators.h
+++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h
@@ -28,10 +28,10 @@
 #ifndef  CHAININGITERATORS_H
 # define CHAININGITERATORS_H

-# include <iostream>
 # include "../view_map/ViewMap.h"
 # include "../view_map/ViewMapIterators.h"
 # include "../view_map/ViewMapAdvancedIterators.h"
+# include <iostream>
 # include "Predicates1D.h"

 #include "../system/Iterator.h" //soc 
--- a/source/blender/freestyle/intern/stroke/Curve.h
+++ b/source/blender/freestyle/intern/stroke/Curve.h
@@ -30,11 +30,11 @@
 #ifndef  CURVE_H
 # define CURVE_H

+# include "../view_map/Silhouette.h"
 # include <deque>
 # include "../system/BaseIterator.h"
 # include "../geometry/Geom.h"
 //# include "../scene_graph/FrsMaterial.h"
-# include "../view_map/Silhouette.h"
 # include "../view_map/SilhouetteGeomEngine.h"
 # include "../view_map/Interface0D.h"
 # include "../view_map/Interface1D.h"
--- a/source/blender/freestyle/intern/stroke/Operators.cpp
+++ b/source/blender/freestyle/intern/stroke/Operators.cpp
@@ -19,9 +19,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

+#include "Operators.h"
 #include <algorithm>
 #include <stdexcept>
-#include "Operators.h"
 #include "Canvas.h"
 #include "Stroke.h"

--- a/source/blender/freestyle/intern/stroke/Operators.h
+++ b/source/blender/freestyle/intern/stroke/Operators.h
@@ -30,9 +30,9 @@
 #ifndef  OPERATORS_H
 # define OPERATORS_H

+# include "../view_map/Interface1D.h"
 # include <vector>
 # include <iostream>
-# include "../view_map/Interface1D.h"
 # include "Predicates1D.h"
 # include "Predicates0D.h"
 # include "../view_map/ViewMap.h"
--- a/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h
+++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h
@@ -30,8 +30,8 @@
 #ifndef  PSSTROKERENDERER_H
 # define PSSTROKERENDERER_H

-# include "../system/FreestyleConfig.h"
 # include "StrokeRenderer.h"
+# include "../system/FreestyleConfig.h"
 # include <fstream>

 /**********************************/
--- a/source/blender/freestyle/intern/stroke/Stroke.h
+++ b/source/blender/freestyle/intern/stroke/Stroke.h
@@ -30,10 +30,10 @@
 #ifndef  STROKE_H
 # define STROKE_H

+# include "../view_map/Silhouette.h"
 # include <vector>
 # include <map>
 # include "../system/FreestyleConfig.h"
-# include "../view_map/Silhouette.h"
 # include "Curve.h"
 # include "../view_map/Interface1D.h"
 # include "../system/StringUtils.h"
--- a/source/blender/freestyle/intern/stroke/StrokeIO.h
+++ b/source/blender/freestyle/intern/stroke/StrokeIO.h
@@ -30,9 +30,9 @@
 #ifndef  STROKEIO_H
 # define STROKEIO_H

+# include "Stroke.h"
 # include <iostream>
 # include "../system/FreestyleConfig.h"
-# include "Stroke.h"

 LIB_STROKE_EXPORT
 ostream& operator<<(ostream& out, const StrokeAttribute& iStrokeAttribute);
--- a/source/blender/freestyle/intern/stroke/StrokeLayer.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp
@@ -19,8 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#include "StrokeLayer.h"
 #include "Stroke.h"
+#include "StrokeLayer.h"
 #include "Canvas.h"

 StrokeLayer::~StrokeLayer()
--- a/source/blender/freestyle/intern/stroke/StrokeRenderer.h
+++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h
@@ -30,11 +30,11 @@
 #ifndef  STROKE_RENDERER_H
 # define STROKE_RENDERER_H

+# include "Stroke.h"
 # include <vector>
 # include <map>
 # include <utility>
 # include "../system/FreestyleConfig.h"
-# include "Stroke.h"
 # include "StrokeRep.h"
 # include <string.h>

--- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
@@ -19,8 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#include "StrokeRep.h"
 #include "Stroke.h"
+#include "StrokeRep.h"
 #include "StrokeRenderer.h"
 #include "StrokeAdvancedIterators.h"
 #include "StrokeIterators.h"
--- a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
@@ -19,10 +19,10 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

+#include "StrokeTesselator.h"
 #include "../scene_graph/OrientedLineRep.h"
 #include "../scene_graph/NodeGroup.h"
 #include "../scene_graph/NodeShape.h"
-#include "StrokeTesselator.h"
 #include "StrokeAdvancedIterators.h"

 LineRep* StrokeTesselator::Tesselate(Stroke *iStroke)
--- a/source/blender/freestyle/intern/stroke/StrokeTesselator.h
+++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.h
@@ -31,8 +31,8 @@
 #ifndef  STROKETESSELATOR_H
 # define STROKETESSELATOR_H

-# include "../scene_graph/LineRep.h"
 # include "Stroke.h"
+# include "../scene_graph/LineRep.h"

 class StrokeTesselator
 {
--- a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
+++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
@@ -35,8 +35,8 @@
 #ifndef  TEXTSTROKERENDERER_H
 # define TEXTSTROKERENDERER_H

-# include "../system/FreestyleConfig.h"
 # include "StrokeRenderer.h"
+# include "../system/FreestyleConfig.h"
 # include <fstream>

 /**********************************/
--- a/source/blender/freestyle/intern/system/PythonInterpreter.h
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.h
@@ -30,8 +30,8 @@
 #ifndef  PYTHON_INTERPRETER_H
 # define PYTHON_INTERPRETER_H

-# include <iostream>
 # include <Python.h>
+# include <iostream>
 # include "StringUtils.h"
 # include "Interpreter.h"

--- a/source/blender/freestyle/intern/view_map/Functions1D.h
+++ b/source/blender/freestyle/intern/view_map/Functions1D.h
@@ -30,11 +30,11 @@
 #ifndef  FUNCTIONS1D_HPP
 # define FUNCTIONS1D_HPP

-# include "../system/Precision.h"
-# include "../system/TimeStamp.h"
 # include "ViewMap.h"
 # include "Functions0D.h"
 # include "Interface1D.h"
+# include "../system/Precision.h"
+# include "../system/TimeStamp.h"
 # include "../system/FreestyleConfig.h"

 #include "../python/Director.h"
--- a/source/blender/freestyle/intern/view_map/Interface0D.h
+++ b/source/blender/freestyle/intern/view_map/Interface0D.h
@@ -30,6 +30,7 @@
 #ifndef  INTERFACE0D_H
 # define INTERFACE0D_H

+# include <Python.h>
 # include <string>
 # include <iostream>
 # include "../system/Id.h"
@@ -40,16 +41,6 @@ using namespace std;

 #include "../system/Iterator.h" //soc 

-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <Python.h>
-
-#ifdef __cplusplus
-}
-#endif
-
 //
 // Interface0D
 //
--- a/source/blender/freestyle/intern/view_map/Interface1D.h
+++ b/source/blender/freestyle/intern/view_map/Interface1D.h
@@ -30,6 +30,7 @@
 #ifndef  INTERFACE1D_H
 # define INTERFACE1D_H

+# include <Python.h>
 # include <string>
 # include <iostream>
 # include <float.h>
@@ -38,16 +39,6 @@
 # include "../winged_edge/Nature.h"
 # include "Functions0D.h"

-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <Python.h>
-
-#ifdef __cplusplus
-}
-#endif
-
 using namespace std;
 /*! \file Interface1D.h
 *  Interface1D and related tools definitions
--- a/source/blender/freestyle/intern/view_map/Silhouette.h
+++ b/source/blender/freestyle/intern/view_map/Silhouette.h
@@ -30,6 +30,8 @@
 #ifndef  SILHOUETTE_H
 # define SILHOUETTE_H

+# include "Interface0D.h"
+# include "Interface1D.h"
 # include <iostream>
 # include <string>
 # include <vector>
@@ -41,8 +43,6 @@
 # include "../scene_graph/FrsMaterial.h"
 # include "../geometry/Polygon.h"
 # include "../system/Exception.h"
-# include "Interface0D.h"
-# include "Interface1D.h"
 # include "../winged_edge/Curvature.h"

 using namespace std;
--- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
+++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
@@ -19,8 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#include "SilhouetteGeomEngine.h"
 #include "Silhouette.h"
+#include "SilhouetteGeomEngine.h"
 #include "../geometry/GeomUtils.h"

 using namespace std;
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
@@ -18,10 +18,10 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

+#include "Silhouette.h"
 #include "SteerableViewMap.h"
 #include "../image/ImagePyramid.h"
 #include "../image/Image.h"
-#include "Silhouette.h"
 #include <math.h>
 #include "../geometry/Geom.h"
 using namespace Geometry;
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
@@ -18,9 +18,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

+#include "ViewMap.h"
 #include "ViewEdgeXBuilder.h"
 #include "../winged_edge/WXEdge.h"
-#include "ViewMap.h"
 #include "SilhouetteGeomEngine.h"
 #include <list>

--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -30,12 +30,12 @@
 #ifndef  VIEWMAP_H
 # define VIEWMAP_H

-# include "../system/BaseIterator.h"
-# include "../system/FreestyleConfig.h"
-# include "../geometry/GeomUtils.h"
 # include "Interface0D.h"
 # include "Interface1D.h"
 # include "Silhouette.h" // defines the embedding
+# include "../system/BaseIterator.h"
+# include "../system/FreestyleConfig.h"
+# include "../geometry/GeomUtils.h"
 # include <map>

                  /**********************************/
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
@@ -19,8 +19,8 @@
 //
 ///////////////////////////////////////////////////////////////////////////////

-#include <algorithm>
 #include "ViewMapBuilder.h"
+#include <algorithm>

 using namespace std;

--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
@@ -31,12 +31,12 @@
 #ifndef  VIEWMAPBUILDER_H
 # define VIEWMAPBUILDER_H

+# include "Silhouette.h"
 # include <vector>
 # include "../system/FreestyleConfig.h"
 # include "../geometry/Geom.h"
 # include "../scene_graph/NodeGroup.h"
 # include "../winged_edge/WXEdge.h"
-# include "Silhouette.h"
 # include "../geometry/GeomUtils.h"
 # include "../geometry/Grid.h"
 # include "../system/ProgressBar.h"
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.h
@@ -30,11 +30,11 @@
 #ifndef  VIEWMAPIO_H
 # define VIEWMAPIO_H

+# include "ViewMap.h"
 # include <fstream>
 # include <string>
 # include "../system/FreestyleConfig.h"
 # include "../system/ProgressBar.h"
-# include "ViewMap.h"

 namespace ViewMapIO {

--- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
@@ -31,10 +31,10 @@
 #ifndef  VIEWMAPTESSELATOR_H
 # define VIEWMAPTESSELATOR_H

-# include "../scene_graph/NodeShape.h"
-# include "../winged_edge/WEdge.h"
 # include "Silhouette.h"
 # include "ViewMap.h"
+# include "../scene_graph/NodeShape.h"
+# include "../winged_edge/WEdge.h"
 # include "../scene_graph/NodeGroup.h"
 # include "../scene_graph/LineRep.h"
 # include "../scene_graph/OrientedLineRep.h"