diff --git a/include/sot/core/exp-moving-avg.hh b/include/sot/core/exp-moving-avg.hh
index f3fd0bf98324f84b4f552ade9bf1e42872be895f..a77cfaef5e4e75104a635a1550290ddfab94270c 100644
--- a/include/sot/core/exp-moving-avg.hh
+++ b/include/sot/core/exp-moving-avg.hh
@@ -24,6 +24,7 @@
 /* --- INCLUDE --------------------------------------------------------- */
 /* --------------------------------------------------------------------- */
 
+#include <sot/core/config.hh>
 #include <dynamic-graph/entity.h>
 #include <dynamic-graph/signal-ptr.h>
 #include <dynamic-graph/signal-time-dependent.h>
@@ -33,20 +34,6 @@ namespace dg = ::dynamicgraph;
 namespace dynamicgraph {
   namespace sot {
 
-/* --------------------------------------------------------------------- */
-/* --- API ------------------------------------------------------------- */
-/* --------------------------------------------------------------------- */
-
-#if defined (WIN32)
-#  if defined (reader_EXPORTS)
-#    define SOTEXPMOVINGAVG_EXPORT __declspec(dllexport)
-#  else
-#    define SOTEXPMOVINGAVG_EXPORT __declspec(dllimport)
-#  endif
-#else
-#  define SOTEXPMOVINGAVG_EXPORT
-#endif
-
 /* --------------------------------------------------------------------- */
 /* --- TRACER ---------------------------------------------------------- */
 /* --------------------------------------------------------------------- */
@@ -55,7 +42,7 @@ using dynamicgraph::Entity;
 using dynamicgraph::SignalPtr;
 using dynamicgraph::SignalTimeDependent;
 
-class SOTEXPMOVINGAVG_EXPORT ExpMovingAvg
+class SOT_CORE_DLLAPI ExpMovingAvg
 : public Entity
 {
   DYNAMIC_GRAPH_ENTITY_DECL();
diff --git a/include/sot/core/gradient-ascent.hh b/include/sot/core/gradient-ascent.hh
index 766e778a0a8afcbedeaf68781328ec6883e63e57..cdee3200f87fb6ee100c0bb49287bcc771e94f49 100644
--- a/include/sot/core/gradient-ascent.hh
+++ b/include/sot/core/gradient-ascent.hh
@@ -24,6 +24,7 @@
 /* --- INCLUDE --------------------------------------------------------- */
 /* --------------------------------------------------------------------- */
 
+#include <sot/core/config.hh>
 #include <dynamic-graph/entity.h>
 #include <dynamic-graph/signal-ptr.h>
 #include <dynamic-graph/signal-time-dependent.h>
@@ -33,20 +34,6 @@ namespace dg = ::dynamicgraph;
 namespace dynamicgraph {
   namespace sot {
 
-/* --------------------------------------------------------------------- */
-/* --- API ------------------------------------------------------------- */
-/* --------------------------------------------------------------------- */
-
-#if defined (WIN32)
-#  if defined (reader_EXPORTS)
-#    define SOTGRADIENTASCENT_EXPORT __declspec(dllexport)
-#  else
-#    define SOTGRADIENTASCENT_EXPORT __declspec(dllimport)
-#  endif
-#else
-#  define SOTGRADIENTASCENT_EXPORT
-#endif
-
 /* --------------------------------------------------------------------- */
 /* --- TRACER ---------------------------------------------------------- */
 /* --------------------------------------------------------------------- */
@@ -55,7 +42,7 @@ using dynamicgraph::Entity;
 using dynamicgraph::SignalPtr;
 using dynamicgraph::SignalTimeDependent;
 
-class SOTGRADIENTASCENT_EXPORT GradientAscent
+class SOT_CORE_DLLAPI GradientAscent
 : public Entity
 {
   DYNAMIC_GRAPH_ENTITY_DECL();