diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bcecd4793b0e173f15de99d960a4ec8a289d498b..fb588d6fae3919dd33736eb3013ca873ad43513f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -473,7 +473,7 @@ if(ENABLE_STATIC)
 		$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/coreapi/>
 		$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/>
 		$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/>
-		PRIVATE ${LINPHONE_INCLUDE_DIRS}
+		PRIVATE ${LINPHONE_INCLUDE_DIRS} ${LINPHONE_CXX_OBJECTS_INCLUDE_DIRS}
 	)
 	target_link_libraries(linphone-static PRIVATE ${LINK_LIBS})
 
@@ -531,7 +531,7 @@ if(ENABLE_SHARED)
 		$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/coreapi/>
 		$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/>
 		$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/>
-		PRIVATE ${LINPHONE_INCLUDE_DIRS}
+		PRIVATE ${LINPHONE_INCLUDE_DIRS} ${LINPHONE_CXX_OBJECTS_INCLUDE_DIRS}
 	)
 	target_link_libraries(linphone PRIVATE ${LINK_LIBS})
 
diff --git a/tester/flexisip_tester.c b/tester/flexisip_tester.c
index a45d90e697be49a82a04fba24526c4506d6b084c..e37616083f868914207ba6cb2e9bcc5cf84a665f 100644
--- a/tester/flexisip_tester.c
+++ b/tester/flexisip_tester.c
@@ -1320,7 +1320,10 @@ static void redis_publish_subscribe(void) {
 	LinphoneAddress *marie_identity = linphone_address_ref(marie->identity);
 
 	linphone_core_set_network_reachable(marie->lc, FALSE);
-	linphone_core_manager_destroy(marie);
+	/*to avoid unregister*/
+	linphone_core_manager_stop(marie);
+	linphone_core_manager_uninit(marie);
+	ms_free(marie);
 
 	linphone_core_invite_address(pauline->lc, marie_identity);
 	BC_ASSERT_TRUE(wait_for_until(pauline->lc, NULL, &pauline->stat.number_of_LinphoneCallOutgoingProgress, 1, 3000));