diff --git a/include/dynamic-graph/debug.h b/include/dynamic-graph/debug.h
index 99e0148dccb3cdef4264561d1b309bc7ccd86477..ac4778f2f46cb2879c355fd7b9935487b5edbd66 100644
--- a/include/dynamic-graph/debug.h
+++ b/include/dynamic-graph/debug.h
@@ -73,7 +73,7 @@
 
 namespace dynamicgraph {
 
-class DYNAMICGRAPH_EXPORT DebugTrace
+class DYNAMIC_GRAPH_DLLAPI DebugTrace
 {
  public:
     static const int SIZE = 512;
@@ -110,8 +110,8 @@ class DYNAMICGRAPH_EXPORT DebugTrace
 
 };
 
-DYNAMICGRAPH_EXPORT extern DebugTrace dgDEBUGFLOW;
-DYNAMICGRAPH_EXPORT extern DebugTrace dgERRORFLOW;
+DYNAMIC_GRAPH_DLLAPI extern DebugTrace dgDEBUGFLOW;
+DYNAMIC_GRAPH_DLLAPI extern DebugTrace dgERRORFLOW;
 
 } // namespace dynamicgraph
 
diff --git a/include/dynamic-graph/dynamic-graph-api.h b/include/dynamic-graph/dynamic-graph-api.h
index 201d6e9b961975b63651916382565534028957ff..3d3975cf749f806d890d72994148a47f1998a316 100644
--- a/include/dynamic-graph/dynamic-graph-api.h
+++ b/include/dynamic-graph/dynamic-graph-api.h
@@ -19,16 +19,6 @@
  */
 
 #ifndef DYNAMICGRAPH_API_H
-#define DYNAMICGRAPH_API_H
-
-#if defined (WIN32)
-#  ifdef dynamic_graph_EXPORTS
-#    define DYNAMICGRAPH_EXPORT __declspec(dllexport)
-#  else
-#    define DYNAMICGRAPH_EXPORT __declspec(dllimport)
-#  endif
-#else
-#  define DYNAMICGRAPH_EXPORT
-#endif
-
-#endif
+# define DYNAMICGRAPH_API_H
+# include <dynamic-graph/config.hh>
+#endif //! DYNAMICGRAPH_API_H
diff --git a/include/dynamic-graph/entity.h b/include/dynamic-graph/entity.h
index b2c800f38d61ca509239c1c4445261147214a422..abd2308b75e66de8df0897702414c9da944c5d06 100644
--- a/include/dynamic-graph/entity.h
+++ b/include/dynamic-graph/entity.h
@@ -56,7 +56,7 @@ namespace dynamicgraph {
   call methods from entities and display the result of their execution.
   Classes that derive from Entity can customize the command-line by overriding commandLine().
  */
-class DYNAMICGRAPH_EXPORT Entity
+class DYNAMIC_GRAPH_DLLAPI Entity
 : private boost::noncopyable
 {
 
@@ -99,7 +99,7 @@ class DYNAMICGRAPH_EXPORT Entity
   virtual const std::string& getCommandList( void ) const;
 };
 
-DYNAMICGRAPH_EXPORT std::ostream& operator<< (std::ostream& os, const dynamicgraph::Entity& ent );
+DYNAMIC_GRAPH_DLLAPI std::ostream& operator<< (std::ostream& os, const dynamicgraph::Entity& ent );
 
 } // namespace dynamicgraph
 #endif /* #ifndef __ENTITY_HH__ */
diff --git a/include/dynamic-graph/exception-abstract.h b/include/dynamic-graph/exception-abstract.h
index 427e2e58d6ad95d313c86f8760a828ef41448b2b..5d3a5e7a501194c2b09de580d443ea40e2dbe77b 100644
--- a/include/dynamic-graph/exception-abstract.h
+++ b/include/dynamic-graph/exception-abstract.h
@@ -43,7 +43,7 @@ namespace dynamicgraph {
 
 /* \class ExceptionAbstract
  */
-class DYNAMICGRAPH_EXPORT ExceptionAbstract : public std::exception
+class DYNAMIC_GRAPH_DLLAPI ExceptionAbstract : public std::exception
 {
 
  public:
@@ -94,7 +94,7 @@ public:
   }
 
   /** Print the error structure. */
-  DYNAMICGRAPH_EXPORT friend std::ostream & operator << (std::ostream & os,
+  DYNAMIC_GRAPH_DLLAPI friend std::ostream & operator << (std::ostream & os,
 				     const ExceptionAbstract & err);
 
 #ifdef DYNAMICGRAPH_EXCEPTION_PASSING_PARAM
diff --git a/include/dynamic-graph/exception-factory.h b/include/dynamic-graph/exception-factory.h
index da662b26c4cfcc1ae9de04f6ff8f3f8f62b38933..19ffec4b7f94ccd927a6ae794cc92fd20de17233 100644
--- a/include/dynamic-graph/exception-factory.h
+++ b/include/dynamic-graph/exception-factory.h
@@ -37,7 +37,7 @@ namespace dynamicgraph {
 
 /* \class sotExceptionFactory
  */
-class DYNAMICGRAPH_EXPORT ExceptionFactory
+class DYNAMIC_GRAPH_DLLAPI ExceptionFactory
 :public ExceptionAbstract
 
 {
diff --git a/include/dynamic-graph/exception-signal.h b/include/dynamic-graph/exception-signal.h
index d0755f3029ab074d6b2c94a9be20f0129d7df691..c9fa1babd4384825aba3c722638c55d72ec8ba26 100644
--- a/include/dynamic-graph/exception-signal.h
+++ b/include/dynamic-graph/exception-signal.h
@@ -37,7 +37,7 @@ namespace dynamicgraph {
 
 /* \class sotExceptionSignal
  */
-class DYNAMICGRAPH_EXPORT ExceptionSignal
+class DYNAMIC_GRAPH_DLLAPI ExceptionSignal
 :public ExceptionAbstract
 
 {
diff --git a/include/dynamic-graph/exception-traces.h b/include/dynamic-graph/exception-traces.h
index 90a6d1b3943883a1b1a5c5f8459585e055f8c32f..81e8bc109eccf947726669a9f87751bb4601ca91 100644
--- a/include/dynamic-graph/exception-traces.h
+++ b/include/dynamic-graph/exception-traces.h
@@ -37,7 +37,7 @@ namespace dynamicgraph {
 
 /* \class ExceptionTraces
  */
-class DYNAMICGRAPH_EXPORT ExceptionTraces
+class DYNAMIC_GRAPH_DLLAPI ExceptionTraces
 :public ExceptionAbstract
 
 {
diff --git a/include/dynamic-graph/factory.h b/include/dynamic-graph/factory.h
index e0027977c7fb646c9bc6a16f9ffb2bb1465617a6..1de0256e1e3480cb8f18394e72c35dc69400cdc3 100644
--- a/include/dynamic-graph/factory.h
+++ b/include/dynamic-graph/factory.h
@@ -50,7 +50,7 @@ class Entity;
  *
  *
  */
-class DYNAMICGRAPH_EXPORT FactoryStorage
+class DYNAMIC_GRAPH_DLLAPI FactoryStorage
 {
  public:
 
@@ -79,7 +79,7 @@ class DYNAMICGRAPH_EXPORT FactoryStorage
 
 };
 
-DYNAMICGRAPH_EXPORT extern FactoryStorage g_factory;
+DYNAMIC_GRAPH_DLLAPI extern FactoryStorage g_factory;
 
 /* --- REGISTERER ----------------------------------------------------------- */
 /* --- REGISTERER ----------------------------------------------------------- */
@@ -92,7 +92,7 @@ DYNAMICGRAPH_EXPORT extern FactoryStorage g_factory;
 /*! A helper class to register an entity.
  *
  */
-class DYNAMICGRAPH_EXPORT EntityRegisterer
+class DYNAMIC_GRAPH_DLLAPI EntityRegisterer
 {
  private:
   EntityRegisterer( void );
diff --git a/include/dynamic-graph/functions.h b/include/dynamic-graph/functions.h
index 7b42c3cdd948ebbce164ccfe2ee561a151520832..9530a2f77e5cd5a8e0a7a3f16444340dc2485e7b 100644
--- a/include/dynamic-graph/functions.h
+++ b/include/dynamic-graph/functions.h
@@ -54,7 +54,7 @@
   and user interaction commands such as display and beep commands.
   For more information, load the plugin and type help on a sot shell.
  */
-class DYNAMICGRAPH_EXPORT ShellFunctions
+class DYNAMIC_GRAPH_DLLAPI ShellFunctions
 {
  public:
 
diff --git a/include/dynamic-graph/interpreter-helper.h b/include/dynamic-graph/interpreter-helper.h
index 04dd613941e6d34c9562eba24a9f889ec1239bc8..ff2aedf99a0ca19a5a4545305243c2f3f598e8ff 100644
--- a/include/dynamic-graph/interpreter-helper.h
+++ b/include/dynamic-graph/interpreter-helper.h
@@ -59,7 +59,7 @@ namespace dynamicgraph {
   \li get a signal,
   \li compute a signal,
 */
-class DYNAMICGRAPH_EXPORT InterpreterHelper
+class DYNAMIC_GRAPH_DLLAPI InterpreterHelper
 {
 
  public:
diff --git a/include/dynamic-graph/interpreter.h b/include/dynamic-graph/interpreter.h
index 798d709212d021a64ba1ad78e7b9c9863b10504e..0439b77d44f145db44a9b5035e33dd291e4acc5d 100644
--- a/include/dynamic-graph/interpreter.h
+++ b/include/dynamic-graph/interpreter.h
@@ -61,7 +61,7 @@ class PluginLoader;
   \li compute a signal,
   \li act as a proxy for the commands of the plugins.
 */
-class DYNAMICGRAPH_EXPORT Interpreter
+class DYNAMIC_GRAPH_DLLAPI Interpreter
 {
 
  public:
@@ -187,7 +187,7 @@ class DYNAMICGRAPH_EXPORT Interpreter
  * Use the macro DYNAMIC-GRAPH_SHELL_FUNCTION_REGISTERER(name, fun) in a .cpp file
  * to register functions on plugin load.
  */
-class DYNAMICGRAPH_EXPORT ShellFunctionRegisterer
+class DYNAMIC_GRAPH_DLLAPI ShellFunctionRegisterer
 
 {
 public:
@@ -200,7 +200,7 @@ public:
 	ShellFunctionRegisterer reg( name,boost::bind(fun,_1,_2,_3) );\
   }
 
-DYNAMICGRAPH_EXPORT extern Interpreter g_shell;
+DYNAMIC_GRAPH_DLLAPI extern Interpreter g_shell;
 
 } // namespace dynamicgraph
 
diff --git a/include/dynamic-graph/plugin-loader.h b/include/dynamic-graph/plugin-loader.h
index 18fd14d341fb05ce04087a696d546559f410b921..70e44689533c4f4f8440f5ba437e3d48304feb6f 100644
--- a/include/dynamic-graph/plugin-loader.h
+++ b/include/dynamic-graph/plugin-loader.h
@@ -52,7 +52,7 @@ class PluginRefMap;
   example.
 
  */
-class DYNAMICGRAPH_EXPORT PluginLoader
+class DYNAMIC_GRAPH_DLLAPI PluginLoader
 {
  protected:
 
diff --git a/include/dynamic-graph/pool.h b/include/dynamic-graph/pool.h
index 0c4daacd253772473efdb58ecc02d176627ade19..a24fbcc3fa7c78e3feaf2d57704e01f5fb59c2a8 100644
--- a/include/dynamic-graph/pool.h
+++ b/include/dynamic-graph/pool.h
@@ -64,7 +64,7 @@ class Entity;
   It also returns signal.
 
  */
-class DYNAMICGRAPH_EXPORT PoolStorage
+class DYNAMIC_GRAPH_DLLAPI PoolStorage
 {
  public:
   /*! \name Define types to simplify the writing
@@ -131,7 +131,7 @@ class DYNAMICGRAPH_EXPORT PoolStorage
   void writeCompletionList(std::ostream& os);
 };
 
-DYNAMICGRAPH_EXPORT extern dynamicgraph::PoolStorage g_pool;
+DYNAMIC_GRAPH_DLLAPI extern dynamicgraph::PoolStorage g_pool;
 
 }  // namespace dynamicgraph
 
diff --git a/include/dynamic-graph/signal-array.h b/include/dynamic-graph/signal-array.h
index 22db5a77ac91e2ed0221e5c5a10842fe59b76092..37578181f933f6c54b32fb70725b0595e73670fa 100644
--- a/include/dynamic-graph/signal-array.h
+++ b/include/dynamic-graph/signal-array.h
@@ -169,7 +169,7 @@ SignalArray<Time> operator<<( SignalBase<Time>& sig1,
 	return res;
 }
 
-	DYNAMICGRAPH_EXPORT extern SignalArray<int> sotNOSIGNAL;
+	DYNAMIC_GRAPH_DLLAPI extern SignalArray<int> sotNOSIGNAL;
 
 } // namespace dynamicgraph
 
diff --git a/include/dynamic-graph/signal-caster.h b/include/dynamic-graph/signal-caster.h
index 4ceb039b55b236d5b6e0fa6ab0296e23d63fd9ea..f0b589add33224932bf5e3f4c247f8dd5c6afcbb 100644
--- a/include/dynamic-graph/signal-caster.h
+++ b/include/dynamic-graph/signal-caster.h
@@ -42,7 +42,7 @@ namespace dynamicgraph {
  * complex than a typical template-based compile-time resolve. So disp, cast and
  * trace are costly functions and should be used as such.
  */
-class DYNAMICGRAPH_EXPORT SignalCaster {
+class DYNAMIC_GRAPH_DLLAPI SignalCaster {
 public:
 	SignalCaster();
 	virtual ~SignalCaster();
@@ -78,7 +78,7 @@ private:
 
 
 /// The library-wide instance of SignalCaster
-extern DYNAMICGRAPH_EXPORT SignalCaster g_caster;
+extern DYNAMIC_GRAPH_DLLAPI SignalCaster g_caster;
 
 /*!
  * The SignalCast registerer class. Can be used to automatically register a cast when
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4f7749f21d2d52ea46e7a891badc0cc01bec7047..618d6a6b8f92ee68a17cfcb7a992013616640625 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,6 +23,9 @@ IF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
   ADD_DEFINITIONS(-DVP_DEBUG_MODE=${CMAKE_VERBOSITY_LEVEL} -DVP_DEBUG)
 ENDIF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
 
+# Declare that dynamic-graph shared library is being built.
+ADD_DEFINITIONS(-DBUILDING_DYNAMIC_GRAPH)
+
 ADD_LIBRARY(${LIBRARY_NAME}
   SHARED
   debug/debug.cpp