diff --git a/coreapi/help/doc/doxygen/Doxyfile.in b/coreapi/help/doc/doxygen/Doxyfile.in
index 1e0ea6679..851af4c1a 100644
--- a/coreapi/help/doc/doxygen/Doxyfile.in
+++ b/coreapi/help/doc/doxygen/Doxyfile.in
@@ -2004,7 +2004,8 @@ SEARCH_INCLUDES        = YES
 # preprocessor.
 # This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
-INCLUDE_PATH           = .
+INCLUDE_PATH           = . \
+                         @LINPHONE_HEADER_ROOT_DIR@
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index aaf4510a3..b0cd5236b 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -122,6 +122,7 @@ PREPEND(ENUMS_HEADER_FILES "${SRC_ROOT_DIRECTORY}/enums" ${ENUMS_HEADER_FILES})
 PREPEND(UTILS_HEADER_FILES "${SRC_ROOT_DIRECTORY}/utils" ${UTILS_HEADER_FILES})
 
 set(LINPHONE_HEADER_FILES ${ROOT_HEADER_FILES} ${C_API_HEADER_FILES} ${ENUMS_HEADER_FILES} ${UTILS_HEADER_FILES} PARENT_SCOPE)
+set(LINPHONE_HEADER_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}" PARENT_SCOPE)
 
 # ------------------------------------------------------------------------------
 
diff --git a/include/linphone/utils/enum-generator.h b/include/linphone/utils/enum-generator.h
index 333ff6d98..9629b5767 100644
--- a/include/linphone/utils/enum-generator.h
+++ b/include/linphone/utils/enum-generator.h
@@ -53,10 +53,9 @@ LINPHONE_BEGIN_NAMESPACE
 #define L_C_ENUM_PREFIX Linphone
 
 #define L_DECLARE_C_ENUM(NAME, VALUES) \
-	enum L_CONCAT(L_C_ENUM_PREFIX, NAME) { \
+	typedef enum L_CONCAT(_, L_CONCAT(L_C_ENUM_PREFIX, NAME)) { \
 		L_APPLY(L_CONCAT, L_CONCAT(L_C_ENUM_PREFIX, NAME), L_GET_HEAP(VALUES(L_DECLARE_ENUM_VALUE))) \
-	}; \
-	typedef enum L_CONCAT(L_C_ENUM_PREFIX, NAME) L_CONCAT(L_C_ENUM_PREFIX, NAME);
+	} L_CONCAT(L_C_ENUM_PREFIX, NAME)
 
 LINPHONE_END_NAMESPACE