Fix compilation error of Freestyle

Seems to be some sort of namespace conflict or so which is
solved by reshuffling the includes a bit.

9 files changed, 12 insertions, 6 deletions

diff --git a/source/blender/freestyle/intern/geometry/FastGrid.cpp b/source/blender/freestyle/intern/geometry/FastGrid.cpp
index ddfc8bdd20c..2ce424483ea 100644
--- a/source/blender/freestyle/intern/geometry/FastGrid.cpp
+++ b/source/blender/freestyle/intern/geometry/FastGrid.cpp
@@ -25,6 +25,8 @@
  *  \date 30/07/2002
  */
 
+#include <cstdlib>
+
 #include "FastGrid.h"
 
 #include "BKE_global.h"
diff --git a/source/blender/freestyle/intern/stroke/Chain.cpp b/source/blender/freestyle/intern/stroke/Chain.cpp
index c09ccbd393a..7fd756472b0 100644
--- a/source/blender/freestyle/intern/stroke/Chain.cpp
+++ b/source/blender/freestyle/intern/stroke/Chain.cpp
@@ -27,8 +27,8 @@
 
 #include "Chain.h"
 
-#include "../view_map/ViewMapAdvancedIterators.h"
 #include "../view_map/ViewMapIterators.h"
+#include "../view_map/ViewMapAdvancedIterators.h"
 
 namespace Freestyle {
 
diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp
index 2b281a24962..32cfac016d6 100644
--- a/source/blender/freestyle/intern/stroke/Curve.cpp
+++ b/source/blender/freestyle/intern/stroke/Curve.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "Curve.h"
-#include "CurveAdvancedIterators.h"
 #include "CurveIterators.h"
+#include "CurveAdvancedIterators.h"
 
 #include "BKE_global.h"
 #include "BLI_utildefines.h"
diff --git a/source/blender/freestyle/intern/stroke/CurveIterators.h b/source/blender/freestyle/intern/stroke/CurveIterators.h
index c1bec1e3b65..ff7b2d04385 100644
--- a/source/blender/freestyle/intern/stroke/CurveIterators.h
+++ b/source/blender/freestyle/intern/stroke/CurveIterators.h
@@ -43,7 +43,7 @@ namespace CurveInternal {
 class CurvePointIterator : public Interface0DIteratorNested
 { 
 public:
-	friend class Curve;
+	friend class Freestyle::Curve;
 
 public:
 	float _CurvilinearLength;
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp
index 159e4a39849..86625e67405 100644
--- a/source/blender/freestyle/intern/stroke/Stroke.cpp
+++ b/source/blender/freestyle/intern/stroke/Stroke.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "Stroke.h"
-#include "StrokeAdvancedIterators.h"
 #include "StrokeIterators.h"
+#include "StrokeAdvancedIterators.h"
 #include "StrokeRenderer.h"
 
 #include "BKE_global.h"
diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
index fb6da853e02..1b9ab725ab9 100644
--- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "Stroke.h"
-#include "StrokeAdvancedIterators.h"
 #include "StrokeIterators.h"
+#include "StrokeAdvancedIterators.h"
 #include "StrokeRenderer.h"
 #include "StrokeRep.h"
 
diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
index 8b8f42f3922..d650e385ab2 100644
--- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
+++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
@@ -26,6 +26,8 @@
  *  \date 03/09/2002
  */
 
+#include <cstring>
+
 #include "Silhouette.h"
 #include "SilhouetteGeomEngine.h"
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp
index 246c4caef82..fd5ebb99f72 100644
--- a/source/blender/freestyle/intern/view_map/ViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp
@@ -28,8 +28,8 @@
 #include <float.h>
 
 #include "ViewMap.h"
-#include "ViewMapAdvancedIterators.h"
 #include "ViewMapIterators.h"
+#include "ViewMapAdvancedIterators.h"
 
 #include "../geometry/GeomUtils.h"
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
index 3c01de37f11..71ae68c06bc 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
@@ -25,6 +25,8 @@
  *  \date 09/01/2003
  */
 
+#include <limits.h>
+
 #include "ViewMapIO.h"
 
 #ifdef IRIX