diff --git a/coreapi/help/Doxyfile.in b/coreapi/help/Doxyfile.in
index f01cbd771..169f6cf2a 100644
--- a/coreapi/help/Doxyfile.in
+++ b/coreapi/help/Doxyfile.in
@@ -228,7 +228,8 @@ TAB_SIZE               = 8
 # "Side Effects:". You can put \n's in the value part of an alias to insert
 # newlines.
 
-ALIASES                = "bctbx_list{1}=A list of \ref \1 objects. \xmlonly <bctbxlist>\1</bctbxlist> \endxmlonly"
+ALIASES                = bctbx_list{1}="A list of \ref \1 objects. \xmlonly <bctbxlist>\1</bctbxlist> \endxmlonly"
+ALIASES               += donotwrap="\xmlonly <donotwrap /> \endxmlonly"
 
 # This tag can be used to specify a number of word-keyword mappings (TCL only).
 # A mapping has the form "name=value". For example adding "class=itcl::class"
diff --git a/tools/genapixml.py b/tools/genapixml.py
index bd8d9d493..dc3a132b0 100755
--- a/tools/genapixml.py
+++ b/tools/genapixml.py
@@ -304,6 +304,9 @@ class Project:
 			descriptionNode.tag = 'description'
 			descriptionNode.attrib = {}
 		return descriptionNode
+	
+	def __canBeWrapped(self, node):
+		return node.find('./detaileddescription//donotwrap') is None
 
 	def __discoverClasses(self):
 		for td in self.__typedefs:
@@ -491,6 +494,8 @@ class Project:
 			self.add(td)
 
 	def __parseCFunctionMemberdef(self, node):
+		if not Project.__canBeWrapped(self, node):
+			return None
 		internal = node.find("./detaileddescription/internal")
 		if internal is not None:
 			return None
diff --git a/wrappers/cpp/CMakeLists.txt b/wrappers/cpp/CMakeLists.txt
index 4720a3054..b4c6bfba8 100644
--- a/wrappers/cpp/CMakeLists.txt
+++ b/wrappers/cpp/CMakeLists.txt
@@ -22,7 +22,14 @@
 
 add_custom_command(OUTPUT include/linphone++/linphone.hh src/linphone++.cc
 	COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/genwrapper.py" "${PROJECT_BINARY_DIR}/coreapi/help/doc/xml"
-	DEPENDS abstractapi.py genwrapper.py class_header.mustache class_impl.mustache enums_header.mustache main_header.mustache linphone-doc
+	DEPENDS ${PROJECT_SOURCE_DIR}/tools/genapixml.py
+	abstractapi.py
+	genwrapper.py
+	class_header.mustache
+	class_impl.mustache
+	enums_header.mustache
+	main_header.mustache
+	linphone-doc
 	"${PROJECT_BINARY_DIR}/coreapi/help/doc/xml/index.xml"
 )