diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20e68b7f53c..e76f772414b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,7 @@ if(MSVC OR MSVC_IDE)
     endif()
 else()
     set(CMAKE_CXX_FLAGS
-        "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Wno-unknown-pragmas -Wno-error=deprecated-declarations -Wno-switch-bool ${EPROSIMA_EXTRA_CMAKE_CXX_FLAGS}")
+        "${CMAKE_CXX_FLAGS} -Wall -pedantic -Wextra -Wno-unknown-pragmas -Wno-error=deprecated-declarations -Wno-switch-bool")
     if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-psabi")
         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
diff --git a/include/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp b/include/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp
index 312a6f9835e..d8e94b7a6b7 100644
--- a/include/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp
+++ b/include/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp
@@ -1934,8 +1934,8 @@ class TypeObjectUtils
      * @brief If one of the @ref TypeIdentifier in @ref TypeIdentifierPair is minimal, returns its reference.
      *
      * @param[in] type_ids @ref TypeIdentifierPair used to retrieve the @ref TypeIdentifier.
-     * @param[out] bool Returns if there was an error.
-     * @return Reference to the minimal @TypeIdentifier.
+     * @param[out] ec Returns if there was an error.
+     * @return Reference to the minimal @ref TypeIdentifier.
      */
     FASTDDS_EXPORTED_API static const TypeIdentifier& retrieve_minimal_type_identifier(
             const TypeIdentifierPair& type_ids,
@@ -1945,8 +1945,8 @@ class TypeObjectUtils
      * @brief If one of the @ref TypeIdentifier in @ref TypeIdentifierPair is complete, returns its reference.
      *
      * @param[in] type_ids @ref TypeIdentifierPair used to retrieve the @ref TypeIdentifier.
-     * @param[out] bool Returns if there was an error.
-     * @return Reference to the complete @TypeIdentifier.
+     * @param[out] ec Returns if there was an error.
+     * @return Reference to the complete @ref TypeIdentifier.
      */
     FASTDDS_EXPORTED_API static const TypeIdentifier& retrieve_complete_type_identifier(
             const TypeIdentifierPair& type_ids,