diff --git a/CMakeLists.txt b/CMakeLists.txt
index 843ff9e015..80b616b8d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,11 +201,13 @@ ENDIF(BUILD_WITH_HPP_FCL_SUPPORT)
 # Sources definition
 INCLUDE(sources.cmake)
 
+# URDF sources
 IF(BUILD_WITH_URDF_SUPPORT)
   LIST(APPEND ${PROJECT_NAME}_CORE_SOURCES ${${PROJECT_NAME}_URDF_SOURCES})
   LIST(APPEND ${PROJECT_NAME}_CORE_PUBLIC_HEADERS ${${PROJECT_NAME}_URDF_PUBLIC_HEADERS})
 ENDIF(BUILD_WITH_URDF_SUPPORT)
 
+# LibPython sources
 IF(BUILD_WITH_LIBPYTHON)
   LIST(APPEND ${PROJECT_NAME}_CORE_PUBLIC_HEADERS
     ${${PROJECT_NAME}_LIBPYTHON_PUBLIC_HEADERS})
@@ -215,6 +217,7 @@ IF(BUILD_WITH_LIBPYTHON)
     ${${PROJECT_NAME}_BINDINGS_PYTHON_LIBPYTHON_PUBLIC_HEADERS})
 ENDIF(BUILD_WITH_LIBPYTHON)
 
+# HPP-FCL sources
 IF(BUILD_WITH_HPP_FCL_SUPPORT)
   LIST(APPEND ${PROJECT_NAME}_CORE_PUBLIC_HEADERS
     ${${PROJECT_NAME}_HPP_FCL_PUBLIC_HEADERS})
@@ -224,16 +227,17 @@ IF(BUILD_WITH_HPP_FCL_SUPPORT)
     ${${PROJECT_NAME}_BINDINGS_PYTHON_HPP_FCL_PUBLIC_HEADERS})
 ENDIF(BUILD_WITH_HPP_FCL_SUPPORT)
 
+# OpenMP and HPP-FCL+OpenMP sources
 IF(BUILD_WITH_OPENMP_SUPPORT)
   LIST(APPEND ${PROJECT_NAME}_BINDINGS_PYTHON_SOURCES
     ${${PROJECT_NAME}_BINDINGS_PYTHON_OPENMP_SOURCES})
   LIST(APPEND ${PROJECT_NAME}_BINDINGS_PYTHON_PUBLIC_HEADERS
     ${${PROJECT_NAME}_BINDINGS_PYTHON_OPENMP_PUBLIC_HEADERS})
   IF(BUILD_WITH_HPP_FCL_SUPPORT)
-  LIST(APPEND ${PROJECT_NAME}_BINDINGS_PYTHON_SOURCES
-    ${${PROJECT_NAME}_BINDINGS_PYTHON_HPP_FCL_OPENMP_SOURCES})
-  LIST(APPEND ${PROJECT_NAME}_BINDINGS_PYTHON_PUBLIC_HEADERS
-    ${${PROJECT_NAME}_BINDINGS_PYTHON_HPP_FCL_OPENMP_PUBLIC_HEADERS})
+    LIST(APPEND ${PROJECT_NAME}_BINDINGS_PYTHON_SOURCES
+      ${${PROJECT_NAME}_BINDINGS_PYTHON_HPP_FCL_OPENMP_SOURCES})
+    LIST(APPEND ${PROJECT_NAME}_BINDINGS_PYTHON_PUBLIC_HEADERS
+      ${${PROJECT_NAME}_BINDINGS_PYTHON_HPP_FCL_OPENMP_PUBLIC_HEADERS})
   ENDIF(BUILD_WITH_HPP_FCL_SUPPORT)
 ENDIF()
 
diff --git a/sources.cmake b/sources.cmake
index 6051443985..1d320c3451 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -255,7 +255,7 @@ SET(${PROJECT_NAME}_HPP_FCL_PUBLIC_HEADERS
   )
 
 SET(_binary_headers_root ${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio)
-SET(${PROJECT_NAME}_CORE_PRIVATE_HEADERS
+SET(${PROJECT_NAME}_CORE_GENERATED_PUBLIC_HEADERS
   ${_binary_headers_root}/config.hpp
   ${_binary_headers_root}/deprecated.hpp
   ${_binary_headers_root}/warning.hpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e87c3f8c47..f2c3095893 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,7 +19,7 @@ PREPEND_PATH_FROM_LIST(${PROJECT_NAME}_CORE_PUBLIC_HEADERS
 ADD_LIBRARY(${PROJECT_NAME} SHARED
   ${${PROJECT_NAME}_CORE_SOURCES}
   ${${PROJECT_NAME}_CORE_PUBLIC_HEADERS}
-  ${${PROJECT_NAME}_CORE_PRIVATE_HEADERS})
+  ${${PROJECT_NAME}_CORE_GENERATED_PUBLIC_HEADERS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
   LINKER_LANGUAGE CXX
   INSTALL_RPATH "\$ORIGIN"
@@ -93,7 +93,7 @@ ENDIF(hpp-fcl_FOUND)
 
 ADD_SOURCE_GROUP(${PROJECT_NAME}_CORE_SOURCES)
 ADD_HEADER_GROUP(${PROJECT_NAME}_CORE_PUBLIC_HEADERS)
-ADD_HEADER_GROUP(${PROJECT_NAME}_CORE_PRIVATE_HEADERS)
+ADD_HEADER_GROUP(${PROJECT_NAME}_CORE_GENERATED_PUBLIC_HEADERS)
 
 INSTALL(TARGETS ${PROJECT_NAME}
   EXPORT ${TARGETS_EXPORT_NAME}