diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ddf728a6..d64ef8f1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,10 +312,9 @@ else()
 	set(EXPORT_TARGETS_NAME "Linphone")
 endif()
 
-
+add_subdirectory(include)
 add_subdirectory(java)
 add_subdirectory(coreapi)
-add_subdirectory(include)
 add_subdirectory(share)
 if(ENABLE_CONSOLE_UI)
 	add_subdirectory(console)
diff --git a/coreapi/help/CMakeLists.txt b/coreapi/help/CMakeLists.txt
index 21051817a..5520284fc 100644
--- a/coreapi/help/CMakeLists.txt
+++ b/coreapi/help/CMakeLists.txt
@@ -26,14 +26,13 @@ if (ENABLE_DOC OR CXX_WRAPPER)
 		if(DOXYGEN_DOT_FOUND)
 			set(top_srcdir "${CMAKE_CURRENT_LIST_DIR}/../../")
 			configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-			file(GLOB DOC_INPUT_FILES
-				[^.]*.c
-				[^.]*.dox
-				../../include/linphone/[^.]*.h
+			set(DOC_INPUT_FILES ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+				${LINPHONE_HEADER_FILES}
+				${CMAKE_CURRENT_SOURCE_DIR}/doxygen.dox
 			)
 			add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/doc/html/index.html"
 				COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-				DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile ${DOC_INPUT_FILES}
+				DEPENDS ${DOC_INPUT_FILES}
 			)
 			add_custom_target(linphone-doc ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/doc/html/index.html")
 			install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/doc/html" "${CMAKE_CURRENT_BINARY_DIR}/doc/xml"
diff --git a/wrappers/cpp/CMakeLists.txt b/wrappers/cpp/CMakeLists.txt
index b4c6bfba8..2ff57dd1f 100644
--- a/wrappers/cpp/CMakeLists.txt
+++ b/wrappers/cpp/CMakeLists.txt
@@ -44,8 +44,8 @@ target_link_libraries(linphone++
 )
 target_include_directories(linphone++
 	PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include
-	PRIVATE ${CMAKE_BINARY_DIR}/include
-	PRIVATE ${CMAKE_SOURCE_DIR}/include
+	PRIVATE ${PROJECT_BINARY_DIR}/include
+	PRIVATE ${PROJECT_SOURCE_DIR}/include
 	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
 	PRIVATE ${BCTOOLBOX_INCLUDE_DIRS}
 	PRIVATE ${BELLESIP_INCLUDE_DIRS}