diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 46f9dbb82d6fbbd8b82aaa9ceef8a48093eb2044..77e3550a4aed9adc3f37bf1ee42433a4b2909bed 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -14,7 +14,7 @@ pool.h
 exception-abstract.h
 exception-factory.h
 exception-signal.h
-
+exception-traces.h
 
 shell-functions.h
 shell-procedure.h
@@ -30,6 +30,8 @@ time-dependency.h
 time-dependency.t.cpp
 signal-caster.h
 all-signals.h
+
+
 )
 
 # Recreate correct path for the headers
diff --git a/include/dynamic-graph/dynamic-graph-api.h b/include/dynamic-graph/dynamic-graph-api.h
index cbdd64e7774e9a91b22a9c8c0c9c3e4cee491dfb..0e6f1c7ba2e021b1a3b5e3e899d4aac6b54a5809 100644
--- a/include/dynamic-graph/dynamic-graph-api.h
+++ b/include/dynamic-graph/dynamic-graph-api.h
@@ -6,7 +6,7 @@
 #define DYNAMICGRAPH_API_H
 
 #if defined (WIN32)
-#  ifdef DYNAMICGRAPH_EXPORT
+#  ifdef dynamic_graph_EXPORT
 #    define DYNAMICGRAPH_EXPORT __declspec(dllexport)
 #  else
 #    define DYNAMICGRAPH_EXPORT __declspec(dllimport)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9b7c3612fa44a2562094bc9b9bb95129fd9367f9..1f0a741231de077e9b8f54c26a5511422d3cf0b7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,11 +8,10 @@ INCLUDE_DIRECTORIES(
 )
 
 # Verbosity level
-IF (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\")
-  ADD_DEFINITIONS(-DVP_DEBUG_MODE=0)
-ELSE (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\")
+
+IF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
   ADD_DEFINITIONS(-DVP_DEBUG_MODE=${CMAKE_VERBOSITY_LEVEL} -DVP_DEBUG)
-ENDIF (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\")
+ENDIF (NOT (\"${CMAKE_VERBOSITY_LEVEL}\" STREQUAL \"\"))
 
 ADD_LIBRARY(${LIBRARY_NAME}
   SHARED