diff --git a/include/dynamic-graph/command-getter.h b/include/dynamic-graph/command-getter.h
index 73e845eed1ba66acceb8cddf786fb058e7302bc0..a76de22f2ebfd965b8ba0aed73442dbe64006b1a 100644
--- a/include/dynamic-graph/command-getter.h
+++ b/include/dynamic-graph/command-getter.h
@@ -53,7 +53,7 @@ namespace dynamicgraph {
     /// \li prototype of E::getParameter should be exactly as specified in this
     /// example.
     template <class E, typename T>
-    class DYNAMIC_GRAPH_DLLEXPORT Getter : public Command {
+    class DYNAMIC_GRAPH_DLLAPI Getter : public Command {
     public:
       /// Pointer to method that sets paramter of type T
       typedef T (E::*GetterMethod) () const;
diff --git a/include/dynamic-graph/command-setter.h b/include/dynamic-graph/command-setter.h
index 588567ee085a418d3fbe028cfdac19e878ae3262..ad198f6b7b642ea97309b1b1e8149c0d32ff8573 100644
--- a/include/dynamic-graph/command-setter.h
+++ b/include/dynamic-graph/command-setter.h
@@ -53,7 +53,7 @@ namespace dynamicgraph {
     /// \li prototype of E::setParameter should be exactly as specified in this
     /// example.
     template <class E, typename T>
-    class DYNAMIC_GRAPH_DLLEXPORT Setter : public Command {
+    class DYNAMIC_GRAPH_DLLAPI Setter : public Command {
     public:
       /// Pointer to method that sets paramter of type T
       typedef void (E::*SetterMethod) (const T&);
diff --git a/include/dynamic-graph/signal-cast-helper.h b/include/dynamic-graph/signal-cast-helper.h
index 8b4637548add715c2cafb3ad012b84eddf66e6c4..62e4ff6baf07aa4ef00dbf9bb90d4a0564ad9d4a 100644
--- a/include/dynamic-graph/signal-cast-helper.h
+++ b/include/dynamic-graph/signal-cast-helper.h
@@ -48,16 +48,16 @@ namespace dynamicgraph
       : SignalCastRegisterer (typeid(T), disp, cast, trace)
     {}
 
-    DYNAMIC_GRAPH_DLLEXPORT
+    DYNAMIC_GRAPH_DLLAPI
       static boost::any cast (std::istringstream& iss);
 
-    DYNAMIC_GRAPH_DLLEXPORT
+    DYNAMIC_GRAPH_DLLAPI
       static void disp (const boost::any& object, std::ostream& os)
     {
       os << boost::any_cast<T> (object) << std::endl;
     }
 
-    DYNAMIC_GRAPH_DLLEXPORT
+    DYNAMIC_GRAPH_DLLAPI
       static void trace (const boost::any& object, std::ostream& os)
     {
       disp(object,os);
@@ -156,15 +156,15 @@ public:
 	static void disp( TYPE const& t,std::ostream& os )  DISP	              \
 	static void trace( TYPE const& t,std::ostream& os ) TRACE                     \
 public:            		                                                      \
-       DYNAMIC_GRAPH_DLLEXPORT                                                        \
+       DYNAMIC_GRAPH_DLLAPI                                                        \
 	static boost::any cast_( std::istringstream& stringValue ) {           	      \
  		  return boost::any_cast<TYPE>(cast(stringValue));           	      \
 	}                                                                             \
-       DYNAMIC_GRAPH_DLLEXPORT                                                        \
+       DYNAMIC_GRAPH_DLLAPI                                                        \
 	static void disp_( const boost::any& t,std::ostream& os )  {       	      \
 	  disp(boost::any_cast<TYPE>(t), os);         				      \
 	}            								      \
-       DYNAMIC_GRAPH_DLLEXPORT                                                        \
+       DYNAMIC_GRAPH_DLLAPI                                                        \
 	static void trace_( const boost::any& t,std::ostream& os ) {      	      \
 		  trace(boost::any_cast<TYPE>(t),os);      			      \
 	}          								      \
diff --git a/include/dynamic-graph/value.h b/include/dynamic-graph/value.h
index 471e7805dfa3df0834c6104b9ae2bc5a04ba9380..d31a711511862cc5f2b7a66fc6f283223f9372e9 100644
--- a/include/dynamic-graph/value.h
+++ b/include/dynamic-graph/value.h
@@ -28,7 +28,7 @@
 namespace dynamicgraph {
   namespace command {
     class Value;
-    class DYNAMIC_GRAPH_DLLEXPORT EitherType {
+    class DYNAMIC_GRAPH_DLLAPI EitherType {
     public:
       EitherType(const Value& value);
       ~EitherType();
@@ -44,7 +44,7 @@ namespace dynamicgraph {
       const Value* value_;
     };
 
-    class DYNAMIC_GRAPH_DLLEXPORT Value {
+    class DYNAMIC_GRAPH_DLLAPI Value {
     public:
       enum Type {
 	NONE,
@@ -93,9 +93,9 @@ namespace dynamicgraph {
       static std::string typeName(Type type);
 
       /// Output in a stream
-      DYNAMIC_GRAPH_DLLEXPORT friend std::ostream& operator<<(std::ostream& os, const Value& value);
+      DYNAMIC_GRAPH_DLLAPI friend std::ostream& operator<<(std::ostream& os, const Value& value);
     public:
-      DYNAMIC_GRAPH_DLLEXPORT friend class EitherType;
+      friend class EitherType;
       bool boolValue() const;
       unsigned unsignedValue() const;
       int intValue() const;