diff --git a/CMakeLists.txt b/CMakeLists.txt
index c73aef0ba..e4ac40ba1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,10 +198,11 @@ endif()
 # include_directories must be called only UNDER THIS LINE in order to use our
 # projects submodules first (we do NOT want to have system headers in first position)
 include_directories(
-	include/
-	coreapi/
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}/coreapi/
+	coreapi/
+	include/
+	src/
 )
 set(LINPHONE_INCLUDE_DIRS
 	${BELLESIP_INCLUDE_DIRS}
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 6bd7665a8..4dd144b9d 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -35,6 +35,9 @@ endif()
 
 
 set(LINPHONE_PRIVATE_HEADER_FILES
+	../src/object/object.h
+	../src/object/singleton.h
+	../src/utils/general.h
 	bellesip_sal/sal_impl.h
 	carddav.h
 	conference_private.h
@@ -232,7 +235,7 @@ if(ENABLE_SHARED)
 			MACOSX_FRAMEWORK_IDENTIFIER org.linphone.linphone
   			MACOSX_FRAMEWORK_INFO_PLIST Info.plist.in
 			PUBLIC_HEADER "${LINPHONE_HEADER_FILES}"
-		) 
+		)
 	endif()
 	if(BELCARD_FOUND)
 		if(APPLE)