diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96bd51506d7a4595d49d323fd9755c27410d13b3..40564553173dd47ead8ab0297158d9a1b5ad836b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,7 @@ SET(${PROJECT_NAME}_SOURCES
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED
   ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
-TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} SYSTEM PUBLIC ${PYTHON_INCLUDE_DIRS})
+TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} SYSTEM PUBLIC ${PYTHON_INCLUDE_DIR})
 TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${PYTHON_LIBRARY}
   dynamic-graph::dynamic-graph)
diff --git a/src/dynamic_graph/CMakeLists.txt b/src/dynamic_graph/CMakeLists.txt
index 7c355322acb6b9e030e55c4debc0af858a411307..19e38cb49759cd9b40fbbce582e8428bc7f981b1 100644
--- a/src/dynamic_graph/CMakeLists.txt
+++ b/src/dynamic_graph/CMakeLists.txt
@@ -11,10 +11,8 @@ ADD_LIBRARY(${PYTHON_MODULE} MODULE
   signal-wrapper.cc
   )
 
-TARGET_INCLUDE_DIRECTORIES(${PYTHON_MODULE} SYSTEM PUBLIC ${PYTHON_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(${PYTHON_MODULE} ${PYTHON_LIBRARY}
-  dynamic-graph::dynamic-graph Boost::python ${PROJECT_NAME}
-  eigenpy::eigenpy)
+TARGET_LINK_LIBRARIES(${PYTHON_MODULE} PUBLIC ${PROJECT_NAME} eigenpy::eigenpy)
+TARGET_LINK_BOOST_PYTHON(${PYTHON_MODULE} PRIVATE)
 
 # Remove prefix lib
 SET_TARGET_PROPERTIES(${PYTHON_MODULE} PROPERTIES PREFIX "")