Freestyle: removed unused *_EXPORT qualifiers for building Windows DLLs.

These qualifiers were leftovers of the stand alone Freestyle program and not used
(set to an empty string) in Blender for years.

11 files changed, 58 insertions, 75 deletions

diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
index a26f8d289e7..8adf685a6eb 100644
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
@@ -50,7 +50,7 @@ namespace Freestyle {
 using namespace Geometry;
 
 /*! This class takes as input a WXEdge structure and fills it */
-class LIB_VIEW_MAP_EXPORT FEdgeXDetector
+class FEdgeXDetector
 {
 public:
 	FEdgeXDetector()
diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h
index b9b28f77636..045ad317db2 100644
--- a/source/blender/freestyle/intern/view_map/Functions0D.h
+++ b/source/blender/freestyle/intern/view_map/Functions0D.h
@@ -74,7 +74,7 @@ using namespace Geometry;
  *    - UnaryFunction0DVec3f
  */
 template <class T>
-class /*LIB_VIEW_MAP_EXPORT*/ UnaryFunction0D
+class UnaryFunction0D
 {
 public:
 	T result;
@@ -144,7 +144,7 @@ namespace Functions0D {
 
 // GetXF0D
 /*! Returns the X 3D coordinate of an Interface0D. */
-class LIB_VIEW_MAP_EXPORT GetXF0D : public UnaryFunction0D<double>
+class GetXF0D : public UnaryFunction0D<double>
 {
 public:
 	/*! Returns the string "GetXF0D" */
@@ -163,7 +163,7 @@ public:
 
 // GetYF0D
 /*! Returns the Y 3D coordinate of an Interface0D. */
-class LIB_VIEW_MAP_EXPORT GetYF0D : public UnaryFunction0D<double>
+class GetYF0D : public UnaryFunction0D<double>
 {
 public:
 	/*! Returns the string "GetYF0D" */
@@ -182,7 +182,7 @@ public:
 
 // GetZF0D
 /*! Returns the Z 3D coordinate of an Interface0D. */
-class LIB_VIEW_MAP_EXPORT GetZF0D : public UnaryFunction0D<double>
+class GetZF0D : public UnaryFunction0D<double>
 {
 public:
 	/*! Returns the string "GetZF0D" */
@@ -201,7 +201,7 @@ public:
 
 // GetProjectedXF0D
 /*! Returns the X 3D projected coordinate of an Interface0D. */
-class LIB_VIEW_MAP_EXPORT GetProjectedXF0D : public UnaryFunction0D<double>
+class GetProjectedXF0D : public UnaryFunction0D<double>
 {
 public:
 	/*! Returns the string "GetProjectedXF0D" */
@@ -220,7 +220,7 @@ public:
 
 // GetProjectedYF0D
 /*! Returns the Y projected 3D coordinate of an Interface0D. */
-class LIB_VIEW_MAP_EXPORT GetProjectedYF0D : public UnaryFunction0D<double>
+class GetProjectedYF0D : public UnaryFunction0D<double>
 {
 public:
 	/*! Returns the string "GetProjectedYF0D" */
@@ -239,7 +239,7 @@ public:
 
 // GetProjectedZF0D
 /*! Returns the Z projected 3D coordinate of an Interface0D. */
-class LIB_VIEW_MAP_EXPORT GetProjectedZF0D : public UnaryFunction0D<double>
+class GetProjectedZF0D : public UnaryFunction0D<double>
 {
 public:
 	/*! Returns the string "GetProjectedZF0D" */
@@ -258,7 +258,7 @@ public:
 
 // GetCurvilinearAbscissaF0D
 /*! Returns the curvilinear abscissa of an Interface0D in the context of its 1D element. */
-class LIB_VIEW_MAP_EXPORT GetCurvilinearAbscissaF0D : public UnaryFunction0D<float>
+class GetCurvilinearAbscissaF0D : public UnaryFunction0D<float>
 {
 public:
 	/*! Returns the string "GetCurvilinearAbscissaF0D" */
@@ -277,7 +277,7 @@ public:
 
 // GetParameterF0D
 /*! Returns the parameter of an Interface0D in the context of its 1D element. */
-class LIB_VIEW_MAP_EXPORT GetParameterF0D : public UnaryFunction0D<float>
+class GetParameterF0D : public UnaryFunction0D<float>
 {
 public:
 	/*! Returns the string "GetCurvilinearAbscissaF0D" */
@@ -298,7 +298,7 @@ public:
 /*! Returns a Vec2r giving the 2D oriented tangent to the 1D element to which the Interface0DIterator& belongs to and
  *  evaluated at the Interface0D pointed by this Interface0DIterator&.
  */
-class LIB_VIEW_MAP_EXPORT VertexOrientation2DF0D : public UnaryFunction0D<Vec2f>
+class VertexOrientation2DF0D : public UnaryFunction0D<Vec2f>
 {
 public:
 	/*! Returns the string "VertexOrientation2DF0D" */
@@ -315,7 +315,7 @@ public:
 /*! Returns a Vec3r giving the 3D oriented tangent to the 1D element to which the Interface0DIterator& belongs to and
  *  evaluated at the Interface0D pointed by this Interface0DIterator&.
  */
-class LIB_VIEW_MAP_EXPORT VertexOrientation3DF0D : public UnaryFunction0D<Vec3f>
+class VertexOrientation3DF0D : public UnaryFunction0D<Vec3f>
 {
 public:
 	/*! Returns the string "VertexOrientation3DF0D" */
@@ -332,7 +332,7 @@ public:
 /*! Returns a real giving the 2D curvature (as an angle) of the 1D element to which the Interface0DIterator&
  *  belongs to and evaluated at the Interface0D pointed by this Interface0DIterator&.
  */
-class LIB_VIEW_MAP_EXPORT Curvature2DAngleF0D : public UnaryFunction0D<double>
+class Curvature2DAngleF0D : public UnaryFunction0D<double>
 {
 public:
 	/*! Returns the string "Curvature2DAngleF0D" */
@@ -350,7 +350,7 @@ public:
  *  This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no object is occluded
  *  by the shape to which the Interface0D belongs to, 1 is returned.
  */
-class LIB_VIEW_MAP_EXPORT ZDiscontinuityF0D : public UnaryFunction0D<double>
+class ZDiscontinuityF0D : public UnaryFunction0D<double>
 {
 public:
 	/*! Returns the string "ZDiscontinuityF0D" */
@@ -367,7 +367,7 @@ public:
 /*! Returns a Vec2f giving the normalized 2D normal to the 1D element to which the Interface0DIterator& belongs to and
  *  evaluated at the Interface0D pointed by this Interface0DIterator&.
  */
-class LIB_VIEW_MAP_EXPORT Normal2DF0D : public UnaryFunction0D<Vec2f>
+class Normal2DF0D : public UnaryFunction0D<Vec2f>
 {
 public:
 	/*! Returns the string "Normal2DF0D" */
@@ -389,7 +389,7 @@ public:
  *  However, there still can be problematic cases, and the user willing to deal with this cases in a specific way
  *  should implement its own getMaterial functor.
  */
-class LIB_VIEW_MAP_EXPORT MaterialF0D : public UnaryFunction0D<FrsMaterial>
+class MaterialF0D : public UnaryFunction0D<FrsMaterial>
 {
 public:
 	/*! Returns the string "MaterialF0D" */
@@ -410,7 +410,7 @@ public:
  *  However, there still can be problematic cases, and the user willing to deal with this cases in a specific way
  *  should implement its own getShapeIdF0D functor.
  */
-class LIB_VIEW_MAP_EXPORT ShapeIdF0D : public UnaryFunction0D<Id>
+class ShapeIdF0D : public UnaryFunction0D<Id>
 {
 public:
 	/*! Returns the string "ShapeIdF0D" */
@@ -431,7 +431,7 @@ public:
 *  However, there still can be problematic cases, and the user willing to deal with this cases in a specific way
 *  should implement its own getQIF0D functor.
 */
-class LIB_VIEW_MAP_EXPORT QuantitativeInvisibilityF0D : public UnaryFunction0D<unsigned int>
+class QuantitativeInvisibilityF0D : public UnaryFunction0D<unsigned int>
 {
 public:
 	/*! Returns the string "QuantitativeInvisibilityF0D" */
@@ -446,7 +446,7 @@ public:
 
 // CurveNatureF0D
 /*! Returns the Nature::EdgeNature of the 1D element the Interface0DIterator& belongs to. */
-class LIB_VIEW_MAP_EXPORT CurveNatureF0D : public UnaryFunction0D<Nature::EdgeNature>
+class CurveNatureF0D : public UnaryFunction0D<Nature::EdgeNature>
 {
 public:
 	/*! Returns the string "QuantitativeInvisibilityF0D" */
@@ -461,7 +461,7 @@ public:
 
 // GetShapeF0D
 /*! Returns the ViewShape* containing the Interface0D */
-class LIB_VIEW_MAP_EXPORT GetShapeF0D : public UnaryFunction0D< ViewShape*>
+class GetShapeF0D : public UnaryFunction0D< ViewShape*>
 {
 public:
 	/*! Returns the string "GetShapeF0D" */
@@ -476,7 +476,7 @@ public:
 
 // GetOccludersF0D
 /*! Returns a vector containing the ViewShape* occluding the Interface0D */
-class LIB_VIEW_MAP_EXPORT GetOccludersF0D : public UnaryFunction0D< std::vector<ViewShape*> >
+class GetOccludersF0D : public UnaryFunction0D< std::vector<ViewShape*> >
 {
 public:
 	/*! Returns the string "GetOccludersF0D" */
@@ -491,7 +491,7 @@ public:
 
 // GetOccludeeF0D
 /*! Returns the ViewShape* "occluded" by the Interface0D */
-class LIB_VIEW_MAP_EXPORT GetOccludeeF0D: public UnaryFunction0D< ViewShape*>
+class GetOccludeeF0D: public UnaryFunction0D< ViewShape*>
 {
 public:
 	/*! Returns the string "GetOccludeeF0D" */
@@ -508,27 +508,21 @@ public:
 /////////////////////////// Internal ////////////////////////////
 
 // getFEdge
-LIB_VIEW_MAP_EXPORT
 FEdge *getFEdge(Interface0D& it1, Interface0D& it2);
 
 // getFEdges
-LIB_VIEW_MAP_EXPORT
 void getFEdges(Interface0DIterator& it, FEdge *&fe1, FEdge *&fe2);
 
 // getViewEdges
-LIB_VIEW_MAP_EXPORT
 void getViewEdges(Interface0DIterator& it, ViewEdge *&ve1, ViewEdge *&ve2);
 
 // getShapeF0D
-LIB_VIEW_MAP_EXPORT
 ViewShape *getShapeF0D(Interface0DIterator& it);
 
 // getOccludersF0D
-LIB_VIEW_MAP_EXPORT
 void getOccludersF0D(Interface0DIterator& it, std::set<ViewShape*>& oOccluders);
 
 // getOccludeeF0D
-LIB_VIEW_MAP_EXPORT
 ViewShape *getOccludeeF0D(Interface0DIterator& it);
 
 } // end of namespace Functions0D
diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h
index 9edb705ef29..0821475ca9c 100644
--- a/source/blender/freestyle/intern/view_map/Functions1D.h
+++ b/source/blender/freestyle/intern/view_map/Functions1D.h
@@ -64,7 +64,7 @@ namespace Freestyle {
  *    - UnaryFunction1DVec3f
  */
 template <class T>
-class /*LIB_VIEW_MAP_EXPORT*/ UnaryFunction1D
+class UnaryFunction1D
 {
 public:
 	T result;
@@ -187,7 +187,7 @@ namespace Functions1D {
 
 // GetXF1D
 /*! Returns the X 3D coordinate of an Interface1D. */
-class LIB_VIEW_MAP_EXPORT GetXF1D : public UnaryFunction1D<double>
+class GetXF1D : public UnaryFunction1D<double>
 {
 private:
 	Functions0D::GetXF0D _func;
@@ -211,7 +211,7 @@ public:
 
 // GetYF1D
 /*! Returns the Y 3D coordinate of an Interface1D. */
-class LIB_VIEW_MAP_EXPORT GetYF1D : public UnaryFunction1D<double>
+class GetYF1D : public UnaryFunction1D<double>
 {
 private:
 Functions0D::GetYF0D _func;
@@ -235,7 +235,7 @@ public:
 
 // GetZF1D
 /*! Returns the Z 3D coordinate of an Interface1D. */
-class LIB_VIEW_MAP_EXPORT GetZF1D : public UnaryFunction1D<double>
+class GetZF1D : public UnaryFunction1D<double>
 {
 private:
 	Functions0D::GetZF0D _func;
@@ -259,7 +259,7 @@ public:
 
 // GetProjectedXF1D
 /*! Returns the projected X 3D coordinate of an Interface1D. */
-class LIB_VIEW_MAP_EXPORT GetProjectedXF1D : public UnaryFunction1D<double>
+class GetProjectedXF1D : public UnaryFunction1D<double>
 {
 private:
 	Functions0D::GetProjectedXF0D _func;
@@ -283,7 +283,7 @@ public:
 
 // GetProjectedYF1D
 /*! Returns the projected Y 3D coordinate of an Interface1D. */
-class LIB_VIEW_MAP_EXPORT GetProjectedYF1D : public UnaryFunction1D<double>
+class GetProjectedYF1D : public UnaryFunction1D<double>
 {
 private:
 	Functions0D::GetProjectedYF0D _func;
@@ -307,7 +307,7 @@ public:
 
 // GetProjectedZF1D
 /*! Returns the projected Z 3D coordinate of an Interface1D. */
-class LIB_VIEW_MAP_EXPORT GetProjectedZF1D : public UnaryFunction1D<double>
+class GetProjectedZF1D : public UnaryFunction1D<double>
 {
 private:
 	Functions0D::GetProjectedZF0D _func;
@@ -331,7 +331,7 @@ public:
 
 // Orientation2DF1D
 /*! Returns the 2D orientation as a Vec2f*/
-class LIB_VIEW_MAP_EXPORT Orientation2DF1D : public UnaryFunction1D<Vec2f>
+class Orientation2DF1D : public UnaryFunction1D<Vec2f>
 {
 private:
 	Functions0D::VertexOrientation2DF0D _func;
@@ -355,7 +355,7 @@ public:
 
 // Orientation3DF1D
 /*! Returns the 3D orientation as a Vec3f. */
-class LIB_VIEW_MAP_EXPORT Orientation3DF1D : public UnaryFunction1D<Vec3f>
+class Orientation3DF1D : public UnaryFunction1D<Vec3f>
 {
 private:
 	Functions0D::VertexOrientation3DF0D _func;
@@ -382,7 +382,7 @@ public:
  *  This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no object is occluded
  *  by the shape to which the Interface1D belongs to, 1 is returned.
  */
-class LIB_VIEW_MAP_EXPORT ZDiscontinuityF1D : public UnaryFunction1D<double>
+class ZDiscontinuityF1D : public UnaryFunction1D<double>
 {
 private:
 	Functions0D::ZDiscontinuityF0D _func;
@@ -410,7 +410,7 @@ public:
  *  results of a chaining (chain, stroke), then it might be made of several 1D elements of different
  *  Quantitative Invisibilities.
  */
-class LIB_VIEW_MAP_EXPORT QuantitativeInvisibilityF1D : public UnaryFunction1D<unsigned>
+class QuantitativeInvisibilityF1D : public UnaryFunction1D<unsigned>
 {
 private:
 	Functions0D::QuantitativeInvisibilityF0D _func;
@@ -438,7 +438,7 @@ public:
  *  Indeed, the Interface1D might result from the gathering of several 1D elements, each one being of a different
  *  nature. An integration method, such as the MEAN, might give, in this case, irrelevant results.
  */
-class LIB_VIEW_MAP_EXPORT CurveNatureF1D : public UnaryFunction1D<Nature::EdgeNature>
+class CurveNatureF1D : public UnaryFunction1D<Nature::EdgeNature>
 {
 private:
 	Functions0D::CurveNatureF0D _func;
@@ -462,7 +462,7 @@ public:
 
 // TimeStampF1D
 /*! Returns the time stamp of the Interface1D. */
-class LIB_VIEW_MAP_EXPORT TimeStampF1D : public UnaryFunction1D_void
+class TimeStampF1D : public UnaryFunction1D_void
 {
 public:
 	/*! Returns the string "TimeStampF1D" */
@@ -477,7 +477,7 @@ public:
 
 // IncrementChainingTimeStampF1D
 /*! Increments the chaining time stamp of the Interface1D. */
-class LIB_VIEW_MAP_EXPORT IncrementChainingTimeStampF1D : public UnaryFunction1D_void
+class IncrementChainingTimeStampF1D : public UnaryFunction1D_void
 {
 public:
 	/*! Returns the string "IncrementChainingTimeStampF1D" */
@@ -492,7 +492,7 @@ public:
 
 // ChainingTimeStampF1D
 /*! Sets the chaining time stamp of the Interface1D. */
-class LIB_VIEW_MAP_EXPORT ChainingTimeStampF1D : public UnaryFunction1D_void
+class ChainingTimeStampF1D : public UnaryFunction1D_void
 {
 public:
 	/*! Returns the string "ChainingTimeStampF1D" */
@@ -508,7 +508,7 @@ public:
 
 // Curvature2DAngleF1D
 /*! Returns the 2D curvature as an angle for an Interface1D. */
-class LIB_VIEW_MAP_EXPORT Curvature2DAngleF1D : public UnaryFunction1D<double>
+class Curvature2DAngleF1D : public UnaryFunction1D<double>
 {
 public:
 	/*! Builds the functor.
@@ -536,7 +536,7 @@ private:
 
 // Normal2DF1D
 /*! Returns the 2D normal for an interface 1D. */
-class LIB_VIEW_MAP_EXPORT Normal2DF1D : public UnaryFunction1D<Vec2f>
+class Normal2DF1D : public UnaryFunction1D<Vec2f>
 {
 public:
 	/*! Builds the functor.
@@ -564,7 +564,7 @@ private:
 
 // GetShapeF1D
 /*! Returns list of shapes covered by this Interface1D. */
-class LIB_VIEW_MAP_EXPORT GetShapeF1D : public UnaryFunction1D<std::vector<ViewShape*> >
+class GetShapeF1D : public UnaryFunction1D<std::vector<ViewShape*> >
 {
 public:
 	/*! Builds the functor. */
@@ -582,7 +582,7 @@ public:
 
 // GetOccludersF1D
 /*! Returns list of occluding shapes covered by this Interface1D. */
-class LIB_VIEW_MAP_EXPORT GetOccludersF1D : public UnaryFunction1D<std::vector<ViewShape*> >
+class GetOccludersF1D : public UnaryFunction1D<std::vector<ViewShape*> >
 {
 public:
 	/*! Builds the functor. */
@@ -600,7 +600,7 @@ public:
 
 // GetOccludeeF1D
 /*! Returns list of occluded shapes covered by this Interface1D. */
-class LIB_VIEW_MAP_EXPORT GetOccludeeF1D : public UnaryFunction1D<std::vector<ViewShape*> >
+class GetOccludeeF1D : public UnaryFunction1D<std::vector<ViewShape*> >
 {
 public:
 	/*! Builds the functor. */
@@ -620,15 +620,12 @@ public:
 ////////////
 
 // getOccludeeF1D
-LIB_VIEW_MAP_EXPORT
 void getOccludeeF1D(Interface1D& inter, set<ViewShape*>& oShapes);
 
 // getOccludersF1D
-LIB_VIEW_MAP_EXPORT
 void getOccludersF1D(Interface1D& inter, set<ViewShape*>& oShapes);
 
 // getShapeF1D
-LIB_VIEW_MAP_EXPORT
 void getShapeF1D(Interface1D& inter, set<ViewShape*>& oShapes);
 
 } // end of namespace Functions1D
diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h
index 88a07127837..e747f9c3e68 100644
--- a/source/blender/freestyle/intern/view_map/Silhouette.h
+++ b/source/blender/freestyle/intern/view_map/Silhouette.h
@@ -74,7 +74,7 @@ class ViewVertex;
 class SShape;
 
 /*! Class to define a vertex of the embedding. */
-class LIB_VIEW_MAP_EXPORT SVertex : public Interface0D
+class SVertex : public Interface0D
 {
 public: // Implementation of Interface0D
 	/*! Returns the string "SVertex" .*/
@@ -462,7 +462,7 @@ class ViewEdge;
  *  This class is specialized into a smooth and a sharp version since their properties slightly vary from
  *  one to the other.
  */
-class LIB_VIEW_MAP_EXPORT FEdge : public Interface1D
+class FEdge : public Interface1D
 {
 public: // Implementation of Interface0D
 	/*! Returns the string "FEdge". */
@@ -1103,7 +1103,7 @@ Interface0DIterator FEdge::pointsEnd(float t)
  *  by two faces of the mesh. Face a lies on its right whereas Face b lies on its left.
  *  If it is a border edge, then it doesn't have any face on its right, and thus Face a = 0.
  */
-class LIB_VIEW_MAP_EXPORT FEdgeSharp : public FEdge
+class FEdgeSharp : public FEdge
 {
 protected:
 	Vec3r _aNormal; // When following the edge, normal of the right face
@@ -1246,7 +1246,7 @@ public:
 /*! Class defining a smooth edge. This kind of edge typically runs across a face of the input mesh. It can be
  *  a silhouette, a ridge or valley, a suggestive contour.
  */
-class LIB_VIEW_MAP_EXPORT FEdgeSmooth : public FEdge
+class FEdgeSmooth : public FEdge
 {
 protected:
 	Vec3r _Normal;
@@ -1366,7 +1366,7 @@ public:
 
 
 /*! Class to define a feature shape. It is the gathering of feature elements from an identified input shape */
-class LIB_VIEW_MAP_EXPORT SShape
+class SShape
 {
 private:
 	vector<FEdge*> _chains;          // list of fedges that are chains starting points.
diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
index 4002385a823..1234c028ca1 100644
--- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
+++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
@@ -46,7 +46,7 @@ using namespace Geometry;
 class SVertex;
 class FEdge;
 
-class LIB_VIEW_MAP_EXPORT SilhouetteGeomEngine 
+class SilhouetteGeomEngine
 {
 private:
 	// The viewpoint under which the silhouette has to be computed
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.h b/source/blender/freestyle/intern/view_map/SteerableViewMap.h
index d6af7384fb8..0cd5d222621 100644
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.h
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.h
@@ -51,7 +51,7 @@ class GrayImage;
 /*! This class checks for every FEdge in which steerable it belongs and stores the mapping allowing to retrieve 
  *  this information from the FEdge Id.
  */
-class LIB_VIEW_MAP_EXPORT SteerableViewMap
+class SteerableViewMap
 {
 protected:
 	// for each vector the list of nbOrientations weigths corresponding to its contributions
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
index 6efc81efbaf..7f214919114 100644
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
@@ -183,7 +183,7 @@ class ViewVertex;
 class ViewEdge;
 class ViewShape;
 
-class LIB_VIEW_MAP_EXPORT ViewEdgeXBuilder
+class ViewEdgeXBuilder
 {
 protected:
 	int _currentViewId;    // Id for view edges
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index 2c9672be53b..eeaeada5dc6 100644
--- a/source/blender/freestyle/intern/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
@@ -65,7 +65,7 @@ class ViewShape;
 class TVertex;
 
 /*! Class defining the ViewMap.*/
-class LIB_VIEW_MAP_EXPORT ViewMap
+class ViewMap
 {
 public:
 	typedef vector<ViewEdge*> viewedges_container;
@@ -268,7 +268,7 @@ class orientedViewEdgeIterator;
  *  NonTVertex when it corresponds to a vertex of the initial input mesh (it is the case for vertices such as corners
  *  for example). Thus, this class can be specialized into two classes, the TVertex class and the NonTVertex class.
  */
-class LIB_VIEW_MAP_EXPORT ViewVertex : public Interface0D
+class ViewVertex : public Interface0D
 {
 public: // Implementation of Interface0D
 	/*! Returns the string "ViewVertex". */
@@ -386,7 +386,7 @@ public:
  *  Basically the front edge hides part of the back edge.
  *  So, among the back edges, 1 is of invisibility n and the other of visibility n+1
  */
-class LIB_VIEW_MAP_EXPORT TVertex : public ViewVertex
+class TVertex : public ViewVertex
 {
 public:
 	typedef vector<directedViewEdge*> edge_pointers_container;
@@ -660,7 +660,7 @@ public:
  *  Associated to a single SVertex.
  *  Can be associated to 2 or several view edges
  */
-class LIB_VIEW_MAP_EXPORT NonTVertex : public ViewVertex
+class NonTVertex : public ViewVertex
 {
 public:
 	typedef vector<directedViewEdge> edges_container;
@@ -891,7 +891,7 @@ template<class Traits> class vertex_iterator_base;
 /*! Class defining a ViewEdge. A ViewEdge in an edge of the image graph. it connects two ViewVertex.
  *  It is made by connecting a set of FEdges.
  */
-class LIB_VIEW_MAP_EXPORT ViewEdge : public Interface1D
+class ViewEdge : public Interface1D
 {
 public: // Implementation of Interface0D
 	/*! Returns the string "ViewEdge". */
@@ -1392,7 +1392,7 @@ public:
 /**********************************/
 
 /*! Class gathering the elements of the ViewMap (ViewVertex, ViewEdge) that are issued from the same input shape. */
-class LIB_VIEW_MAP_EXPORT ViewShape
+class ViewShape
 {
 private:
 	vector<ViewVertex*> _Vertices;
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
index 29e393052a3..08b2fde8f31 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
@@ -60,7 +60,7 @@ namespace Freestyle {
 
 using namespace Geometry;
 
-class LIB_VIEW_MAP_EXPORT ViewMapBuilder
+class ViewMapBuilder
 {
 private:
 	ViewMap *_ViewMap; // result
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.h b/source/blender/freestyle/intern/view_map/ViewMapIO.h
index e2223cd5734..eb26e8adab0 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.h
@@ -42,10 +42,8 @@ namespace ViewMapIO {
 
 static const unsigned ZERO = UINT_MAX;
 
-LIB_VIEW_MAP_EXPORT
 int load(istream& in, ViewMap *vm, ProgressBar *pb = NULL);
 
-LIB_VIEW_MAP_EXPORT
 int save(ostream& out, ViewMap *vm, ProgressBar *pb = NULL);
 
 namespace Options {
@@ -53,22 +51,16 @@ namespace Options {
 static const unsigned char FLOAT_VECTORS = 1;
 static const unsigned char NO_OCCLUDERS = 2;
 
-LIB_VIEW_MAP_EXPORT
 void setFlags(const unsigned char flags);
 
-LIB_VIEW_MAP_EXPORT
 void addFlags(const unsigned char flags);
 
-LIB_VIEW_MAP_EXPORT
 void rmFlags(const unsigned char flags);
 
-LIB_VIEW_MAP_EXPORT
 unsigned char getFlags();
 
-LIB_VIEW_MAP_EXPORT
 void setModelsPath(const string& path);
 
-LIB_VIEW_MAP_EXPORT
 string getModelsPath();
 
 }; // End of namepace Options
diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
index 9c4d214d931..cb19875b6c7 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
@@ -50,7 +50,7 @@ class NodeGroup;
 class SShape;
 class WShape;
 
-class LIB_VIEW_MAP_EXPORT ViewMapTesselator
+class ViewMapTesselator
 {
 public:
 	inline ViewMapTesselator()