diff --git a/include/dynamic-graph/functions.h b/include/dynamic-graph/functions.h
index 5a9286d2d2d13ddb034bf2092292426769fc7e14..6a1947d1be3d4cdc6efc2fd83d2cb917d27a155f 100644
--- a/include/dynamic-graph/functions.h
+++ b/include/dynamic-graph/functions.h
@@ -29,6 +29,7 @@
 /* DYNAMIC-GRAPH */
 #include <dynamic-graph/exception-factory.h>
 #include <dynamic-graph/interpreter.h>
+#include <dynamic-graph/dynamic-graph-api.h>
 
 /* --- STD --- */
 #include <string>
@@ -39,20 +40,6 @@
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
 
-/* --------------------------------------------------------------------- */
-/* --- API ------------------------------------------------------------- */
-/* --------------------------------------------------------------------- */
-
-#if defined (WIN32) 
-#  if defined (shell_functions_EXPORTS)
-#    define SHELLFUNCTIONS_EXPORT __declspec(dllexport)
-#  else  
-#    define SHELLFUNCTIONS_EXPORT __declspec(dllimport)
-#  endif 
-#else
-#  define SHELLFUNCTIONS_EXPORT
-#endif
-
 /* --------------------------------------------------------------------- */
 /* --- CLASS ----------------------------------------------------------- */
 /* --------------------------------------------------------------------- */
@@ -68,7 +55,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 SHELLFUNCTIONS_EXPORT ShellFunctions
+class DYNAMICGRAPH_EXPORT ShellFunctions
 {
  public: