diff --git a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.h b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.h
index 7c513bc156c..0db02f44359 100644
--- a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.h
+++ b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "AdvancedConfiguration.h"
 
diff --git a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationv1.h b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationv1.h
index da5d202a47d..ffa004bf597 100644
--- a/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationv1.h
+++ b/examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationv1.h
@@ -206,11 +206,11 @@ class AdvancedConfiguration
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -244,17 +244,18 @@ class AdvancedConfiguration
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.h b/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.h
index ddbfbab5db6..44dc2c8493d 100644
--- a/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/BasicConfigurationExample/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 
diff --git a/examples/cpp/dds/BasicConfigurationExample/HelloWorldv1.h b/examples/cpp/dds/BasicConfigurationExample/HelloWorldv1.h
index 47c34186b89..3478b4e49a8 100644
--- a/examples/cpp/dds/BasicConfigurationExample/HelloWorldv1.h
+++ b/examples/cpp/dds/BasicConfigurationExample/HelloWorldv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_HELLOWORLD_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class HelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class HelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/Configurability/samplePubSubTypes.h b/examples/cpp/dds/Configurability/samplePubSubTypes.h
index ec881115211..6022f1e76b7 100644
--- a/examples/cpp/dds/Configurability/samplePubSubTypes.h
+++ b/examples/cpp/dds/Configurability/samplePubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "sample.h"
 
diff --git a/examples/cpp/dds/Configurability/samplev1.h b/examples/cpp/dds/Configurability/samplev1.h
index 8057786faeb..6aa21a41e80 100644
--- a/examples/cpp/dds/Configurability/samplev1.h
+++ b/examples/cpp/dds/Configurability/samplev1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_SAMPLE_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -172,11 +172,11 @@ class sample
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -210,17 +210,18 @@ class sample
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint8_t m_index;
diff --git a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.h b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.h
index cb61cd6ba23..545c68b12b2 100644
--- a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 
diff --git a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldTypeObject.cxx b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldTypeObject.cxx
index 69e829c28d7..da3e0720b2e 100644
--- a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldTypeObject.cxx
+++ b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldTypeObject.cxx
@@ -26,12 +26,14 @@ namespace { char dummy; }
 
 #include "HelloWorld.h"
 #include "HelloWorldTypeObject.h"
+
 #include <mutex>
 #include <utility>
 #include <sstream>
+
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastrtps/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypeObjectFactory.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/AnnotationParameterValue.h>
diff --git a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldv1.h b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldv1.h
index 1d3fa5c91b7..8c7406a074a 100644
--- a/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldv1.h
+++ b/examples/cpp/dds/ContentFilteredTopicExample/HelloWorldv1.h
@@ -26,7 +26,6 @@
 #ifndef _FAST_DDS_GENERATED_HELLOWORLD_H_
 #define _FAST_DDS_GENERATED_HELLOWORLD_H_
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
 
 #include <array>
 #include <bitset>
@@ -36,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -178,11 +179,11 @@ class HelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -216,17 +217,18 @@ class HelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.h b/examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.h
index b9100bacbe9..0e584d6086a 100644
--- a/examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.h
+++ b/examples/cpp/dds/CustomListenerExample/TopicPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "Topic.h"
 
diff --git a/examples/cpp/dds/CustomListenerExample/Topicv1.h b/examples/cpp/dds/CustomListenerExample/Topicv1.h
index b34baa538da..1e9d07ab2b4 100644
--- a/examples/cpp/dds/CustomListenerExample/Topicv1.h
+++ b/examples/cpp/dds/CustomListenerExample/Topicv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_TOPIC_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class Topic
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class Topic
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDataPubSubTypes.h b/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDataPubSubTypes.h
index a8ae92cfc06..9128e745240 100644
--- a/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDataPubSubTypes.h
+++ b/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDataPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "CustomPayloadPoolData.h"
 
diff --git a/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDatav1.h b/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDatav1.h
index ed77447df15..bf2bf62642c 100644
--- a/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDatav1.h
+++ b/examples/cpp/dds/CustomPayloadPoolExample/CustomPayloadPoolDatav1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_CUSTOMPAYLOADPOOLDATA_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class CustomPayloadPoolData
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class CustomPayloadPoolData
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadPubSubTypes.h b/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadPubSubTypes.h
index bc9fceae08e..8269a45c84c 100644
--- a/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadPubSubTypes.h
+++ b/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "deadlinepayload.h"
 
diff --git a/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadv1.h b/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadv1.h
index 74862199c5b..357516d4e5e 100644
--- a/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadv1.h
+++ b/examples/cpp/dds/DeadlineQoSExample/deadlinepayloadv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_DEADLINEPAYLOAD_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class HelloMsg
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class HelloMsg
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint16_t m_deadlinekey;
diff --git a/examples/cpp/dds/DisablePositiveACKs/TopicPubSubTypes.h b/examples/cpp/dds/DisablePositiveACKs/TopicPubSubTypes.h
index b9100bacbe9..0e584d6086a 100644
--- a/examples/cpp/dds/DisablePositiveACKs/TopicPubSubTypes.h
+++ b/examples/cpp/dds/DisablePositiveACKs/TopicPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "Topic.h"
 
diff --git a/examples/cpp/dds/DisablePositiveACKs/Topicv1.h b/examples/cpp/dds/DisablePositiveACKs/Topicv1.h
index b34baa538da..1e9d07ab2b4 100644
--- a/examples/cpp/dds/DisablePositiveACKs/Topicv1.h
+++ b/examples/cpp/dds/DisablePositiveACKs/Topicv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_TOPIC_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class Topic
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class Topic
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp
index 14feb51aa68..d3063562aad 100644
--- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp
+++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp
@@ -32,7 +32,7 @@
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.cpp b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.cpp
index 031221309c7..42402bec60c 100644
--- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.cpp
+++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.cpp
@@ -33,7 +33,7 @@
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/dds/DiscoveryServerExample/arg_configuration.h b/examples/cpp/dds/DiscoveryServerExample/arg_configuration.h
index 29f1acdd40f..411ef048a33 100644
--- a/examples/cpp/dds/DiscoveryServerExample/arg_configuration.h
+++ b/examples/cpp/dds/DiscoveryServerExample/arg_configuration.h
@@ -25,7 +25,7 @@
 #include <string>
 
 #include <optionparser.hpp>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include "common.h"
 
diff --git a/examples/cpp/dds/DiscoveryServerExample/common.h b/examples/cpp/dds/DiscoveryServerExample/common.h
index 5ef51a62ff4..24bdf99aa6b 100644
--- a/examples/cpp/dds/DiscoveryServerExample/common.h
+++ b/examples/cpp/dds/DiscoveryServerExample/common.h
@@ -21,7 +21,7 @@
 #define _EPROSIMA_FASTDDS_EXAMPLES_CPP_DDS_DISCOVERYSERVEREXAMPLE_COMMON_H_
 
 #include <fastdds/rtps/attributes/ServerAttributes.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 enum class TransportKind
 {
diff --git a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.h b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.h
index cb61cd6ba23..545c68b12b2 100644
--- a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 
diff --git a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldv1.h b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldv1.h
index 1d3fa5c91b7..8c7406a074a 100644
--- a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldv1.h
+++ b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldv1.h
@@ -26,7 +26,6 @@
 #ifndef _FAST_DDS_GENERATED_HELLOWORLD_H_
 #define _FAST_DDS_GENERATED_HELLOWORLD_H_
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
 
 #include <array>
 #include <bitset>
@@ -36,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -178,11 +179,11 @@ class HelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -216,17 +217,18 @@ class HelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/Filtering/FilteringExamplePubSubTypes.h b/examples/cpp/dds/Filtering/FilteringExamplePubSubTypes.h
index 7f167f7b498..7f22c98cb7f 100644
--- a/examples/cpp/dds/Filtering/FilteringExamplePubSubTypes.h
+++ b/examples/cpp/dds/Filtering/FilteringExamplePubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "FilteringExample.h"
 
diff --git a/examples/cpp/dds/Filtering/FilteringExamplev1.h b/examples/cpp/dds/Filtering/FilteringExamplev1.h
index d93d0a171cb..44231f22028 100644
--- a/examples/cpp/dds/Filtering/FilteringExamplev1.h
+++ b/examples/cpp/dds/Filtering/FilteringExamplev1.h
@@ -26,7 +26,6 @@
 #ifndef _FAST_DDS_GENERATED_FILTERINGEXAMPLE_H_
 #define _FAST_DDS_GENERATED_FILTERINGEXAMPLE_H_
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
 
 #include <array>
 #include <bitset>
@@ -36,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -151,11 +152,11 @@ class FilteringExample
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -189,17 +190,18 @@ class FilteringExample
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     int32_t m_sampleNumber;
diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExample.h b/examples/cpp/dds/FlowControlExample/FlowControlExample.h
index 867206bcf51..7d6cb4eead7 100644
--- a/examples/cpp/dds/FlowControlExample/FlowControlExample.h
+++ b/examples/cpp/dds/FlowControlExample/FlowControlExample.h
@@ -182,7 +182,7 @@ class FlowControlExample
 
 private:
 
-    std::array<char, 600000> m_message;
+    std::array<char, 600000> m_message{0};
     char m_wasFast{0};
 
 };
diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.h b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.h
index f47b513e629..68bb15aaf58 100644
--- a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.h
+++ b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "FlowControlExample.h"
 
diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExamplev1.h b/examples/cpp/dds/FlowControlExample/FlowControlExamplev1.h
index 155a7457241..de00fea2d36 100644
--- a/examples/cpp/dds/FlowControlExample/FlowControlExamplev1.h
+++ b/examples/cpp/dds/FlowControlExample/FlowControlExamplev1.h
@@ -27,7 +27,6 @@
 #define _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLE_H_
 
 
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -36,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -178,11 +179,11 @@ class FlowControlExample
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -216,17 +217,18 @@ class FlowControlExample
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::array<char, 600000> m_message;
diff --git a/examples/cpp/dds/HelloWorldExample/HelloWorldPubSubTypes.h b/examples/cpp/dds/HelloWorldExample/HelloWorldPubSubTypes.h
index cb61cd6ba23..545c68b12b2 100644
--- a/examples/cpp/dds/HelloWorldExample/HelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/HelloWorldExample/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 
diff --git a/examples/cpp/dds/HelloWorldExample/HelloWorldv1.h b/examples/cpp/dds/HelloWorldExample/HelloWorldv1.h
index c71c7316ade..c5cccd6f5fe 100644
--- a/examples/cpp/dds/HelloWorldExample/HelloWorldv1.h
+++ b/examples/cpp/dds/HelloWorldExample/HelloWorldv1.h
@@ -27,7 +27,6 @@
 #define _FAST_DDS_GENERATED_HELLOWORLD_H_
 
 
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -178,11 +177,11 @@ class HelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -216,17 +215,18 @@ class HelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.h b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.h
index ddbfbab5db6..44dc2c8493d 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldv1.h b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldv1.h
index 4ae5572629e..4f06824f719 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldv1.h
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_HELLOWORLD_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class HelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class HelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.h b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.h
index 83eb7cf1b69..4bb670fc014 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.h
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.h
@@ -186,32 +186,32 @@ class HelloWorld
      * @param _data New value to be copied in member data
      */
     eProsima_user_DllExport void data(
-            const std::array<char, 1024 * 1024>& _data);
+            const std::array<char, 1024*1024>& _data);
 
     /*!
      * @brief This function moves the value in member data
      * @param _data New value to be moved in member data
      */
     eProsima_user_DllExport void data(
-            std::array<char, 1024 * 1024>&& _data);
+            std::array<char, 1024*1024>&& _data);
 
     /*!
      * @brief This function returns a constant reference to member data
      * @return Constant reference to member data
      */
-    eProsima_user_DllExport const std::array<char, 1024 * 1024>& data() const;
+    eProsima_user_DllExport const std::array<char, 1024*1024>& data() const;
 
     /*!
      * @brief This function returns a reference to member data
      * @return Reference to member data
      */
-    eProsima_user_DllExport std::array<char, 1024 * 1024>& data();
+    eProsima_user_DllExport std::array<char, 1024*1024>& data();
 
 private:
 
     uint32_t m_index{0};
     std::string m_message;
-    std::array<char, 1024 * 1024> m_data;
+    std::array<char, 1024*1024> m_data{0};
 
 };
 
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.h b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.h
index cb61cd6ba23..545c68b12b2 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldv1.h b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldv1.h
index bb659c13bfb..52c52c2d384 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldv1.h
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_HELLOWORLD_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -183,34 +183,34 @@ class HelloWorld
      * @param _data New value to be copied in member data
      */
     eProsima_user_DllExport void data(
-            const std::array<char, 1024 * 1024>& _data);
+            const std::array<char, 1024*1024>& _data);
 
     /*!
      * @brief This function moves the value in member data
      * @param _data New value to be moved in member data
      */
     eProsima_user_DllExport void data(
-            std::array<char, 1024 * 1024>&& _data);
+            std::array<char, 1024*1024>&& _data);
 
     /*!
      * @brief This function returns a constant reference to member data
      * @return Constant reference to member data
      */
-    eProsima_user_DllExport const std::array<char, 1024 * 1024>& data() const;
+    eProsima_user_DllExport const std::array<char, 1024*1024>& data() const;
 
     /*!
      * @brief This function returns a reference to member data
      * @return Reference to member data
      */
-    eProsima_user_DllExport std::array<char, 1024 * 1024>& data();
+    eProsima_user_DllExport std::array<char, 1024*1024>& data();
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -244,22 +244,23 @@ class HelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
     std::string m_message;
-    std::array<char, 1024 * 1024> m_data;
+    std::array<char, 1024*1024> m_data;
 
 };
 
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.h b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.h
index cb61cd6ba23..545c68b12b2 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp
index 846e72e262b..ceb7fb25de3 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp
@@ -20,7 +20,7 @@
 #include "HelloWorldPublisher.h"
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include <thread>
 
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp
index 4e63d3587da..0686dfce7dc 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp
@@ -25,7 +25,7 @@
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldv1.h b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldv1.h
index 327516a2151..8c7406a074a 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldv1.h
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_HELLOWORLD_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class HelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class HelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/HistoryKind/samplePubSubTypes.h b/examples/cpp/dds/HistoryKind/samplePubSubTypes.h
index ec881115211..6022f1e76b7 100644
--- a/examples/cpp/dds/HistoryKind/samplePubSubTypes.h
+++ b/examples/cpp/dds/HistoryKind/samplePubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "sample.h"
 
diff --git a/examples/cpp/dds/HistoryKind/samplev1.h b/examples/cpp/dds/HistoryKind/samplev1.h
index 8057786faeb..6aa21a41e80 100644
--- a/examples/cpp/dds/HistoryKind/samplev1.h
+++ b/examples/cpp/dds/HistoryKind/samplev1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_SAMPLE_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -172,11 +172,11 @@ class sample
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -210,17 +210,18 @@ class sample
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint8_t m_index;
diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.h b/examples/cpp/dds/Keys/samplePubSubTypes.h
index ec881115211..6022f1e76b7 100644
--- a/examples/cpp/dds/Keys/samplePubSubTypes.h
+++ b/examples/cpp/dds/Keys/samplePubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "sample.h"
 
diff --git a/examples/cpp/dds/Keys/samplev1.h b/examples/cpp/dds/Keys/samplev1.h
index 8057786faeb..6aa21a41e80 100644
--- a/examples/cpp/dds/Keys/samplev1.h
+++ b/examples/cpp/dds/Keys/samplev1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_SAMPLE_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -172,11 +172,11 @@ class sample
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -210,17 +210,18 @@ class sample
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint8_t m_index;
diff --git a/examples/cpp/dds/LateJoiners/samplePubSubTypes.h b/examples/cpp/dds/LateJoiners/samplePubSubTypes.h
index ec881115211..6022f1e76b7 100644
--- a/examples/cpp/dds/LateJoiners/samplePubSubTypes.h
+++ b/examples/cpp/dds/LateJoiners/samplePubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "sample.h"
 
diff --git a/examples/cpp/dds/LateJoiners/samplev1.h b/examples/cpp/dds/LateJoiners/samplev1.h
index 8057786faeb..6aa21a41e80 100644
--- a/examples/cpp/dds/LateJoiners/samplev1.h
+++ b/examples/cpp/dds/LateJoiners/samplev1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_SAMPLE_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -172,11 +172,11 @@ class sample
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -210,17 +210,18 @@ class sample
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint8_t m_index;
diff --git a/examples/cpp/dds/LifespanQoSExample/LifespanPubSubTypes.h b/examples/cpp/dds/LifespanQoSExample/LifespanPubSubTypes.h
index 01b48528ed9..df78166fba9 100644
--- a/examples/cpp/dds/LifespanQoSExample/LifespanPubSubTypes.h
+++ b/examples/cpp/dds/LifespanQoSExample/LifespanPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "Lifespan.h"
 
diff --git a/examples/cpp/dds/LifespanQoSExample/Lifespanv1.h b/examples/cpp/dds/LifespanQoSExample/Lifespanv1.h
index 1e31b13773b..879cfe4d3a0 100644
--- a/examples/cpp/dds/LifespanQoSExample/Lifespanv1.h
+++ b/examples/cpp/dds/LifespanQoSExample/Lifespanv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_LIFESPAN_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class Lifespan
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class Lifespan
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/LivelinessQoS/TopicPubSubTypes.h b/examples/cpp/dds/LivelinessQoS/TopicPubSubTypes.h
index b9100bacbe9..0e584d6086a 100644
--- a/examples/cpp/dds/LivelinessQoS/TopicPubSubTypes.h
+++ b/examples/cpp/dds/LivelinessQoS/TopicPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "Topic.h"
 
diff --git a/examples/cpp/dds/LivelinessQoS/Topicv1.h b/examples/cpp/dds/LivelinessQoS/Topicv1.h
index b34baa538da..1e9d07ab2b4 100644
--- a/examples/cpp/dds/LivelinessQoS/Topicv1.h
+++ b/examples/cpp/dds/LivelinessQoS/Topicv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_TOPIC_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class Topic
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class Topic
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthPubSubTypes.h b/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthPubSubTypes.h
index 0ab6652c4ee..51894058896 100644
--- a/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthPubSubTypes.h
+++ b/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "OwnershipStrength.h"
 
diff --git a/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthv1.h b/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthv1.h
index e0f8c015315..3506cd7f2f0 100644
--- a/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthv1.h
+++ b/examples/cpp/dds/OwnershipStrengthQoSExample/OwnershipStrengthv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_OWNERSHIPSTRENGTH_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -199,11 +199,11 @@ class ExampleMessage
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -237,17 +237,18 @@ class ExampleMessage
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h
index ae4b2b39e8d..d49b73aa252 100644
--- a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h
+++ b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "Calculator.h"
 
diff --git a/examples/cpp/dds/RequestReplyExample/Calculatorv1.h b/examples/cpp/dds/RequestReplyExample/Calculatorv1.h
index f6d2f272c88..a8422f526f8 100644
--- a/examples/cpp/dds/RequestReplyExample/Calculatorv1.h
+++ b/examples/cpp/dds/RequestReplyExample/Calculatorv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_CALCULATOR_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -203,11 +203,11 @@ class RequestType
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -241,17 +241,18 @@ class RequestType
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     OperationType m_operation;
@@ -343,11 +344,11 @@ class ReplyType
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -381,17 +382,18 @@ class ReplyType
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     int64_t m_z;
diff --git a/examples/cpp/dds/SampleConfig_Controller/samplePubSubTypes.h b/examples/cpp/dds/SampleConfig_Controller/samplePubSubTypes.h
index ec881115211..6022f1e76b7 100644
--- a/examples/cpp/dds/SampleConfig_Controller/samplePubSubTypes.h
+++ b/examples/cpp/dds/SampleConfig_Controller/samplePubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "sample.h"
 
diff --git a/examples/cpp/dds/SampleConfig_Controller/samplev1.h b/examples/cpp/dds/SampleConfig_Controller/samplev1.h
index 8057786faeb..6aa21a41e80 100644
--- a/examples/cpp/dds/SampleConfig_Controller/samplev1.h
+++ b/examples/cpp/dds/SampleConfig_Controller/samplev1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_SAMPLE_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -172,11 +172,11 @@ class sample
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -210,17 +210,18 @@ class sample
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint8_t m_index;
diff --git a/examples/cpp/dds/SampleConfig_Events/samplePubSubTypes.h b/examples/cpp/dds/SampleConfig_Events/samplePubSubTypes.h
index ec881115211..6022f1e76b7 100644
--- a/examples/cpp/dds/SampleConfig_Events/samplePubSubTypes.h
+++ b/examples/cpp/dds/SampleConfig_Events/samplePubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "sample.h"
 
diff --git a/examples/cpp/dds/SampleConfig_Events/samplev1.h b/examples/cpp/dds/SampleConfig_Events/samplev1.h
index 8057786faeb..6aa21a41e80 100644
--- a/examples/cpp/dds/SampleConfig_Events/samplev1.h
+++ b/examples/cpp/dds/SampleConfig_Events/samplev1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_SAMPLE_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -172,11 +172,11 @@ class sample
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -210,17 +210,18 @@ class sample
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint8_t m_index;
diff --git a/examples/cpp/dds/SampleConfig_Multimedia/samplePubSubTypes.h b/examples/cpp/dds/SampleConfig_Multimedia/samplePubSubTypes.h
index ec881115211..6022f1e76b7 100644
--- a/examples/cpp/dds/SampleConfig_Multimedia/samplePubSubTypes.h
+++ b/examples/cpp/dds/SampleConfig_Multimedia/samplePubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "sample.h"
 
diff --git a/examples/cpp/dds/SampleConfig_Multimedia/samplev1.h b/examples/cpp/dds/SampleConfig_Multimedia/samplev1.h
index 8057786faeb..6aa21a41e80 100644
--- a/examples/cpp/dds/SampleConfig_Multimedia/samplev1.h
+++ b/examples/cpp/dds/SampleConfig_Multimedia/samplev1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_SAMPLE_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -172,11 +172,11 @@ class sample
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -210,17 +210,18 @@ class sample
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint8_t m_index;
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.h b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.h
index cb61cd6ba23..545c68b12b2 100644
--- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldv1.h b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldv1.h
index 327516a2151..8c7406a074a 100644
--- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldv1.h
+++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_HELLOWORLD_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class HelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class HelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.h b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.h
index cb61cd6ba23..545c68b12b2 100644
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldv1.h b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldv1.h
index 327516a2151..8c7406a074a 100644
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldv1.h
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_HELLOWORLD_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class HelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class HelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.h b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.h
index 06ba8663ef8..e1c1a3017e7 100644
--- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "LoanableHelloWorld.h"
 
diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldv1.h b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldv1.h
index 951cd0e0f09..e60540cec9b 100644
--- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldv1.h
+++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class LoanableHelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class LoanableHelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h
index 06ba8663ef8..f0487c66792 100644
--- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "LoanableHelloWorld.h"
 
@@ -140,7 +140,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     eProsima_user_DllExport inline bool is_plain(
         eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
-        if(data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)
+        if (data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)
         {
             return is_plain_xcdrv2_impl();
         }
diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldv1.h b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldv1.h
index 951cd0e0f09..e60540cec9b 100644
--- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldv1.h
+++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class LoanableHelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class LoanableHelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp b/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp
index eba85f36f85..32f08e6f877 100644
--- a/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp
+++ b/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp
@@ -26,7 +26,7 @@
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/RTPSDomain.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 using namespace eprosima::fastrtps;
 using namespace eprosima::fastrtps::rtps;
diff --git a/examples/cpp/rtps/AsSocket/TestWriterSocket.cpp b/examples/cpp/rtps/AsSocket/TestWriterSocket.cpp
index ef6522bb6d1..4b8b4f8a1ad 100644
--- a/examples/cpp/rtps/AsSocket/TestWriterSocket.cpp
+++ b/examples/cpp/rtps/AsSocket/TestWriterSocket.cpp
@@ -27,7 +27,7 @@
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 using namespace eprosima::fastrtps;
 using namespace eprosima::fastrtps::rtps;
diff --git a/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp b/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp
index 8320dda1250..533ca73bc64 100644
--- a/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp
+++ b/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp
@@ -23,11 +23,11 @@
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/RTPSDomain.h>
-#include <fastrtps/attributes/TopicAttributes.h>
 
 using namespace eprosima::fastrtps;
 using namespace eprosima::fastrtps::rtps;
diff --git a/examples/cpp/rtps/Persistent/TestWriterPersistent.cpp b/examples/cpp/rtps/Persistent/TestWriterPersistent.cpp
index 2bf2d844613..0170d72bd9e 100644
--- a/examples/cpp/rtps/Persistent/TestWriterPersistent.cpp
+++ b/examples/cpp/rtps/Persistent/TestWriterPersistent.cpp
@@ -25,12 +25,12 @@
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/attributes/WriterAttributes.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastrtps/attributes/TopicAttributes.h>
 
 using namespace eprosima::fastrtps;
 using namespace eprosima::fastrtps::rtps;
diff --git a/examples/cpp/rtps/Registered/TestReaderRegistered.cpp b/examples/cpp/rtps/Registered/TestReaderRegistered.cpp
index 6a3da647a25..e5cfb2ffd67 100644
--- a/examples/cpp/rtps/Registered/TestReaderRegistered.cpp
+++ b/examples/cpp/rtps/Registered/TestReaderRegistered.cpp
@@ -23,11 +23,11 @@
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/RTPSDomain.h>
-#include <fastrtps/attributes/TopicAttributes.h>
 
 using namespace eprosima::fastrtps;
 using namespace eprosima::fastrtps::rtps;
diff --git a/examples/cpp/rtps/Registered/TestWriterRegistered.cpp b/examples/cpp/rtps/Registered/TestWriterRegistered.cpp
index 111c8aaa69c..05071191227 100644
--- a/examples/cpp/rtps/Registered/TestWriterRegistered.cpp
+++ b/examples/cpp/rtps/Registered/TestWriterRegistered.cpp
@@ -25,12 +25,12 @@
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/attributes/WriterAttributes.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastrtps/attributes/TopicAttributes.h>
 
 using namespace eprosima::fastrtps;
 using namespace eprosima::fastrtps::rtps;
diff --git a/include/fastdds/dds/core/policy/QosPolicies.hpp b/include/fastdds/dds/core/policy/QosPolicies.hpp
index e6469a1e25b..cd9eeb7ce11 100644
--- a/include/fastdds/dds/core/policy/QosPolicies.hpp
+++ b/include/fastdds/dds/core/policy/QosPolicies.hpp
@@ -36,7 +36,7 @@
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
 
 #include <fastrtps/types/TypeObject.h>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp b/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp
index 49cffe3b1cb..f9c87ccaf2b 100644
--- a/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp
+++ b/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp
@@ -25,7 +25,7 @@
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
 #include <fastdds/dds/subscriber/qos/SubscriberQos.hpp>
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastrtps/attributes/TopicAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/fastdds_dll.hpp>
 
 namespace eprosima {
diff --git a/include/fastdds/dds/topic/TopicDataType.hpp b/include/fastdds/dds/topic/TopicDataType.hpp
index c6586f1e9c1..5aeb81aa253 100644
--- a/include/fastdds/dds/topic/TopicDataType.hpp
+++ b/include/fastdds/dds/topic/TopicDataType.hpp
@@ -24,12 +24,11 @@
 #include <string>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
+#include <fastdds/fastdds_dll.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-
-#include <fastdds/fastdds_dll.hpp>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 // This version of TypeSupport has `is_bounded()`
 #define TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
diff --git a/include/fastdds/dds/topic/qos/TopicQos.hpp b/include/fastdds/dds/topic/qos/TopicQos.hpp
index d49347e6e2a..7970e1af73d 100644
--- a/include/fastdds/dds/topic/qos/TopicQos.hpp
+++ b/include/fastdds/dds/topic/qos/TopicQos.hpp
@@ -21,7 +21,7 @@
 #define _FASTDDS_TOPICQOS_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastrtps/attributes/TopicAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 
 #include <fastdds/dds/log/Log.hpp>
 
diff --git a/include/fastdds/rtps/Endpoint.h b/include/fastdds/rtps/Endpoint.h
index 22eeb64323f..fd34fc14b72 100644
--- a/include/fastdds/rtps/Endpoint.h
+++ b/include/fastdds/rtps/Endpoint.h
@@ -20,15 +20,12 @@
 #define _FASTDDS_RTPS_ENDPOINT_H_
 
 #include <fastdds/rtps/attributes/EndpointAttributes.h>
-
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/common/Locator.h>
 #include <fastdds/rtps/common/Types.h>
-
 #include <fastdds/rtps/history/IChangePool.h>
 #include <fastdds/rtps/history/IPayloadPool.h>
-
-#include <fastrtps/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/include/fastdds/rtps/RTPSDomain.h b/include/fastdds/rtps/RTPSDomain.h
index 5e418abcb8f..ac2da360cc0 100644
--- a/include/fastdds/rtps/RTPSDomain.h
+++ b/include/fastdds/rtps/RTPSDomain.h
@@ -29,7 +29,7 @@
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/history/IPayloadPool.h>
 #include <fastdds/rtps/history/IChangePool.h>
-#include <fastrtps/attributes/TopicAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/include/fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp b/include/fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp
index 5472aefad86..5d3019b6eb5 100644
--- a/include/fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp
+++ b/include/fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp
@@ -21,7 +21,7 @@
 
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
 
-#include <fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp>
+#include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/include/fastdds/rtps/attributes/ReaderAttributes.h b/include/fastdds/rtps/attributes/ReaderAttributes.h
index cd4f2403831..4c0d5e67f61 100644
--- a/include/fastdds/rtps/attributes/ReaderAttributes.h
+++ b/include/fastdds/rtps/attributes/ReaderAttributes.h
@@ -24,7 +24,7 @@
 #include <fastdds/rtps/attributes/EndpointAttributes.h>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
 #include <fastdds/rtps/common/Time_t.h>
-#include <fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp>
+#include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/include/fastrtps/attributes/TopicAttributes.h b/include/fastdds/rtps/attributes/TopicAttributes.h
similarity index 100%
rename from include/fastrtps/attributes/TopicAttributes.h
rename to include/fastdds/rtps/attributes/TopicAttributes.h
diff --git a/include/fastdds/rtps/attributes/WriterAttributes.h b/include/fastdds/rtps/attributes/WriterAttributes.h
index 911f7c641cb..adf951ee14e 100644
--- a/include/fastdds/rtps/attributes/WriterAttributes.h
+++ b/include/fastdds/rtps/attributes/WriterAttributes.h
@@ -27,7 +27,7 @@
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/flowcontrol/FlowControllerConsts.hpp>
 #include <fastdds/rtps/flowcontrol/ThroughputControllerDescriptor.h>
-#include <fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp>
+#include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/include/fastdds/rtps/builtin/data/ContentFilterProperty.hpp b/include/fastdds/rtps/builtin/data/ContentFilterProperty.hpp
index d381772538f..ec174f85cea 100644
--- a/include/fastdds/rtps/builtin/data/ContentFilterProperty.hpp
+++ b/include/fastdds/rtps/builtin/data/ContentFilterProperty.hpp
@@ -22,8 +22,8 @@
 #include <string>
 
 #include <fastcdr/cdr/fixed_size_string.hpp>
-#include <fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/include/fastdds/rtps/builtin/data/ReaderProxyData.h b/include/fastdds/rtps/builtin/data/ReaderProxyData.h
index c15d4b9df29..a18718fb650 100644
--- a/include/fastdds/rtps/builtin/data/ReaderProxyData.h
+++ b/include/fastdds/rtps/builtin/data/ReaderProxyData.h
@@ -30,7 +30,7 @@
 #if HAVE_SECURITY
 #include <fastdds/rtps/security/accesscontrol/EndpointSecurityAttributes.h>
 #endif // if HAVE_SECURITY
-#include <fastrtps/attributes/TopicAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/include/fastdds/rtps/builtin/data/WriterProxyData.h b/include/fastdds/rtps/builtin/data/WriterProxyData.h
index ec13009e2b6..03dce715b4a 100644
--- a/include/fastdds/rtps/builtin/data/WriterProxyData.h
+++ b/include/fastdds/rtps/builtin/data/WriterProxyData.h
@@ -25,13 +25,13 @@
 
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/RemoteLocators.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #if HAVE_SECURITY
 #include <fastdds/rtps/security/accesscontrol/EndpointSecurityAttributes.h>
 #endif // if HAVE_SECURITY
-#include <fastrtps/attributes/TopicAttributes.h>
 #include <fastcdr/cdr/fixed_size_string.hpp>
 
 namespace eprosima {
diff --git a/include/fastdds/rtps/builtin/discovery/participant/PDP.h b/include/fastdds/rtps/builtin/discovery/participant/PDP.h
index 666d25d8152..78e4430d25c 100644
--- a/include/fastdds/rtps/builtin/discovery/participant/PDP.h
+++ b/include/fastdds/rtps/builtin/discovery/participant/PDP.h
@@ -36,7 +36,7 @@
 #include <fastdds/rtps/writer/WriterDiscoveryInfo.h>
 #include <fastdds/statistics/rtps/monitor_service/interfaces/IProxyObserver.hpp>
 #include <fastdds/statistics/rtps/monitor_service/interfaces/IProxyQueryable.hpp>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 #include <fastrtps/utils/ProxyPool.hpp>
 
 namespace eprosima {
diff --git a/include/fastdds/rtps/common/FragmentNumber.h b/include/fastdds/rtps/common/FragmentNumber.h
index 976b3b990d5..99a90caf5f4 100644
--- a/include/fastdds/rtps/common/FragmentNumber.h
+++ b/include/fastdds/rtps/common/FragmentNumber.h
@@ -20,8 +20,8 @@
 #define _FASTDDS_RTPS_RPTS_ELEM_FRAGNUM_H_
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastrtps/utils/fixed_size_bitmap.hpp>
 #include <fastdds/rtps/common/Types.h>
+#include <fastdds/utils/fixed_size_bitmap.hpp>
 
 #include <set>
 #include <cmath>
diff --git a/include/fastdds/rtps/common/Locator.h b/include/fastdds/rtps/common/Locator.h
index d3daa712643..f19a558f83d 100644
--- a/include/fastdds/rtps/common/Locator.h
+++ b/include/fastdds/rtps/common/Locator.h
@@ -22,7 +22,7 @@
 #include <fastdds/fastdds_dll.hpp>
 
 #include <fastdds/rtps/common/Types.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include <fastdds/dds/log/Log.hpp>
 
diff --git a/include/fastdds/rtps/common/LocatorListComparisons.hpp b/include/fastdds/rtps/common/LocatorListComparisons.hpp
index baf0456d83f..59591c3400d 100644
--- a/include/fastdds/rtps/common/LocatorListComparisons.hpp
+++ b/include/fastdds/rtps/common/LocatorListComparisons.hpp
@@ -20,7 +20,7 @@
 #define _FASTDDS_RTPS_COMMON_LOCATORLISTCOMPARISONS_HPP_
 
 #include <fastdds/rtps/common/Locator.h>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 #include <algorithm>
 
 namespace eprosima {
diff --git a/include/fastdds/rtps/common/LocatorSelector.hpp b/include/fastdds/rtps/common/LocatorSelector.hpp
index fed661e95e5..0ed3418e9bd 100644
--- a/include/fastdds/rtps/common/LocatorSelector.hpp
+++ b/include/fastdds/rtps/common/LocatorSelector.hpp
@@ -23,8 +23,8 @@
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/common/Locator.h>
 #include <fastdds/rtps/common/LocatorsIterator.hpp>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/IPLocator.h>
 
 #include <algorithm>
 
diff --git a/include/fastdds/rtps/common/LocatorSelectorEntry.hpp b/include/fastdds/rtps/common/LocatorSelectorEntry.hpp
index 0196adf84e4..a4f0b02cb6b 100644
--- a/include/fastdds/rtps/common/LocatorSelectorEntry.hpp
+++ b/include/fastdds/rtps/common/LocatorSelectorEntry.hpp
@@ -23,7 +23,7 @@
 
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/common/Locator.h>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/include/fastdds/rtps/common/RemoteLocators.hpp b/include/fastdds/rtps/common/RemoteLocators.hpp
index ea8d9c1c47f..8ef8eeb0058 100644
--- a/include/fastdds/rtps/common/RemoteLocators.hpp
+++ b/include/fastdds/rtps/common/RemoteLocators.hpp
@@ -20,7 +20,7 @@
 #define _FASTDDS_RTPS_COMMON_REMOTELOCATORS_HPP_
 
 #include <fastdds/rtps/common/Locator.h>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 #include <fastdds/dds/log/Log.hpp>
 
 namespace eprosima {
diff --git a/include/fastdds/rtps/common/SequenceNumber.h b/include/fastdds/rtps/common/SequenceNumber.h
index 57453fc65d7..a529ea0368d 100644
--- a/include/fastdds/rtps/common/SequenceNumber.h
+++ b/include/fastdds/rtps/common/SequenceNumber.h
@@ -25,8 +25,8 @@
 #include <vector>
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastrtps/utils/fixed_size_bitmap.hpp>
 #include <fastdds/rtps/common/Types.h>
+#include <fastdds/utils/fixed_size_bitmap.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/include/fastdds/rtps/history/History.h b/include/fastdds/rtps/history/History.h
index a5c46dfc531..883d9c701bb 100644
--- a/include/fastdds/rtps/history/History.h
+++ b/include/fastdds/rtps/history/History.h
@@ -21,14 +21,12 @@
 #define _FASTDDS_RTPS_HISTORY_H_
 
 #include <fastdds/fastdds_dll.hpp>
-
 #include <fastdds/rtps/history/IChangePool.h>
 #include <fastdds/rtps/history/IPayloadPool.h>
-
 #include <fastdds/rtps/common/SequenceNumber.h>
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastrtps/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
 
 #include <cassert>
 #include <functional>
diff --git a/include/fastdds/rtps/reader/RTPSReader.h b/include/fastdds/rtps/reader/RTPSReader.h
index ce67b6282dc..c7977931235 100644
--- a/include/fastdds/rtps/reader/RTPSReader.h
+++ b/include/fastdds/rtps/reader/RTPSReader.h
@@ -35,7 +35,7 @@
 #include <fastdds/statistics/rtps/monitor_service/interfaces/IConnectionsObserver.hpp>
 #endif // ifdef FASTDDS_STATISTICS
 #include <fastdds/statistics/rtps/StatisticsCommon.hpp>
-#include <fastrtps/utils/TimedConditionVariable.hpp>
+#include <fastdds/utils/TimedConditionVariable.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/include/fastdds/rtps/reader/StatefulReader.h b/include/fastdds/rtps/reader/StatefulReader.h
index 42790d1ce16..97cc36f91e9 100644
--- a/include/fastdds/rtps/reader/StatefulReader.h
+++ b/include/fastdds/rtps/reader/StatefulReader.h
@@ -27,7 +27,7 @@
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #include <fastdds/rtps/messages/RTPSMessageGroup.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/include/fastdds/rtps/reader/StatelessReader.h b/include/fastdds/rtps/reader/StatelessReader.h
index 6db00fa24dd..82cf03ab77c 100644
--- a/include/fastdds/rtps/reader/StatelessReader.h
+++ b/include/fastdds/rtps/reader/StatelessReader.h
@@ -27,7 +27,7 @@
 
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/include/fastdds/rtps/resources/ResourceEvent.h b/include/fastdds/rtps/resources/ResourceEvent.h
index 33be690b67d..6016232d1e7 100644
--- a/include/fastdds/rtps/resources/ResourceEvent.h
+++ b/include/fastdds/rtps/resources/ResourceEvent.h
@@ -28,8 +28,8 @@
 #include <vector>
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastrtps/utils/TimedMutex.hpp>
-#include <fastrtps/utils/TimedConditionVariable.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedConditionVariable.hpp>
 
 namespace eprosima {
 
diff --git a/include/fastdds/rtps/rtps_all.h b/include/fastdds/rtps/rtps_all.h
index 02c9f8af78d..1c16cf680eb 100644
--- a/include/fastdds/rtps/rtps_all.h
+++ b/include/fastdds/rtps/rtps_all.h
@@ -20,28 +20,22 @@
 #ifndef _FASTDDS_RTPS_ALL_H_
 #define _FASTDDS_RTPS_ALL_H_
 
+#include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/all_common.h>
-
 #include <fastdds/rtps/attributes/WriterAttributes.h>
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
-
+#include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/RTPSDomain.h>
-
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/rtps/writer/WriterListener.h>
-#include <fastdds/rtps/history/WriterHistory.h>
-
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/reader/ReaderListener.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
-
-#include <fastrtps/utils/IPFinder.h>
+#include <fastdds/utils/IPFinder.h>
 #include <fastrtps/utils/TimeConversion.h>
-
 #include <fastrtps/qos/QosPolicies.h>
 
-#include <fastdds/dds/log/Log.hpp>
 
 #endif /* _FASTDDS_RTPS_ALL_H_ */
diff --git a/include/fastdds/rtps/writer/LivelinessManager.h b/include/fastdds/rtps/writer/LivelinessManager.h
index 52b50cbeb8f..18e84e9d702 100644
--- a/include/fastdds/rtps/writer/LivelinessManager.h
+++ b/include/fastdds/rtps/writer/LivelinessManager.h
@@ -20,7 +20,7 @@
 
 #include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/writer/LivelinessData.h>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 #include <fastrtps/utils/shared_mutex.hpp>
 
 #include <mutex>
diff --git a/include/fastdds/rtps/writer/LocatorSelectorSender.hpp b/include/fastdds/rtps/writer/LocatorSelectorSender.hpp
index 8e691dff09f..149d948912c 100644
--- a/include/fastdds/rtps/writer/LocatorSelectorSender.hpp
+++ b/include/fastdds/rtps/writer/LocatorSelectorSender.hpp
@@ -3,8 +3,8 @@
 
 #include <fastdds/rtps/common/LocatorSelector.hpp>
 #include <fastdds/rtps/messages/RTPSMessageSenderInterface.hpp>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
-#include <fastrtps/utils/TimedMutex.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/include/fastdds/rtps/writer/ReaderProxy.h b/include/fastdds/rtps/writer/ReaderProxy.h
index 66f77d4c5e5..8861cba4683 100644
--- a/include/fastdds/rtps/writer/ReaderProxy.h
+++ b/include/fastdds/rtps/writer/ReaderProxy.h
@@ -34,7 +34,7 @@
 #include <fastdds/rtps/writer/ChangeForReader.h>
 #include <fastdds/rtps/writer/ReaderLocator.h>
 
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 #include <algorithm>
 #include <mutex>
diff --git a/include/fastdds/rtps/writer/StatefulWriter.h b/include/fastdds/rtps/writer/StatefulWriter.h
index 04207f2838b..64e8599f15d 100644
--- a/include/fastdds/rtps/writer/StatefulWriter.h
+++ b/include/fastdds/rtps/writer/StatefulWriter.h
@@ -29,7 +29,7 @@
 #include <fastdds/rtps/history/IPayloadPool.h>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
 #include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/include/fastdds/rtps/writer/StatelessWriter.h b/include/fastdds/rtps/writer/StatelessWriter.h
index 9fdaa368852..98c117d95d4 100644
--- a/include/fastdds/rtps/writer/StatelessWriter.h
+++ b/include/fastdds/rtps/writer/StatelessWriter.h
@@ -27,7 +27,7 @@
 #include <fastdds/rtps/writer/ChangeForReader.h>
 #include <fastdds/rtps/writer/ReaderLocator.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 #include <condition_variable>
 #include <list>
diff --git a/include/fastdds/statistics/rtps/StatisticsCommon.hpp b/include/fastdds/statistics/rtps/StatisticsCommon.hpp
index 359bc9c70e2..c40a57e8da0 100644
--- a/include/fastdds/statistics/rtps/StatisticsCommon.hpp
+++ b/include/fastdds/statistics/rtps/StatisticsCommon.hpp
@@ -26,7 +26,7 @@
 #include <fastdds/rtps/common/SampleIdentity.h>
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/statistics/IListeners.hpp>
-#include <fastrtps/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
 
 
 namespace eprosima {
diff --git a/include/fastrtps/utils/IPFinder.h b/include/fastdds/utils/IPFinder.h
similarity index 100%
rename from include/fastrtps/utils/IPFinder.h
rename to include/fastdds/utils/IPFinder.h
diff --git a/include/fastrtps/utils/IPLocator.h b/include/fastdds/utils/IPLocator.h
similarity index 100%
rename from include/fastrtps/utils/IPLocator.h
rename to include/fastdds/utils/IPLocator.h
diff --git a/include/fastrtps/utils/TimedConditionVariable.hpp b/include/fastdds/utils/TimedConditionVariable.hpp
similarity index 100%
rename from include/fastrtps/utils/TimedConditionVariable.hpp
rename to include/fastdds/utils/TimedConditionVariable.hpp
diff --git a/include/fastrtps/utils/TimedMutex.hpp b/include/fastdds/utils/TimedMutex.hpp
similarity index 100%
rename from include/fastrtps/utils/TimedMutex.hpp
rename to include/fastdds/utils/TimedMutex.hpp
diff --git a/include/fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp b/include/fastdds/utils/collections/ResourceLimitedContainerConfig.hpp
similarity index 100%
rename from include/fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp
rename to include/fastdds/utils/collections/ResourceLimitedContainerConfig.hpp
diff --git a/include/fastrtps/utils/collections/ResourceLimitedVector.hpp b/include/fastdds/utils/collections/ResourceLimitedVector.hpp
similarity index 100%
rename from include/fastrtps/utils/collections/ResourceLimitedVector.hpp
rename to include/fastdds/utils/collections/ResourceLimitedVector.hpp
diff --git a/include/fastrtps/utils/fixed_size_bitmap.hpp b/include/fastdds/utils/fixed_size_bitmap.hpp
similarity index 100%
rename from include/fastrtps/utils/fixed_size_bitmap.hpp
rename to include/fastdds/utils/fixed_size_bitmap.hpp
diff --git a/include/fastrtps/utils/md5.h b/include/fastdds/utils/md5.h
similarity index 99%
rename from include/fastrtps/utils/md5.h
rename to include/fastdds/utils/md5.h
index 4842bee38fd..20eda395745 100644
--- a/include/fastrtps/utils/md5.h
+++ b/include/fastdds/utils/md5.h
@@ -37,7 +37,6 @@
 #include <iostream>
 
 #include <fastdds/fastdds_dll.hpp>
-
 /**
  * Class MD5, for calculating MD5 hashes of strings or byte arrays
  * it is not meant to be fast or secure
@@ -100,7 +99,6 @@ class FASTDDS_EXPORTED_API MD5
     uint4 count[2]; // 64bit counter for number of bits (lo, hi)
     uint4 state[4]; // digest so far
 
-
     // low level logic operations
     static inline uint4 F(
             uint4 x,
diff --git a/include/fastrtps/attributes/PublisherAttributes.h b/include/fastrtps/attributes/PublisherAttributes.h
index 1cba9819345..701c2d29405 100644
--- a/include/fastrtps/attributes/PublisherAttributes.h
+++ b/include/fastrtps/attributes/PublisherAttributes.h
@@ -23,11 +23,11 @@
 
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>
 #include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/attributes/WriterAttributes.h>
 #include <fastdds/rtps/common/Locator.h>
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/flowcontrol/ThroughputControllerDescriptor.h>
-#include <fastrtps/attributes/TopicAttributes.h>
 #include <fastrtps/qos/WriterQos.h>
 
 namespace eprosima {
diff --git a/include/fastrtps/attributes/SubscriberAttributes.h b/include/fastrtps/attributes/SubscriberAttributes.h
index f799fd51c45..619d4e40cb7 100644
--- a/include/fastrtps/attributes/SubscriberAttributes.h
+++ b/include/fastrtps/attributes/SubscriberAttributes.h
@@ -22,10 +22,10 @@
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>
 #include <fastdds/rtps/attributes/PropertyPolicy.h>
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/common/Locator.h>
 #include <fastdds/rtps/resources/ResourceManagement.h>
-#include <fastrtps/attributes/TopicAttributes.h>
 #include <fastrtps/qos/ReaderQos.h>
 
 namespace eprosima {
diff --git a/include/fastrtps/attributes/all_attributes.h b/include/fastrtps/attributes/all_attributes.h
index 6a4dfa84fba..4377f2eb3f6 100644
--- a/include/fastrtps/attributes/all_attributes.h
+++ b/include/fastrtps/attributes/all_attributes.h
@@ -19,10 +19,10 @@
 #ifndef ALL_ATTRIBUTES_H_
 #define ALL_ATTRIBUTES_H_
 
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastrtps/attributes/ParticipantAttributes.h>
 #include <fastrtps/attributes/PublisherAttributes.h>
 #include <fastrtps/attributes/SubscriberAttributes.h>
-#include <fastrtps/attributes/TopicAttributes.h>
 #include <fastrtps/attributes/RequesterAttributes.hpp>
 #include <fastrtps/attributes/ReplierAttributes.hpp>
 
diff --git a/include/fastrtps/fastrtps_all.h b/include/fastrtps/fastrtps_all.h
index 7b63aa0ae72..f40573d056b 100644
--- a/include/fastrtps/fastrtps_all.h
+++ b/include/fastrtps/fastrtps_all.h
@@ -25,30 +25,21 @@
 //SINCE IT INCLUDES ALL NECESSARY HEADERS.
 
 #include <fastdds/rtps/common/all_common.h>
-
+#include <fastdds/utils/IPFinder.h>
 #include <fastrtps/Domain.h>
-
 #include <fastrtps/participant/Participant.h>
 #include <fastrtps/participant/ParticipantListener.h>
 #include <fastrtps/publisher/Publisher.h>
 #include <fastrtps/subscriber/Subscriber.h>
 #include <fastrtps/publisher/PublisherListener.h>
 #include <fastrtps/subscriber/SubscriberListener.h>
-
-
 #include <fastrtps/attributes/ParticipantAttributes.h>
 #include <fastrtps/attributes/PublisherAttributes.h>
 #include <fastrtps/attributes/SubscriberAttributes.h>
-
 #include <fastrtps/subscriber/SampleInfo.h>
 #include <fastrtps/TopicDataType.h>
-
-#include <fastrtps/utils/IPFinder.h>
 #include <fastrtps/utils/TimeConversion.h>
-
 #include <fastrtps/qos/QosPolicies.h>
-
 #include <fastrtps/log/Log.h>
 
-
 #endif /* FASTRTPS_ALL_H_ */
diff --git a/include/fastrtps/publisher/PublisherHistory.h b/include/fastrtps/publisher/PublisherHistory.h
index 3198b650d2d..87fa2c9c703 100644
--- a/include/fastrtps/publisher/PublisherHistory.h
+++ b/include/fastrtps/publisher/PublisherHistory.h
@@ -24,11 +24,11 @@
 #include <chrono>
 #include <mutex>
 
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/resources/ResourceManagement.h>
-#include <fastrtps/attributes/TopicAttributes.h>
 #include <fastrtps/common/KeyedChanges.h>
 #include <fastrtps/qos/QosPolicies.h>
 
diff --git a/include/fastrtps/subscriber/SubscriberHistory.h b/include/fastrtps/subscriber/SubscriberHistory.h
index eba33252b01..6fdf3fad4d6 100644
--- a/include/fastrtps/subscriber/SubscriberHistory.h
+++ b/include/fastrtps/subscriber/SubscriberHistory.h
@@ -22,13 +22,14 @@
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <fastdds/dds/topic/TopicDataType.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
+#include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/resources/ResourceManagement.h>
 #include <fastrtps/qos/ReaderQos.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastrtps/qos/QosPolicies.h>
 #include <fastrtps/common/KeyedChanges.h>
 #include <fastrtps/subscriber/SampleInfo.h>
-#include <fastrtps/attributes/TopicAttributes.h>
+
 
 #include <chrono>
 #include <functional>
diff --git a/include/fastrtps/types/DynamicPubSubType.h b/include/fastrtps/types/DynamicPubSubType.h
index f8217949bf1..ca6fc0ab566 100644
--- a/include/fastrtps/types/DynamicPubSubType.h
+++ b/include/fastrtps/types/DynamicPubSubType.h
@@ -19,7 +19,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastrtps/types/DynamicTypePtr.h>
 #include <fastrtps/types/DynamicDataPtr.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/dynamic-types/BuiltinAnnotationsTypeObject.cpp b/src/cpp/dynamic-types/BuiltinAnnotationsTypeObject.cpp
index 729dda56952..30980b9b423 100644
--- a/src/cpp/dynamic-types/BuiltinAnnotationsTypeObject.cpp
+++ b/src/cpp/dynamic-types/BuiltinAnnotationsTypeObject.cpp
@@ -34,7 +34,7 @@ char dummy;
 #include <fastrtps/types/AnnotationParameterValue.h>
 #include <fastrtps/types/BuiltinAnnotationsTypeObject.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 using namespace eprosima::fastrtps::rtps;
 
diff --git a/src/cpp/dynamic-types/DynamicTypeBuilderFactory.cpp b/src/cpp/dynamic-types/DynamicTypeBuilderFactory.cpp
index 5f02c0a0e8c..3e8809015a8 100644
--- a/src/cpp/dynamic-types/DynamicTypeBuilderFactory.cpp
+++ b/src/cpp/dynamic-types/DynamicTypeBuilderFactory.cpp
@@ -15,6 +15,7 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
 #include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/AnnotationDescriptor.h>
 #include <fastrtps/types/DynamicType.h>
 #include <fastrtps/types/DynamicTypeBuilder.h>
@@ -26,7 +27,6 @@
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/TypeObject.h>
 #include <fastrtps/types/TypeObjectFactory.h>
-#include <fastrtps/utils/md5.h>
 #include <fastrtps/utils/string_convert.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/dynamic-types/TypeObjectFactory.cpp b/src/cpp/dynamic-types/TypeObjectFactory.cpp
index 9f24d1dc235..73beacd8ebb 100644
--- a/src/cpp/dynamic-types/TypeObjectFactory.cpp
+++ b/src/cpp/dynamic-types/TypeObjectFactory.cpp
@@ -16,6 +16,7 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/AnnotationDescriptor.h>
 #include <fastrtps/types/BuiltinAnnotationsTypeObject.h>
 #include <fastrtps/types/DynamicTypeBuilderFactory.h>
@@ -27,7 +28,6 @@
 #include <fastrtps/types/TypeDescriptor.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/TypeObjectFactory.h>
-#include <fastrtps/utils/md5.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/fastdds/publisher/DataWriterHistory.hpp b/src/cpp/fastdds/publisher/DataWriterHistory.hpp
index c3142a9170b..8aacc0481a5 100644
--- a/src/cpp/fastdds/publisher/DataWriterHistory.hpp
+++ b/src/cpp/fastdds/publisher/DataWriterHistory.hpp
@@ -23,11 +23,11 @@
 #include <mutex>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/resources/ResourceManagement.h>
-#include <fastrtps/attributes/TopicAttributes.h>
 
 #include <fastdds/publisher/history/DataWriterInstance.hpp>
 
diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.cpp b/src/cpp/fastdds/publisher/DataWriterImpl.cpp
index 21f26a365a8..4b50f8c7021 100644
--- a/src/cpp/fastdds/publisher/DataWriterImpl.cpp
+++ b/src/cpp/fastdds/publisher/DataWriterImpl.cpp
@@ -23,32 +23,28 @@
 #include <functional>
 #include <iostream>
 
+#include <fastdds/core/condition/StatusConditionImpl.hpp>
+#include <fastdds/core/policy/ParameterSerializer.hpp>
+#include <fastdds/core/policy/QosPolicyUtils.hpp>
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/dds/publisher/DataWriter.hpp>
 #include <fastdds/dds/publisher/Publisher.hpp>
 #include <fastdds/dds/publisher/PublisherListener.hpp>
-
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/domain/DomainParticipantImpl.hpp>
+#include <fastdds/publisher/filtering/DataWriterFilteredChangePool.hpp>
+#include <fastdds/publisher/PublisherImpl.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/builtin/liveliness/WLP.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
 #include <fastdds/rtps/resources/TimedEvent.h>
+#include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
-
-#include <fastdds/publisher/PublisherImpl.hpp>
-#include <fastrtps/attributes/TopicAttributes.h>
 #include <fastrtps/utils/TimeConversion.h>
 
-#include <fastdds/core/condition/StatusConditionImpl.hpp>
-#include <fastdds/core/policy/ParameterSerializer.hpp>
-#include <fastdds/core/policy/QosPolicyUtils.hpp>
-
-#include <fastdds/domain/DomainParticipantImpl.hpp>
-#include <fastdds/publisher/filtering/DataWriterFilteredChangePool.hpp>
-
 #include <rtps/DataSharing/DataSharingPayloadPool.hpp>
 #include <rtps/history/CacheChangePool.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
diff --git a/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChange.hpp b/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChange.hpp
index 31dc4edad18..4207e652876 100644
--- a/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChange.hpp
+++ b/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChange.hpp
@@ -21,8 +21,8 @@
 
 #include <fastdds/rtps/common/CacheChange.h>
 
-#include <fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChangePool.hpp b/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChangePool.hpp
index c0d4b07f752..4da89ef4991 100644
--- a/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChangePool.hpp
+++ b/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChangePool.hpp
@@ -19,7 +19,7 @@
 #ifndef _FASTDDS_PUBLISHER_FILTERING_DATAWRITERCHANGEPOOL_HPP_
 #define _FASTDDS_PUBLISHER_FILTERING_DATAWRITERCHANGEPOOL_HPP_
 
-#include <fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp>
+#include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
 
 #include <fastdds/publisher/filtering/DataWriterFilteredChange.hpp>
 #include <rtps/history/CacheChangePool.h>
diff --git a/src/cpp/fastdds/publisher/filtering/ReaderFilterCollection.hpp b/src/cpp/fastdds/publisher/filtering/ReaderFilterCollection.hpp
index a1c6684f42b..ada6a5df211 100644
--- a/src/cpp/fastdds/publisher/filtering/ReaderFilterCollection.hpp
+++ b/src/cpp/fastdds/publisher/filtering/ReaderFilterCollection.hpp
@@ -28,7 +28,7 @@
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
 #include <fastdds/rtps/common/Guid.h>
 
-#include <fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp>
+#include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
 
 #include <foonathan/memory/container.hpp>
 #include <foonathan/memory/memory_pool.hpp>
diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl.hpp
index 73849e61f8e..069850de363 100644
--- a/src/cpp/fastdds/subscriber/DataReaderImpl.hpp
+++ b/src/cpp/fastdds/subscriber/DataReaderImpl.hpp
@@ -33,11 +33,11 @@
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/history/IPayloadPool.h>
 #include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastrtps/attributes/TopicAttributes.h>
 #include <fastrtps/types/TypesBase.h>
 
 #include <fastdds/subscriber/DataReaderImpl/DataReaderLoanManager.hpp>
diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl/DataReaderLoanManager.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl/DataReaderLoanManager.hpp
index b563e94bbf0..8c93847ce19 100644
--- a/src/cpp/fastdds/subscriber/DataReaderImpl/DataReaderLoanManager.hpp
+++ b/src/cpp/fastdds/subscriber/DataReaderImpl/DataReaderLoanManager.hpp
@@ -28,8 +28,8 @@
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 
 #include <fastrtps/types/TypesBase.h>
-#include <fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleInfoPool.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleInfoPool.hpp
index dc5242f9c36..286d0089a21 100644
--- a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleInfoPool.hpp
+++ b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleInfoPool.hpp
@@ -28,8 +28,8 @@
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 
 #include <fastrtps/types/TypesBase.h>
-#include <fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp
index fc3d7aeeb32..b2e86db5e30 100644
--- a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp
+++ b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp
@@ -30,8 +30,8 @@
 #include <fastdds/rtps/history/IPayloadPool.h>
 
 #include <fastrtps/types/TypesBase.h>
-#include <fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 #include <rtps/history/PoolConfig.h>
 
diff --git a/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp b/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp
index 93da2acff47..71358ed80d9 100644
--- a/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp
+++ b/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp
@@ -44,7 +44,7 @@
 
 #include <fastdds/subscriber/DataReaderImpl/StateFilter.hpp>
 
-#include <fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp>
+#include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
 
 #include "DataReaderHistoryCounters.hpp"
 #include "DataReaderInstance.hpp"
diff --git a/src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp b/src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp
index 690af13f283..9979a21bf2c 100644
--- a/src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp
+++ b/src/cpp/fastdds/subscriber/history/DataReaderInstance.hpp
@@ -25,7 +25,7 @@
 #include <fastdds/dds/subscriber/InstanceState.hpp>
 #include <fastdds/dds/subscriber/ViewState.hpp>
 
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 #include "DataReaderCacheChange.hpp"
 #include "DataReaderHistoryCounters.hpp"
diff --git a/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp b/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp
index d8658019b84..669bbd26d28 100644
--- a/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp
+++ b/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp
@@ -28,9 +28,9 @@
 #include <fastdds/subscriber/DataReaderImpl.hpp>
 #include <fastdds/topic/ContentFilterUtils.hpp>
 #include <fastdds/topic/TopicProxy.hpp>
-
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypesBase.h>
-#include <fastrtps/utils/md5.h>
+
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/fastdds/topic/TopicDataType.cpp b/src/cpp/fastdds/topic/TopicDataType.cpp
index 46fd15b1344..3bfaf571950 100644
--- a/src/cpp/fastdds/topic/TopicDataType.cpp
+++ b/src/cpp/fastdds/topic/TopicDataType.cpp
@@ -20,12 +20,12 @@
 #include <memory>
 #include <string>
 
-#include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastdds/rtps/common/SerializedPayload.h>
 #include <fastdds/dds/topic/TopicDataType.hpp>
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/rtps/common/CdrSerialization.hpp>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/fastdds/utils/QosConverters.hpp b/src/cpp/fastdds/utils/QosConverters.hpp
index 7b89defa50a..b6b2526d33c 100644
--- a/src/cpp/fastdds/utils/QosConverters.hpp
+++ b/src/cpp/fastdds/utils/QosConverters.hpp
@@ -24,9 +24,9 @@
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastrtps/attributes/PublisherAttributes.h>
 #include <fastrtps/attributes/SubscriberAttributes.h>
-#include <fastrtps/attributes/TopicAttributes.h>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/DataSharing/DataSharingListener.hpp b/src/cpp/rtps/DataSharing/DataSharingListener.hpp
index 392764b3a48..1333e97dc61 100644
--- a/src/cpp/rtps/DataSharing/DataSharingListener.hpp
+++ b/src/cpp/rtps/DataSharing/DataSharingListener.hpp
@@ -25,7 +25,7 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 #include <rtps/DataSharing/IDataSharingListener.hpp>
 #include <rtps/DataSharing/DataSharingNotification.hpp>
diff --git a/src/cpp/rtps/DataSharing/IDataSharingListener.hpp b/src/cpp/rtps/DataSharing/IDataSharingListener.hpp
index 5d1a2f5da67..b99e5d0a892 100644
--- a/src/cpp/rtps/DataSharing/IDataSharingListener.hpp
+++ b/src/cpp/rtps/DataSharing/IDataSharingListener.hpp
@@ -22,7 +22,7 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <rtps/DataSharing/DataSharingNotification.hpp>
 #include <rtps/DataSharing/ReaderPool.hpp>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 #include <memory>
 #include <atomic>
diff --git a/src/cpp/rtps/RTPSDomain.cpp b/src/cpp/rtps/RTPSDomain.cpp
index 23f04a93634..8d497be6ac0 100644
--- a/src/cpp/rtps/RTPSDomain.cpp
+++ b/src/cpp/rtps/RTPSDomain.cpp
@@ -32,9 +32,9 @@
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastrtps/utils/IPFinder.h>
-#include <fastrtps/utils/IPLocator.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/IPFinder.h>
+#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/md5.h>
 
 #include <rtps/common/GuidUtils.hpp>
 #include <rtps/network/utils/external_locators.hpp>
diff --git a/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp b/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
index e0713b61e61..85dfde5e1d9 100644
--- a/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
+++ b/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
@@ -26,7 +26,7 @@
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include <rtps/transport/shared_mem/SHMLocator.hpp>
 #include <xmlparser/XMLProfileManager.h>
diff --git a/src/cpp/rtps/attributes/TopicAttributes.cpp b/src/cpp/rtps/attributes/TopicAttributes.cpp
index 2ca7d7daba3..0e7ba4bab34 100644
--- a/src/cpp/rtps/attributes/TopicAttributes.cpp
+++ b/src/cpp/rtps/attributes/TopicAttributes.cpp
@@ -16,7 +16,7 @@
  * @file TopicAttributes.cpp
  */
 
-#include <fastrtps/attributes/TopicAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/dds/log/Log.hpp>
 
 using namespace eprosima::fastrtps;
diff --git a/src/cpp/rtps/builtin/BuiltinProtocols.cpp b/src/cpp/rtps/builtin/BuiltinProtocols.cpp
index fa8ba368703..2fb15c741a8 100644
--- a/src/cpp/rtps/builtin/BuiltinProtocols.cpp
+++ b/src/cpp/rtps/builtin/BuiltinProtocols.cpp
@@ -18,28 +18,23 @@
  */
 
 #include <fastdds/rtps/builtin/BuiltinProtocols.h>
-#include <fastdds/rtps/common/Locator.h>
 
+#include <algorithm>
+
+#include <fastdds/dds/builtin/typelookup/TypeLookupManager.hpp>
+#include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/discovery/participant/PDPSimple.h>
 #include <fastdds/rtps/builtin/discovery/endpoint/EDP.h>
 #include <fastdds/rtps/builtin/discovery/endpoint/EDPStatic.h>
-
-#include <rtps/builtin/discovery/participant/PDPServer.hpp>
-#include <rtps/builtin/discovery/participant/PDPClient.h>
-
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
-
 #include <fastdds/rtps/builtin/liveliness/WLP.h>
+#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/utils/IPFinder.h>
 
-#include <fastdds/dds/builtin/typelookup/TypeLookupManager.hpp>
-
+#include <rtps/builtin/discovery/participant/PDPServer.hpp>
+#include <rtps/builtin/discovery/participant/PDPClient.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 
-#include <fastdds/dds/log/Log.hpp>
-#include <fastrtps/utils/IPFinder.h>
-
-#include <algorithm>
-
 using namespace eprosima::fastrtps;
 
 namespace eprosima {
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
index bd1ce6ddec2..16303ce9e1c 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
@@ -19,26 +19,19 @@
 
 #include <fastdds/rtps/builtin/discovery/endpoint/EDP.h>
 
+#include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
-
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.h>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
-
 #include <fastdds/rtps/builtin/discovery/participant/PDP.h>
-
 #include <fastdds/rtps/reader/ReaderListener.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/rtps/writer/WriterListener.h>
-
-#include <fastrtps/attributes/TopicAttributes.h>
-
-#include <fastrtps/utils/StringMatching.h>
-
 #include <fastrtps/types/TypeObjectFactory.h>
-
-#include <fastdds/core/policy/ParameterList.hpp>
+#include <fastrtps/utils/StringMatching.h>
 
 #include <foonathan/memory/container.hpp>
 #include <foonathan/memory/memory_pool.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp b/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp
index f2f5dcaaf13..40ea83b5cac 100644
--- a/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp
@@ -19,8 +19,10 @@
 
 #include <rtps/builtin/discovery/participant/DirectMessageSender.hpp>
 
-#include <fastrtps/utils/IPLocator.h>
+
 #include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/utils/IPLocator.h>
+
 #include <rtps/participant/RTPSParticipantImpl.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
index 639e6d9b4b2..30c26333ead 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -17,48 +17,35 @@
  *
  */
 
+#include <fastdds/dds/builtin/typelookup/TypeLookupManager.hpp>
+#include <fastdds/dds/domain/DomainParticipantFactory.hpp>
+#include <fastdds/dds/domain/DomainParticipant.hpp>
+#include <fastdds/dds/log/Log.hpp>
+#include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/rtps/builtin/discovery/participant/PDP.h>
 #include <fastdds/rtps/builtin/discovery/participant/PDPListener.h>
-
 #include <fastdds/rtps/builtin/BuiltinProtocols.h>
 #include <fastdds/rtps/builtin/liveliness/WLP.h>
-
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
-#include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.h>
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
-
 #include <fastdds/rtps/builtin/discovery/endpoint/EDPSimple.h>
 #include <fastdds/rtps/builtin/discovery/endpoint/EDPStatic.h>
-
-#include <rtps/participant/RTPSParticipantImpl.h>
-
-#include <fastdds/rtps/writer/StatelessWriter.h>
-#include <fastdds/rtps/reader/StatelessReader.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
-
+#include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
-
+#include <fastdds/rtps/participant/RTPSParticipantListener.h>
+#include <fastdds/rtps/resources/TimedEvent.h>
+#include <fastdds/rtps/reader/StatelessReader.h>
+#include <fastdds/rtps/reader/StatefulReader.h>
+#include <fastdds/rtps/writer/StatelessWriter.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/types/TypeObjectFactory.h>
 #include <fastrtps/types/DynamicPubSubType.h>
-
-#include <fastdds/rtps/common/LocatorList.hpp>
-
 #include <fastrtps/utils/TimeConversion.h>
-#include <fastrtps/utils/IPLocator.h>
 #include "fastrtps/utils/shared_mutex.hpp"
 
-#include <fastdds/dds/domain/DomainParticipantFactory.hpp>
-#include <fastdds/dds/domain/DomainParticipant.hpp>
-#include <fastdds/dds/topic/TypeSupport.hpp>
-
-#include <fastdds/dds/builtin/typelookup/TypeLookupManager.hpp>
 #include <rtps/builtin/data/ProxyHashTables.hpp>
-
-#include <fastdds/dds/log/Log.hpp>
-
 #include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/network/utils/external_locators.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
index aa23b230f99..7afc236dd3c 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
@@ -22,22 +22,18 @@
 #include <mutex>
 #include <set>
 
-#include <fastrtps/utils/TimedMutex.hpp>
-
+#include <fastdds/dds/core/policy/QosPolicies.hpp>
+#include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/BuiltinProtocols.h>
 #include <fastdds/rtps/builtin/liveliness/WLP.h>
-
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
-
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/History.h>
-
+#include <fastdds/utils/TimedMutex.hpp>
 #include <fastrtps/utils/TimeConversion.h>
-#include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/dds/log/Log.hpp>
 
 #include <rtps/builtin/discovery/endpoint/EDPServer.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPServerListeners.hpp>
@@ -49,9 +45,7 @@
 #include <rtps/builtin/discovery/participant/DS/FakeWriter.hpp>
 #include <rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp>
 #include <rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp>
-
 #include <rtps/participant/RTPSParticipantImpl.h>
-
 #include <rtps/builtin/discovery/database/backup/SharedBackupFunctions.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
index 99b749e0c69..83d70b4d4c9 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -38,7 +38,7 @@
 #include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/writer/StatelessWriter.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/utils/TimeConversion.h>
 
 #include <rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp>
diff --git a/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp b/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp
index 70a906db2e1..c245866a73d 100644
--- a/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp
+++ b/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp
@@ -11,8 +11,8 @@
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastrtps/utils/TimedConditionVariable.hpp>
-#include <fastrtps/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedConditionVariable.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
 
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <utils/thread.hpp>
diff --git a/src/cpp/rtps/history/HistoryAttributesExtension.hpp b/src/cpp/rtps/history/HistoryAttributesExtension.hpp
index 60480054172..455473a1746 100644
--- a/src/cpp/rtps/history/HistoryAttributesExtension.hpp
+++ b/src/cpp/rtps/history/HistoryAttributesExtension.hpp
@@ -23,7 +23,7 @@
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastrtps/utils/collections/ResourceLimitedContainerConfig.hpp>
+#include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/messages/SendBuffersManager.hpp b/src/cpp/rtps/messages/SendBuffersManager.hpp
index fccc584a0a8..bb6a1ecf828 100644
--- a/src/cpp/rtps/messages/SendBuffersManager.hpp
+++ b/src/cpp/rtps/messages/SendBuffersManager.hpp
@@ -22,8 +22,8 @@
 
 #include "RTPSMessageGroup_t.hpp"
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
-#include <fastrtps/utils/TimedMutex.hpp>
-#include <fastrtps/utils/TimedConditionVariable.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedConditionVariable.hpp>
 
 #include <vector>              // std::vector
 #include <memory>              // std::unique_ptr
diff --git a/src/cpp/rtps/network/NetworkFactory.cpp b/src/cpp/rtps/network/NetworkFactory.cpp
index 9d195e6249d..e6d940b23cb 100644
--- a/src/cpp/rtps/network/NetworkFactory.cpp
+++ b/src/cpp/rtps/network/NetworkFactory.cpp
@@ -21,8 +21,8 @@
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/transport/TransportDescriptorInterface.h>
-#include <fastrtps/utils/IPFinder.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPFinder.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include <rtps/transport/TCPTransportInterface.h>
 
diff --git a/src/cpp/rtps/network/utils/external_locators.cpp b/src/cpp/rtps/network/utils/external_locators.cpp
index bee1ac324a6..5d4045e1b32 100644
--- a/src/cpp/rtps/network/utils/external_locators.cpp
+++ b/src/cpp/rtps/network/utils/external_locators.cpp
@@ -28,7 +28,7 @@
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 #include <fastdds/rtps/common/LocatorWithMask.hpp>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <utils/SystemInfo.hpp>
 
 #include <rtps/network/utils/external_locators.hpp>
diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
index 1573e12150b..ef7b10458b5 100644
--- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
+++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -54,7 +54,7 @@
 #include <fastdds/rtps/writer/StatefulWriter.h>
 #include <fastdds/rtps/writer/StatelessPersistentWriter.h>
 #include <fastdds/rtps/writer/StatefulPersistentWriter.h>
-#include <fastrtps/utils/IPFinder.h>
+#include <fastdds/utils/IPFinder.h>
 #include <fastrtps/utils/Semaphore.h>
 #include <fastrtps/utils/UnitsParser.hpp>
 
diff --git a/src/cpp/rtps/reader/WriterProxy.h b/src/cpp/rtps/reader/WriterProxy.h
index b9e1df14a52..d8cf1eb6021 100644
--- a/src/cpp/rtps/reader/WriterProxy.h
+++ b/src/cpp/rtps/reader/WriterProxy.h
@@ -26,7 +26,7 @@
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
 #include <fastdds/rtps/messages/RTPSMessageSenderInterface.hpp>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 
diff --git a/src/cpp/rtps/transport/TCPAcceptor.cpp b/src/cpp/rtps/transport/TCPAcceptor.cpp
index 2a78ed6c08a..65f35a2441d 100644
--- a/src/cpp/rtps/transport/TCPAcceptor.cpp
+++ b/src/cpp/rtps/transport/TCPAcceptor.cpp
@@ -14,7 +14,7 @@
 
 #include <rtps/transport/TCPAcceptor.h>
 
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <rtps/transport/TCPTransportInterface.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/transport/TCPAcceptorBasic.cpp b/src/cpp/rtps/transport/TCPAcceptorBasic.cpp
index 493ea43fe46..1ea675c60da 100644
--- a/src/cpp/rtps/transport/TCPAcceptorBasic.cpp
+++ b/src/cpp/rtps/transport/TCPAcceptorBasic.cpp
@@ -14,7 +14,7 @@
 
 #include <rtps/transport/TCPAcceptorBasic.h>
 
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <rtps/transport/TCPTransportInterface.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/transport/TCPAcceptorSecure.cpp b/src/cpp/rtps/transport/TCPAcceptorSecure.cpp
index 24ca80dad99..8935092cdb5 100644
--- a/src/cpp/rtps/transport/TCPAcceptorSecure.cpp
+++ b/src/cpp/rtps/transport/TCPAcceptorSecure.cpp
@@ -14,7 +14,7 @@
 
 #include <rtps/transport/TCPAcceptorSecure.h>
 
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <rtps/transport/TCPTransportInterface.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/transport/TCPChannelResource.cpp b/src/cpp/rtps/transport/TCPChannelResource.cpp
index 63d3407b27b..68fe9c48589 100644
--- a/src/cpp/rtps/transport/TCPChannelResource.cpp
+++ b/src/cpp/rtps/transport/TCPChannelResource.cpp
@@ -17,7 +17,7 @@
 #include <chrono>
 #include <thread>
 
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <rtps/transport/TCPTransportInterface.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/transport/TCPChannelResourceBasic.cpp b/src/cpp/rtps/transport/TCPChannelResourceBasic.cpp
index dd05985178a..2efc8873e82 100644
--- a/src/cpp/rtps/transport/TCPChannelResourceBasic.cpp
+++ b/src/cpp/rtps/transport/TCPChannelResourceBasic.cpp
@@ -18,7 +18,7 @@
 #include <array>
 
 #include <asio.hpp>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <rtps/transport/TCPTransportInterface.h>
 
 using namespace asio;
diff --git a/src/cpp/rtps/transport/TCPChannelResourceSecure.cpp b/src/cpp/rtps/transport/TCPChannelResourceSecure.cpp
index 6dfa3fe4dae..79e2391a732 100644
--- a/src/cpp/rtps/transport/TCPChannelResourceSecure.cpp
+++ b/src/cpp/rtps/transport/TCPChannelResourceSecure.cpp
@@ -18,7 +18,7 @@
 #include <future>
 #include <thread>
 
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <rtps/transport/TCPTransportInterface.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp
index 443fb726f7c..1ec5614f906 100644
--- a/src/cpp/rtps/transport/TCPTransportInterface.cpp
+++ b/src/cpp/rtps/transport/TCPTransportInterface.cpp
@@ -50,7 +50,7 @@
 #include <fastdds/rtps/transport/SocketTransportDescriptor.h>
 #include <fastdds/rtps/transport/TCPTransportDescriptor.h>
 #include <fastdds/rtps/transport/TransportReceiverInterface.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include <statistics/rtps/messages/RTPSStatisticsMessages.hpp>
 #include <utils/SystemInfo.hpp>
diff --git a/src/cpp/rtps/transport/TCPTransportInterface.h b/src/cpp/rtps/transport/TCPTransportInterface.h
index 8dc8aef59c2..6413a757826 100644
--- a/src/cpp/rtps/transport/TCPTransportInterface.h
+++ b/src/cpp/rtps/transport/TCPTransportInterface.h
@@ -28,7 +28,7 @@
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
 #include <fastdds/rtps/transport/TCPTransportDescriptor.h>
 #include <fastdds/rtps/transport/TransportInterface.h>
-#include <fastrtps/utils/IPFinder.h>
+#include <fastdds/utils/IPFinder.h>
 
 #include <rtps/transport/tcp/RTCPHeader.h>
 #include <rtps/transport/TCPAcceptorBasic.h>
diff --git a/src/cpp/rtps/transport/TCPv4Transport.cpp b/src/cpp/rtps/transport/TCPv4Transport.cpp
index 9004614d420..ba05316402a 100644
--- a/src/cpp/rtps/transport/TCPv4Transport.cpp
+++ b/src/cpp/rtps/transport/TCPv4Transport.cpp
@@ -21,7 +21,8 @@
 #include <asio.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
+
 #include <rtps/network/utils/netmask_filter.hpp>
 #include <utils/SystemInfo.hpp>
 
diff --git a/src/cpp/rtps/transport/TCPv4Transport.h b/src/cpp/rtps/transport/TCPv4Transport.h
index 86c41004be9..2368a4527d2 100644
--- a/src/cpp/rtps/transport/TCPv4Transport.h
+++ b/src/cpp/rtps/transport/TCPv4Transport.h
@@ -21,7 +21,7 @@
 
 #include <asio.hpp>
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastrtps/utils/IPFinder.h>
+#include <fastdds/utils/IPFinder.h>
 #include <rtps/transport/TCPTransportInterface.h>
 #include <rtps/transport/tcp/RTCPHeader.h>
 
diff --git a/src/cpp/rtps/transport/TCPv6Transport.cpp b/src/cpp/rtps/transport/TCPv6Transport.cpp
index fffa23e3866..067d37d9309 100644
--- a/src/cpp/rtps/transport/TCPv6Transport.cpp
+++ b/src/cpp/rtps/transport/TCPv6Transport.cpp
@@ -21,7 +21,8 @@
 #include <asio.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
+
 #include <rtps/network/utils/netmask_filter.hpp>
 #include <utils/SystemInfo.hpp>
 
diff --git a/src/cpp/rtps/transport/TCPv6Transport.h b/src/cpp/rtps/transport/TCPv6Transport.h
index e54de0e956f..27a878bd37a 100644
--- a/src/cpp/rtps/transport/TCPv6Transport.h
+++ b/src/cpp/rtps/transport/TCPv6Transport.h
@@ -22,7 +22,7 @@
 #include <asio.hpp>
 
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastrtps/utils/IPFinder.h>
+#include <fastdds/utils/IPFinder.h>
 #include <rtps/transport/TCPTransportInterface.h>
 #include <rtps/transport/tcp/RTCPHeader.h>
 
diff --git a/src/cpp/rtps/transport/UDPTransportInterface.cpp b/src/cpp/rtps/transport/UDPTransportInterface.cpp
index 120af98babf..fa924ee0469 100644
--- a/src/cpp/rtps/transport/UDPTransportInterface.cpp
+++ b/src/cpp/rtps/transport/UDPTransportInterface.cpp
@@ -22,7 +22,7 @@
 #include <fastdds/rtps/transport/TransportInterface.h>
 #include <fastdds/rtps/messages/CDRMessage.h>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <rtps/transport/UDPSenderResource.hpp>
 #include <statistics/rtps/messages/RTPSStatisticsMessages.hpp>
 
diff --git a/src/cpp/rtps/transport/UDPTransportInterface.h b/src/cpp/rtps/transport/UDPTransportInterface.h
index 99770fcd99f..0f69318e74e 100644
--- a/src/cpp/rtps/transport/UDPTransportInterface.h
+++ b/src/cpp/rtps/transport/UDPTransportInterface.h
@@ -27,7 +27,7 @@
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
 #include <fastdds/rtps/transport/TransportInterface.h>
 #include <fastdds/rtps/transport/UDPTransportDescriptor.h>
-#include <fastrtps/utils/IPFinder.h>
+#include <fastdds/utils/IPFinder.h>
 
 #include <rtps/transport/UDPChannelResource.h>
 #include <statistics/rtps/messages/OutputTrafficManager.hpp>
diff --git a/src/cpp/rtps/transport/UDPv4Transport.cpp b/src/cpp/rtps/transport/UDPv4Transport.cpp
index 271cf817c5f..72052df5959 100644
--- a/src/cpp/rtps/transport/UDPv4Transport.cpp
+++ b/src/cpp/rtps/transport/UDPv4Transport.cpp
@@ -23,7 +23,7 @@
 #include <fastdds/rtps/messages/MessageReceiver.h>
 #include <fastdds/rtps/transport/SenderResource.h>
 #include <fastdds/rtps/transport/TransportInterface.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include <rtps/network/ReceiverResource.h>
 #include <rtps/network/utils/netmask_filter.hpp>
diff --git a/src/cpp/rtps/transport/UDPv6Transport.cpp b/src/cpp/rtps/transport/UDPv6Transport.cpp
index 0f56dc69ff5..6ddb8234c2e 100644
--- a/src/cpp/rtps/transport/UDPv6Transport.cpp
+++ b/src/cpp/rtps/transport/UDPv6Transport.cpp
@@ -22,7 +22,8 @@
 #include <fastdds/rtps/messages/MessageReceiver.h>
 #include <fastdds/rtps/transport/SenderResource.h>
 #include <fastdds/rtps/transport/TransportInterface.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
+
 #include <rtps/network/utils/netmask_filter.hpp>
 #include <utils/SystemInfo.hpp>
 
diff --git a/src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp b/src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp
index adff93aa7d6..ee3e01a9b0b 100644
--- a/src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp
+++ b/src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp
@@ -24,7 +24,7 @@
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <rtps/transport/tcp/RTCPHeader.h>
 #include <rtps/transport/TCPChannelResource.h>
 #include <rtps/transport/TCPTransportInterface.h>
diff --git a/src/cpp/rtps/transport/test_UDPv4Transport.cpp b/src/cpp/rtps/transport/test_UDPv4Transport.cpp
index 3fbad4a6a6c..2b25aa5dd9b 100644
--- a/src/cpp/rtps/transport/test_UDPv4Transport.cpp
+++ b/src/cpp/rtps/transport/test_UDPv4Transport.cpp
@@ -18,7 +18,7 @@
 #include <functional>
 
 #include <asio.hpp>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 using namespace std;
 
diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h
index c5b04255efd..ca95cdfdbf9 100644
--- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h
+++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "monitorservice_types.h"
 
@@ -38,560 +38,557 @@
     Generated monitorservice_types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
 #endif  // GEN_API_VER
 
-namespace eprosima
-{
-    namespace fastdds
-    {
-        namespace statistics
-        {
+namespace eprosima {
+namespace fastdds {
+namespace statistics {
 
 
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type Connection defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class ConnectionPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type Connection defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class ConnectionPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef Connection type;
+    typedef Connection type;
 
-                eProsima_user_DllExport ConnectionPubSubType();
+    eProsima_user_DllExport ConnectionPubSubType();
 
-                eProsima_user_DllExport ~ConnectionPubSubType() override;
+    eProsima_user_DllExport ~ConnectionPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type QosPolicyCount_s defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class QosPolicyCount_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type QosPolicyCount_s defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class QosPolicyCount_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef QosPolicyCount_s type;
+    typedef QosPolicyCount_s type;
 
-                eProsima_user_DllExport QosPolicyCount_sPubSubType();
+    eProsima_user_DllExport QosPolicyCount_sPubSubType();
 
-                eProsima_user_DllExport ~QosPolicyCount_sPubSubType() override;
+    eProsima_user_DllExport ~QosPolicyCount_sPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type BaseStatus_s defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class BaseStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type BaseStatus_s defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class BaseStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef BaseStatus_s type;
+    typedef BaseStatus_s type;
 
-                eProsima_user_DllExport BaseStatus_sPubSubType();
+    eProsima_user_DllExport BaseStatus_sPubSubType();
 
-                eProsima_user_DllExport ~BaseStatus_sPubSubType() override;
+    eProsima_user_DllExport ~BaseStatus_sPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
-            typedef std::vector<eprosima::fastdds::statistics::QosPolicyCount_s> QosPolicyCountSeq_s;
+typedef std::vector<eprosima::fastdds::statistics::QosPolicyCount_s> QosPolicyCountSeq_s;
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type IncompatibleQoSStatus_s defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class IncompatibleQoSStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type IncompatibleQoSStatus_s defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class IncompatibleQoSStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef IncompatibleQoSStatus_s type;
+    typedef IncompatibleQoSStatus_s type;
 
-                eProsima_user_DllExport IncompatibleQoSStatus_sPubSubType();
+    eProsima_user_DllExport IncompatibleQoSStatus_sPubSubType();
 
-                eProsima_user_DllExport ~IncompatibleQoSStatus_sPubSubType() override;
+    eProsima_user_DllExport ~IncompatibleQoSStatus_sPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type LivelinessChangedStatus_s defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class LivelinessChangedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type LivelinessChangedStatus_s defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class LivelinessChangedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef LivelinessChangedStatus_s type;
+    typedef LivelinessChangedStatus_s type;
 
-                eProsima_user_DllExport LivelinessChangedStatus_sPubSubType();
+    eProsima_user_DllExport LivelinessChangedStatus_sPubSubType();
 
-                eProsima_user_DllExport ~LivelinessChangedStatus_sPubSubType() override;
+    eProsima_user_DllExport ~LivelinessChangedStatus_sPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type DeadlineMissedStatus_s defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class DeadlineMissedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type DeadlineMissedStatus_s defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class DeadlineMissedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef DeadlineMissedStatus_s type;
+    typedef DeadlineMissedStatus_s type;
 
-                eProsima_user_DllExport DeadlineMissedStatus_sPubSubType();
+    eProsima_user_DllExport DeadlineMissedStatus_sPubSubType();
 
-                eProsima_user_DllExport ~DeadlineMissedStatus_sPubSubType() override;
+    eProsima_user_DllExport ~DeadlineMissedStatus_sPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
-            typedef eprosima::fastdds::statistics::BaseStatus_s LivelinessLostStatus_s;
-            typedef eprosima::fastdds::statistics::BaseStatus_s InconsistentTopicStatus_s;
-            typedef eprosima::fastdds::statistics::BaseStatus_s SampleLostStatus_s;
+};
+typedef eprosima::fastdds::statistics::BaseStatus_s LivelinessLostStatus_s;
+typedef eprosima::fastdds::statistics::BaseStatus_s InconsistentTopicStatus_s;
+typedef eprosima::fastdds::statistics::BaseStatus_s SampleLostStatus_s;
 
 
 
@@ -600,96 +597,96 @@ namespace eprosima
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type MonitorServiceStatusData defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class MonitorServiceStatusDataPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type MonitorServiceStatusData defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class MonitorServiceStatusDataPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef MonitorServiceStatusData type;
+    typedef MonitorServiceStatusData type;
 
-                eProsima_user_DllExport MonitorServiceStatusDataPubSubType();
+    eProsima_user_DllExport MonitorServiceStatusDataPubSubType();
 
-                eProsima_user_DllExport ~MonitorServiceStatusDataPubSubType() override;
+    eProsima_user_DllExport ~MonitorServiceStatusDataPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
-        }
-    }
-}
+};
+} // namespace statistics
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_H_
 
diff --git a/src/cpp/statistics/types/monitorservice_typesv1.h b/src/cpp/statistics/types/monitorservice_typesv1.h
index f8a0c6decbb..8dcaa428b62 100644
--- a/src/cpp/statistics/types/monitorservice_typesv1.h
+++ b/src/cpp/statistics/types/monitorservice_typesv1.h
@@ -71,1679 +71,1687 @@ class Cdr;
 
 
 namespace eprosima {
-namespace fastdds {
-namespace statistics {
-/*!
- * @brief This class represents the enumeration ConnectionMode defined by the user in the IDL file.
- * @ingroup monitorservice_types
- */
-enum ConnectionMode : uint32_t
-{
-    DATA_SHARING,
-    INTRAPROCESS,
-    TRANSPORT
-};
-
-
-
-
-/*!
- * @brief This class represents the structure Connection defined by the user in the IDL file.
- * @ingroup monitorservice_types
- */
-class Connection
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport Connection();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~Connection();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Connection that will be copied.
-     */
-    eProsima_user_DllExport Connection(
-            const Connection& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Connection that will be copied.
-     */
-    eProsima_user_DllExport Connection(
-            Connection&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Connection that will be copied.
-     */
-    eProsima_user_DllExport Connection& operator =(
-            const Connection& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Connection that will be copied.
-     */
-    eProsima_user_DllExport Connection& operator =(
-            Connection&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Connection object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const Connection& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Connection object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const Connection& x) const;
-
-    /*!
-     * @brief This function sets a value in member mode
-     * @param _mode New value for member mode
-     */
-    eProsima_user_DllExport void mode(
-            eprosima::fastdds::statistics::ConnectionMode _mode);
-
-    /*!
-     * @brief This function returns the value of member mode
-     * @return Value of member mode
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::ConnectionMode mode() const;
-
-    /*!
-     * @brief This function returns a reference to member mode
-     * @return Reference to member mode
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::ConnectionMode& mode();
-
-
-    /*!
-     * @brief This function copies the value in member guid
-     * @param _guid New value to be copied in member guid
-     */
-    eProsima_user_DllExport void guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _guid);
-
-    /*!
-     * @brief This function moves the value in member guid
-     * @param _guid New value to be moved in member guid
-     */
-    eProsima_user_DllExport void guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _guid);
-
-    /*!
-     * @brief This function returns a constant reference to member guid
-     * @return Constant reference to member guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& guid() const;
-
-    /*!
-     * @brief This function returns a reference to member guid
-     * @return Reference to member guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& guid();
-
-
-    /*!
-     * @brief This function copies the value in member announced_locators
-     * @param _announced_locators New value to be copied in member announced_locators
-     */
-    eProsima_user_DllExport void announced_locators(
-            const std::vector<eprosima::fastdds::statistics::detail::Locator_s>& _announced_locators);
-
-    /*!
-     * @brief This function moves the value in member announced_locators
-     * @param _announced_locators New value to be moved in member announced_locators
-     */
-    eProsima_user_DllExport void announced_locators(
-            std::vector<eprosima::fastdds::statistics::detail::Locator_s>&& _announced_locators);
-
-    /*!
-     * @brief This function returns a constant reference to member announced_locators
-     * @return Constant reference to member announced_locators
-     */
-    eProsima_user_DllExport const std::vector<eprosima::fastdds::statistics::detail::Locator_s>& announced_locators()
-    const;
-
-    /*!
-     * @brief This function returns a reference to member announced_locators
-     * @return Reference to member announced_locators
-     */
-    eProsima_user_DllExport std::vector<eprosima::fastdds::statistics::detail::Locator_s>& announced_locators();
-
-
-    /*!
-     * @brief This function copies the value in member used_locators
-     * @param _used_locators New value to be copied in member used_locators
-     */
-    eProsima_user_DllExport void used_locators(
-            const std::vector<eprosima::fastdds::statistics::detail::Locator_s>& _used_locators);
-
-    /*!
-     * @brief This function moves the value in member used_locators
-     * @param _used_locators New value to be moved in member used_locators
-     */
-    eProsima_user_DllExport void used_locators(
-            std::vector<eprosima::fastdds::statistics::detail::Locator_s>&& _used_locators);
-
-    /*!
-     * @brief This function returns a constant reference to member used_locators
-     * @return Constant reference to member used_locators
-     */
-    eProsima_user_DllExport const std::vector<eprosima::fastdds::statistics::detail::Locator_s>& used_locators() const;
-
-    /*!
-     * @brief This function returns a reference to member used_locators
-     * @return Reference to member used_locators
-     */
-    eProsima_user_DllExport std::vector<eprosima::fastdds::statistics::detail::Locator_s>& used_locators();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::Connection& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::ConnectionMode m_mode;
-    eprosima::fastdds::statistics::detail::GUID_s m_guid;
-    std::vector<eprosima::fastdds::statistics::detail::Locator_s> m_announced_locators;
-    std::vector<eprosima::fastdds::statistics::detail::Locator_s> m_used_locators;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure QosPolicyCount_s defined by the user in the IDL file.
- * @ingroup monitorservice_types
- */
-class QosPolicyCount_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport QosPolicyCount_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~QosPolicyCount_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::QosPolicyCount_s that will be copied.
-     */
-    eProsima_user_DllExport QosPolicyCount_s(
-            const QosPolicyCount_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::QosPolicyCount_s that will be copied.
-     */
-    eProsima_user_DllExport QosPolicyCount_s(
-            QosPolicyCount_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::QosPolicyCount_s that will be copied.
-     */
-    eProsima_user_DllExport QosPolicyCount_s& operator =(
-            const QosPolicyCount_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::QosPolicyCount_s that will be copied.
-     */
-    eProsima_user_DllExport QosPolicyCount_s& operator =(
-            QosPolicyCount_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::QosPolicyCount_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const QosPolicyCount_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::QosPolicyCount_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const QosPolicyCount_s& x) const;
-
-    /*!
-     * @brief This function sets a value in member policy_id
-     * @param _policy_id New value for member policy_id
-     */
-    eProsima_user_DllExport void policy_id(
-            uint32_t _policy_id);
-
-    /*!
-     * @brief This function returns the value of member policy_id
-     * @return Value of member policy_id
-     */
-    eProsima_user_DllExport uint32_t policy_id() const;
-
-    /*!
-     * @brief This function returns a reference to member policy_id
-     * @return Reference to member policy_id
-     */
-    eProsima_user_DllExport uint32_t& policy_id();
-
-
-    /*!
-     * @brief This function sets a value in member count
-     * @param _count New value for member count
-     */
-    eProsima_user_DllExport void count(
-            uint32_t _count);
-
-    /*!
-     * @brief This function returns the value of member count
-     * @return Value of member count
-     */
-    eProsima_user_DllExport uint32_t count() const;
-
-    /*!
-     * @brief This function returns a reference to member count
-     * @return Reference to member count
-     */
-    eProsima_user_DllExport uint32_t& count();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::QosPolicyCount_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    uint32_t m_policy_id;
-    uint32_t m_count;
-
-};
-
+    namespace fastdds {
+        namespace statistics {
+            /*!
+             * @brief This class represents the enumeration ConnectionMode defined by the user in the IDL file.
+             * @ingroup monitorservice_types
+             */
+            enum ConnectionMode : uint32_t
+            {
+                DATA_SHARING,
+                INTRAPROCESS,
+                TRANSPORT
+            };
+
+
+
+
+            /*!
+             * @brief This class represents the structure Connection defined by the user in the IDL file.
+             * @ingroup monitorservice_types
+             */
+            class Connection
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport Connection();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~Connection();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Connection that will be copied.
+                 */
+                eProsima_user_DllExport Connection(
+                        const Connection& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Connection that will be copied.
+                 */
+                eProsima_user_DllExport Connection(
+                        Connection&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Connection that will be copied.
+                 */
+                eProsima_user_DllExport Connection& operator =(
+                        const Connection& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Connection that will be copied.
+                 */
+                eProsima_user_DllExport Connection& operator =(
+                        Connection&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Connection object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const Connection& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Connection object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const Connection& x) const;
+
+                /*!
+                 * @brief This function sets a value in member mode
+                 * @param _mode New value for member mode
+                 */
+                eProsima_user_DllExport void mode(
+                        eprosima::fastdds::statistics::ConnectionMode _mode);
+
+                /*!
+                 * @brief This function returns the value of member mode
+                 * @return Value of member mode
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::ConnectionMode mode() const;
+
+                /*!
+                 * @brief This function returns a reference to member mode
+                 * @return Reference to member mode
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::ConnectionMode& mode();
+
+
+                /*!
+                 * @brief This function copies the value in member guid
+                 * @param _guid New value to be copied in member guid
+                 */
+                eProsima_user_DllExport void guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _guid);
+
+                /*!
+                 * @brief This function moves the value in member guid
+                 * @param _guid New value to be moved in member guid
+                 */
+                eProsima_user_DllExport void guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member guid
+                 * @return Constant reference to member guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member guid
+                 * @return Reference to member guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& guid();
+
+
+                /*!
+                 * @brief This function copies the value in member announced_locators
+                 * @param _announced_locators New value to be copied in member announced_locators
+                 */
+                eProsima_user_DllExport void announced_locators(
+                        const std::vector<eprosima::fastdds::statistics::detail::Locator_s>& _announced_locators);
+
+                /*!
+                 * @brief This function moves the value in member announced_locators
+                 * @param _announced_locators New value to be moved in member announced_locators
+                 */
+                eProsima_user_DllExport void announced_locators(
+                        std::vector<eprosima::fastdds::statistics::detail::Locator_s>&& _announced_locators);
+
+                /*!
+                 * @brief This function returns a constant reference to member announced_locators
+                 * @return Constant reference to member announced_locators
+                 */
+                eProsima_user_DllExport const std::vector<eprosima::fastdds::statistics::detail::Locator_s>& announced_locators()
+                 const;
+
+                /*!
+                 * @brief This function returns a reference to member announced_locators
+                 * @return Reference to member announced_locators
+                 */
+                eProsima_user_DllExport std::vector<eprosima::fastdds::statistics::detail::Locator_s>& announced_locators();
+
+
+                /*!
+                 * @brief This function copies the value in member used_locators
+                 * @param _used_locators New value to be copied in member used_locators
+                 */
+                eProsima_user_DllExport void used_locators(
+                        const std::vector<eprosima::fastdds::statistics::detail::Locator_s>& _used_locators);
+
+                /*!
+                 * @brief This function moves the value in member used_locators
+                 * @param _used_locators New value to be moved in member used_locators
+                 */
+                eProsima_user_DllExport void used_locators(
+                        std::vector<eprosima::fastdds::statistics::detail::Locator_s>&& _used_locators);
+
+                /*!
+                 * @brief This function returns a constant reference to member used_locators
+                 * @return Constant reference to member used_locators
+                 */
+                eProsima_user_DllExport const std::vector<eprosima::fastdds::statistics::detail::Locator_s>& used_locators() const;
+
+                /*!
+                 * @brief This function returns a reference to member used_locators
+                 * @return Reference to member used_locators
+                 */
+                eProsima_user_DllExport std::vector<eprosima::fastdds::statistics::detail::Locator_s>& used_locators();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::Connection& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::ConnectionMode m_mode;
+                eprosima::fastdds::statistics::detail::GUID_s m_guid;
+                std::vector<eprosima::fastdds::statistics::detail::Locator_s> m_announced_locators;
+                std::vector<eprosima::fastdds::statistics::detail::Locator_s> m_used_locators;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure QosPolicyCount_s defined by the user in the IDL file.
+             * @ingroup monitorservice_types
+             */
+            class QosPolicyCount_s
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport QosPolicyCount_s();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~QosPolicyCount_s();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::QosPolicyCount_s that will be copied.
+                 */
+                eProsima_user_DllExport QosPolicyCount_s(
+                        const QosPolicyCount_s& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::QosPolicyCount_s that will be copied.
+                 */
+                eProsima_user_DllExport QosPolicyCount_s(
+                        QosPolicyCount_s&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::QosPolicyCount_s that will be copied.
+                 */
+                eProsima_user_DllExport QosPolicyCount_s& operator =(
+                        const QosPolicyCount_s& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::QosPolicyCount_s that will be copied.
+                 */
+                eProsima_user_DllExport QosPolicyCount_s& operator =(
+                        QosPolicyCount_s&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::QosPolicyCount_s object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const QosPolicyCount_s& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::QosPolicyCount_s object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const QosPolicyCount_s& x) const;
+
+                /*!
+                 * @brief This function sets a value in member policy_id
+                 * @param _policy_id New value for member policy_id
+                 */
+                eProsima_user_DllExport void policy_id(
+                        uint32_t _policy_id);
+
+                /*!
+                 * @brief This function returns the value of member policy_id
+                 * @return Value of member policy_id
+                 */
+                eProsima_user_DllExport uint32_t policy_id() const;
+
+                /*!
+                 * @brief This function returns a reference to member policy_id
+                 * @return Reference to member policy_id
+                 */
+                eProsima_user_DllExport uint32_t& policy_id();
+
+
+                /*!
+                 * @brief This function sets a value in member count
+                 * @param _count New value for member count
+                 */
+                eProsima_user_DllExport void count(
+                        uint32_t _count);
+
+                /*!
+                 * @brief This function returns the value of member count
+                 * @return Value of member count
+                 */
+                eProsima_user_DllExport uint32_t count() const;
+
+                /*!
+                 * @brief This function returns a reference to member count
+                 * @return Reference to member count
+                 */
+                eProsima_user_DllExport uint32_t& count();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::QosPolicyCount_s& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                uint32_t m_policy_id;
+                uint32_t m_count;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure BaseStatus_s defined by the user in the IDL file.
+             * @ingroup monitorservice_types
+             */
+            class BaseStatus_s
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport BaseStatus_s();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~BaseStatus_s();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::BaseStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport BaseStatus_s(
+                        const BaseStatus_s& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::BaseStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport BaseStatus_s(
+                        BaseStatus_s&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::BaseStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport BaseStatus_s& operator =(
+                        const BaseStatus_s& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::BaseStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport BaseStatus_s& operator =(
+                        BaseStatus_s&& x) noexcept;
 
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::BaseStatus_s object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const BaseStatus_s& x) const;
 
-/*!
- * @brief This class represents the structure BaseStatus_s defined by the user in the IDL file.
- * @ingroup monitorservice_types
- */
-class BaseStatus_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport BaseStatus_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~BaseStatus_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::BaseStatus_s that will be copied.
-     */
-    eProsima_user_DllExport BaseStatus_s(
-            const BaseStatus_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::BaseStatus_s that will be copied.
-     */
-    eProsima_user_DllExport BaseStatus_s(
-            BaseStatus_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::BaseStatus_s that will be copied.
-     */
-    eProsima_user_DllExport BaseStatus_s& operator =(
-            const BaseStatus_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::BaseStatus_s that will be copied.
-     */
-    eProsima_user_DllExport BaseStatus_s& operator =(
-            BaseStatus_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::BaseStatus_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const BaseStatus_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::BaseStatus_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const BaseStatus_s& x) const;
-
-    /*!
-     * @brief This function sets a value in member total_count
-     * @param _total_count New value for member total_count
-     */
-    eProsima_user_DllExport void total_count(
-            uint32_t _total_count);
-
-    /*!
-     * @brief This function returns the value of member total_count
-     * @return Value of member total_count
-     */
-    eProsima_user_DllExport uint32_t total_count() const;
-
-    /*!
-     * @brief This function returns a reference to member total_count
-     * @return Reference to member total_count
-     */
-    eProsima_user_DllExport uint32_t& total_count();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::BaseStatus_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    uint32_t m_total_count;
-
-};
-
-
-
-typedef std::vector<eprosima::fastdds::statistics::QosPolicyCount_s> QosPolicyCountSeq_s;
-
-
-
-/*!
- * @brief This class represents the structure IncompatibleQoSStatus_s defined by the user in the IDL file.
- * @ingroup monitorservice_types
- */
-class IncompatibleQoSStatus_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport IncompatibleQoSStatus_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~IncompatibleQoSStatus_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::IncompatibleQoSStatus_s that will be copied.
-     */
-    eProsima_user_DllExport IncompatibleQoSStatus_s(
-            const IncompatibleQoSStatus_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::IncompatibleQoSStatus_s that will be copied.
-     */
-    eProsima_user_DllExport IncompatibleQoSStatus_s(
-            IncompatibleQoSStatus_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::IncompatibleQoSStatus_s that will be copied.
-     */
-    eProsima_user_DllExport IncompatibleQoSStatus_s& operator =(
-            const IncompatibleQoSStatus_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::IncompatibleQoSStatus_s that will be copied.
-     */
-    eProsima_user_DllExport IncompatibleQoSStatus_s& operator =(
-            IncompatibleQoSStatus_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::IncompatibleQoSStatus_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const IncompatibleQoSStatus_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::IncompatibleQoSStatus_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const IncompatibleQoSStatus_s& x) const;
-
-    /*!
-     * @brief This function sets a value in member total_count
-     * @param _total_count New value for member total_count
-     */
-    eProsima_user_DllExport void total_count(
-            uint32_t _total_count);
-
-    /*!
-     * @brief This function returns the value of member total_count
-     * @return Value of member total_count
-     */
-    eProsima_user_DllExport uint32_t total_count() const;
-
-    /*!
-     * @brief This function returns a reference to member total_count
-     * @return Reference to member total_count
-     */
-    eProsima_user_DllExport uint32_t& total_count();
-
-
-    /*!
-     * @brief This function sets a value in member last_policy_id
-     * @param _last_policy_id New value for member last_policy_id
-     */
-    eProsima_user_DllExport void last_policy_id(
-            uint32_t _last_policy_id);
-
-    /*!
-     * @brief This function returns the value of member last_policy_id
-     * @return Value of member last_policy_id
-     */
-    eProsima_user_DllExport uint32_t last_policy_id() const;
-
-    /*!
-     * @brief This function returns a reference to member last_policy_id
-     * @return Reference to member last_policy_id
-     */
-    eProsima_user_DllExport uint32_t& last_policy_id();
-
-
-    /*!
-     * @brief This function copies the value in member policies
-     * @param _policies New value to be copied in member policies
-     */
-    eProsima_user_DllExport void policies(
-            const eprosima::fastdds::statistics::QosPolicyCountSeq_s& _policies);
-
-    /*!
-     * @brief This function moves the value in member policies
-     * @param _policies New value to be moved in member policies
-     */
-    eProsima_user_DllExport void policies(
-            eprosima::fastdds::statistics::QosPolicyCountSeq_s&& _policies);
-
-    /*!
-     * @brief This function returns a constant reference to member policies
-     * @return Constant reference to member policies
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::QosPolicyCountSeq_s& policies() const;
-
-    /*!
-     * @brief This function returns a reference to member policies
-     * @return Reference to member policies
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::QosPolicyCountSeq_s& policies();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::BaseStatus_s object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const BaseStatus_s& x) const;
 
-    uint32_t m_total_count;
-    uint32_t m_last_policy_id;
-    eprosima::fastdds::statistics::QosPolicyCountSeq_s m_policies;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure LivelinessChangedStatus_s defined by the user in the IDL file.
- * @ingroup monitorservice_types
- */
-class LivelinessChangedStatus_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport LivelinessChangedStatus_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~LivelinessChangedStatus_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::LivelinessChangedStatus_s that will be copied.
-     */
-    eProsima_user_DllExport LivelinessChangedStatus_s(
-            const LivelinessChangedStatus_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::LivelinessChangedStatus_s that will be copied.
-     */
-    eProsima_user_DllExport LivelinessChangedStatus_s(
-            LivelinessChangedStatus_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::LivelinessChangedStatus_s that will be copied.
-     */
-    eProsima_user_DllExport LivelinessChangedStatus_s& operator =(
-            const LivelinessChangedStatus_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::LivelinessChangedStatus_s that will be copied.
-     */
-    eProsima_user_DllExport LivelinessChangedStatus_s& operator =(
-            LivelinessChangedStatus_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::LivelinessChangedStatus_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const LivelinessChangedStatus_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::LivelinessChangedStatus_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const LivelinessChangedStatus_s& x) const;
-
-    /*!
-     * @brief This function sets a value in member alive_count
-     * @param _alive_count New value for member alive_count
-     */
-    eProsima_user_DllExport void alive_count(
-            uint32_t _alive_count);
-
-    /*!
-     * @brief This function returns the value of member alive_count
-     * @return Value of member alive_count
-     */
-    eProsima_user_DllExport uint32_t alive_count() const;
-
-    /*!
-     * @brief This function returns a reference to member alive_count
-     * @return Reference to member alive_count
-     */
-    eProsima_user_DllExport uint32_t& alive_count();
-
-
-    /*!
-     * @brief This function sets a value in member not_alive_count
-     * @param _not_alive_count New value for member not_alive_count
-     */
-    eProsima_user_DllExport void not_alive_count(
-            uint32_t _not_alive_count);
-
-    /*!
-     * @brief This function returns the value of member not_alive_count
-     * @return Value of member not_alive_count
-     */
-    eProsima_user_DllExport uint32_t not_alive_count() const;
-
-    /*!
-     * @brief This function returns a reference to member not_alive_count
-     * @return Reference to member not_alive_count
-     */
-    eProsima_user_DllExport uint32_t& not_alive_count();
-
-
-    /*!
-     * @brief This function copies the value in member last_publication_handle
-     * @param _last_publication_handle New value to be copied in member last_publication_handle
-     */
-    eProsima_user_DllExport void last_publication_handle(
-            const std::array<uint8_t, 16>& _last_publication_handle);
-
-    /*!
-     * @brief This function moves the value in member last_publication_handle
-     * @param _last_publication_handle New value to be moved in member last_publication_handle
-     */
-    eProsima_user_DllExport void last_publication_handle(
-            std::array<uint8_t, 16>&& _last_publication_handle);
-
-    /*!
-     * @brief This function returns a constant reference to member last_publication_handle
-     * @return Constant reference to member last_publication_handle
-     */
-    eProsima_user_DllExport const std::array<uint8_t, 16>& last_publication_handle() const;
-
-    /*!
-     * @brief This function returns a reference to member last_publication_handle
-     * @return Reference to member last_publication_handle
-     */
-    eProsima_user_DllExport std::array<uint8_t, 16>& last_publication_handle();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::LivelinessChangedStatus_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    uint32_t m_alive_count;
-    uint32_t m_not_alive_count;
-    std::array<uint8_t, 16> m_last_publication_handle;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure DeadlineMissedStatus_s defined by the user in the IDL file.
- * @ingroup monitorservice_types
- */
-class DeadlineMissedStatus_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport DeadlineMissedStatus_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~DeadlineMissedStatus_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::DeadlineMissedStatus_s that will be copied.
-     */
-    eProsima_user_DllExport DeadlineMissedStatus_s(
-            const DeadlineMissedStatus_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::DeadlineMissedStatus_s that will be copied.
-     */
-    eProsima_user_DllExport DeadlineMissedStatus_s(
-            DeadlineMissedStatus_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::DeadlineMissedStatus_s that will be copied.
-     */
-    eProsima_user_DllExport DeadlineMissedStatus_s& operator =(
-            const DeadlineMissedStatus_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::DeadlineMissedStatus_s that will be copied.
-     */
-    eProsima_user_DllExport DeadlineMissedStatus_s& operator =(
-            DeadlineMissedStatus_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::DeadlineMissedStatus_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const DeadlineMissedStatus_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::DeadlineMissedStatus_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const DeadlineMissedStatus_s& x) const;
-
-    /*!
-     * @brief This function sets a value in member total_count
-     * @param _total_count New value for member total_count
-     */
-    eProsima_user_DllExport void total_count(
-            uint32_t _total_count);
-
-    /*!
-     * @brief This function returns the value of member total_count
-     * @return Value of member total_count
-     */
-    eProsima_user_DllExport uint32_t total_count() const;
-
-    /*!
-     * @brief This function returns a reference to member total_count
-     * @return Reference to member total_count
-     */
-    eProsima_user_DllExport uint32_t& total_count();
-
-
-    /*!
-     * @brief This function copies the value in member last_instance_handle
-     * @param _last_instance_handle New value to be copied in member last_instance_handle
-     */
-    eProsima_user_DllExport void last_instance_handle(
-            const std::array<uint8_t, 16>& _last_instance_handle);
-
-    /*!
-     * @brief This function moves the value in member last_instance_handle
-     * @param _last_instance_handle New value to be moved in member last_instance_handle
-     */
-    eProsima_user_DllExport void last_instance_handle(
-            std::array<uint8_t, 16>&& _last_instance_handle);
-
-    /*!
-     * @brief This function returns a constant reference to member last_instance_handle
-     * @return Constant reference to member last_instance_handle
-     */
-    eProsima_user_DllExport const std::array<uint8_t, 16>& last_instance_handle() const;
-
-    /*!
-     * @brief This function returns a reference to member last_instance_handle
-     * @return Reference to member last_instance_handle
-     */
-    eProsima_user_DllExport std::array<uint8_t, 16>& last_instance_handle();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::DeadlineMissedStatus_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    uint32_t m_total_count;
-    std::array<uint8_t, 16> m_last_instance_handle;
-
-};
-
-typedef eprosima::fastdds::statistics::BaseStatus_s LivelinessLostStatus_s;
-
-typedef eprosima::fastdds::statistics::BaseStatus_s InconsistentTopicStatus_s;
-
-typedef eprosima::fastdds::statistics::BaseStatus_s SampleLostStatus_s;
-
-/*!
- * @brief This class represents the enumeration StatusKind defined by the user in the IDL file.
- * @ingroup monitorservice_types
- */
-enum StatusKind : uint32_t
-{
-    PROXY,
-    CONNECTION_LIST,
-    INCOMPATIBLE_QOS,
-    INCONSISTENT_TOPIC,
-    LIVELINESS_LOST,
-    LIVELINESS_CHANGED,
-    DEADLINE_MISSED,
-    SAMPLE_LOST,
-    STATUSES_SIZE
-};
-
-
-/*!
- * @brief This class represents the union MonitorServiceData defined by the user in the IDL file.
- * @ingroup monitorservice_types
- */
-class MonitorServiceData
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport MonitorServiceData();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~MonitorServiceData();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceData that will be copied.
-     */
-    eProsima_user_DllExport MonitorServiceData(
-            const MonitorServiceData& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceData that will be copied.
-     */
-    eProsima_user_DllExport MonitorServiceData(
-            MonitorServiceData&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceData that will be copied.
-     */
-    eProsima_user_DllExport MonitorServiceData& operator =(
-            const MonitorServiceData& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceData that will be copied.
-     */
-    eProsima_user_DllExport MonitorServiceData& operator =(
-            MonitorServiceData&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::MonitorServiceData object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const MonitorServiceData& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::MonitorServiceData object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const MonitorServiceData& x) const;
-
-    /*!
-     * @brief This function sets the discriminator value.
-     * @param __d New value for the discriminator.
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the new value doesn't correspond to the selected union member.
-     */
-    eProsima_user_DllExport void _d(
-            eprosima::fastdds::statistics::StatusKind __d);
-
-    /*!
-     * @brief This function returns the value of the discriminator.
-     * @return Value of the discriminator
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::StatusKind _d() const;
-
-    /*!
-     * @brief This function returns a reference to the discriminator.
-     * @return Reference to the discriminator.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::StatusKind& _d();
-
-    /*!
-     * @brief This function copies the value in member entity_proxy
-     * @param _entity_proxy New value to be copied in member entity_proxy
-     */
-    eProsima_user_DllExport void entity_proxy(
-            const std::vector<uint8_t>& _entity_proxy);
-
-    /*!
-     * @brief This function moves the value in member entity_proxy
-     * @param _entity_proxy New value to be moved in member entity_proxy
-     */
-    eProsima_user_DllExport void entity_proxy(
-            std::vector<uint8_t>&& _entity_proxy);
-
-    /*!
-     * @brief This function returns a constant reference to member entity_proxy
-     * @return Constant reference to member entity_proxy
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const std::vector<uint8_t>& entity_proxy() const;
-
-    /*!
-     * @brief This function returns a reference to member entity_proxy
-     * @return Reference to member entity_proxy
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport std::vector<uint8_t>& entity_proxy();
-
-
-    /*!
-     * @brief This function copies the value in member connection_list
-     * @param _connection_list New value to be copied in member connection_list
-     */
-    eProsima_user_DllExport void connection_list(
-            const std::vector<eprosima::fastdds::statistics::Connection>& _connection_list);
-
-    /*!
-     * @brief This function moves the value in member connection_list
-     * @param _connection_list New value to be moved in member connection_list
-     */
-    eProsima_user_DllExport void connection_list(
-            std::vector<eprosima::fastdds::statistics::Connection>&& _connection_list);
-
-    /*!
-     * @brief This function returns a constant reference to member connection_list
-     * @return Constant reference to member connection_list
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const std::vector<eprosima::fastdds::statistics::Connection>& connection_list() const;
-
-    /*!
-     * @brief This function returns a reference to member connection_list
-     * @return Reference to member connection_list
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport std::vector<eprosima::fastdds::statistics::Connection>& connection_list();
-
-
-    /*!
-     * @brief This function copies the value in member incompatible_qos_status
-     * @param _incompatible_qos_status New value to be copied in member incompatible_qos_status
-     */
-    eProsima_user_DllExport void incompatible_qos_status(
-            const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& _incompatible_qos_status);
-
-    /*!
-     * @brief This function moves the value in member incompatible_qos_status
-     * @param _incompatible_qos_status New value to be moved in member incompatible_qos_status
-     */
-    eProsima_user_DllExport void incompatible_qos_status(
-            eprosima::fastdds::statistics::IncompatibleQoSStatus_s&& _incompatible_qos_status);
-
-    /*!
-     * @brief This function returns a constant reference to member incompatible_qos_status
-     * @return Constant reference to member incompatible_qos_status
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status()
-    const;
-
-    /*!
-     * @brief This function returns a reference to member incompatible_qos_status
-     * @return Reference to member incompatible_qos_status
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status();
-
-
-    /*!
-     * @brief This function copies the value in member inconsistent_topic_status
-     * @param _inconsistent_topic_status New value to be copied in member inconsistent_topic_status
-     */
-    eProsima_user_DllExport void inconsistent_topic_status(
-            const eprosima::fastdds::statistics::InconsistentTopicStatus_s& _inconsistent_topic_status);
-
-    /*!
-     * @brief This function moves the value in member inconsistent_topic_status
-     * @param _inconsistent_topic_status New value to be moved in member inconsistent_topic_status
-     */
-    eProsima_user_DllExport void inconsistent_topic_status(
-            eprosima::fastdds::statistics::InconsistentTopicStatus_s&& _inconsistent_topic_status);
-
-    /*!
-     * @brief This function returns a constant reference to member inconsistent_topic_status
-     * @return Constant reference to member inconsistent_topic_status
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status()
-    const;
-
-    /*!
-     * @brief This function returns a reference to member inconsistent_topic_status
-     * @return Reference to member inconsistent_topic_status
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status();
-
-
-    /*!
-     * @brief This function copies the value in member liveliness_lost_status
-     * @param _liveliness_lost_status New value to be copied in member liveliness_lost_status
-     */
-    eProsima_user_DllExport void liveliness_lost_status(
-            const eprosima::fastdds::statistics::LivelinessLostStatus_s& _liveliness_lost_status);
-
-    /*!
-     * @brief This function moves the value in member liveliness_lost_status
-     * @param _liveliness_lost_status New value to be moved in member liveliness_lost_status
-     */
-    eProsima_user_DllExport void liveliness_lost_status(
-            eprosima::fastdds::statistics::LivelinessLostStatus_s&& _liveliness_lost_status);
-
-    /*!
-     * @brief This function returns a constant reference to member liveliness_lost_status
-     * @return Constant reference to member liveliness_lost_status
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessLostStatus_s& liveliness_lost_status() const;
-
-    /*!
-     * @brief This function returns a reference to member liveliness_lost_status
-     * @return Reference to member liveliness_lost_status
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::LivelinessLostStatus_s& liveliness_lost_status();
-
-
-    /*!
-     * @brief This function copies the value in member liveliness_changed_status
-     * @param _liveliness_changed_status New value to be copied in member liveliness_changed_status
-     */
-    eProsima_user_DllExport void liveliness_changed_status(
-            const eprosima::fastdds::statistics::LivelinessChangedStatus_s& _liveliness_changed_status);
-
-    /*!
-     * @brief This function moves the value in member liveliness_changed_status
-     * @param _liveliness_changed_status New value to be moved in member liveliness_changed_status
-     */
-    eProsima_user_DllExport void liveliness_changed_status(
-            eprosima::fastdds::statistics::LivelinessChangedStatus_s&& _liveliness_changed_status);
-
-    /*!
-     * @brief This function returns a constant reference to member liveliness_changed_status
-     * @return Constant reference to member liveliness_changed_status
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status()
-    const;
-
-    /*!
-     * @brief This function returns a reference to member liveliness_changed_status
-     * @return Reference to member liveliness_changed_status
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status();
-
-
-    /*!
-     * @brief This function copies the value in member deadline_missed_status
-     * @param _deadline_missed_status New value to be copied in member deadline_missed_status
-     */
-    eProsima_user_DllExport void deadline_missed_status(
-            const eprosima::fastdds::statistics::DeadlineMissedStatus_s& _deadline_missed_status);
-
-    /*!
-     * @brief This function moves the value in member deadline_missed_status
-     * @param _deadline_missed_status New value to be moved in member deadline_missed_status
-     */
-    eProsima_user_DllExport void deadline_missed_status(
-            eprosima::fastdds::statistics::DeadlineMissedStatus_s&& _deadline_missed_status);
-
-    /*!
-     * @brief This function returns a constant reference to member deadline_missed_status
-     * @return Constant reference to member deadline_missed_status
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::DeadlineMissedStatus_s& deadline_missed_status() const;
-
-    /*!
-     * @brief This function returns a reference to member deadline_missed_status
-     * @return Reference to member deadline_missed_status
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::DeadlineMissedStatus_s& deadline_missed_status();
-
-
-    /*!
-     * @brief This function copies the value in member sample_lost_status
-     * @param _sample_lost_status New value to be copied in member sample_lost_status
-     */
-    eProsima_user_DllExport void sample_lost_status(
-            const eprosima::fastdds::statistics::SampleLostStatus_s& _sample_lost_status);
-
-    /*!
-     * @brief This function moves the value in member sample_lost_status
-     * @param _sample_lost_status New value to be moved in member sample_lost_status
-     */
-    eProsima_user_DllExport void sample_lost_status(
-            eprosima::fastdds::statistics::SampleLostStatus_s&& _sample_lost_status);
-
-    /*!
-     * @brief This function returns a constant reference to member sample_lost_status
-     * @return Constant reference to member sample_lost_status
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::SampleLostStatus_s& sample_lost_status() const;
-
-    /*!
-     * @brief This function returns a reference to member sample_lost_status
-     * @return Reference to member sample_lost_status
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::SampleLostStatus_s& sample_lost_status();
-
-
-    /*!
-     * @brief This function sets a value in member statuses_size
-     * @param _statuses_size New value for member statuses_size
-     */
-    eProsima_user_DllExport void statuses_size(
-            uint8_t _statuses_size);
-
-    /*!
-     * @brief This function returns the value of member statuses_size
-     * @return Value of member statuses_size
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport uint8_t statuses_size() const;
-
-    /*!
-     * @brief This function returns a reference to member statuses_size
-     * @return Reference to member statuses_size
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport uint8_t& statuses_size();
-
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::MonitorServiceData& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-private:
-
-    eprosima::fastdds::statistics::StatusKind m__d;
-
-    std::vector<uint8_t> m_entity_proxy;
-    std::vector<eprosima::fastdds::statistics::Connection> m_connection_list;
-    eprosima::fastdds::statistics::IncompatibleQoSStatus_s m_incompatible_qos_status;
-    eprosima::fastdds::statistics::InconsistentTopicStatus_s m_inconsistent_topic_status;
-    eprosima::fastdds::statistics::LivelinessLostStatus_s m_liveliness_lost_status;
-    eprosima::fastdds::statistics::LivelinessChangedStatus_s m_liveliness_changed_status;
-    eprosima::fastdds::statistics::DeadlineMissedStatus_s m_deadline_missed_status;
-    eprosima::fastdds::statistics::SampleLostStatus_s m_sample_lost_status;
-    uint8_t m_statuses_size;
-};
-
-
-
-/*!
- * @brief This class represents the structure MonitorServiceStatusData defined by the user in the IDL file.
- * @ingroup monitorservice_types
- */
-class MonitorServiceStatusData
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport MonitorServiceStatusData();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~MonitorServiceStatusData();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceStatusData that will be copied.
-     */
-    eProsima_user_DllExport MonitorServiceStatusData(
-            const MonitorServiceStatusData& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceStatusData that will be copied.
-     */
-    eProsima_user_DllExport MonitorServiceStatusData(
-            MonitorServiceStatusData&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceStatusData that will be copied.
-     */
-    eProsima_user_DllExport MonitorServiceStatusData& operator =(
-            const MonitorServiceStatusData& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceStatusData that will be copied.
-     */
-    eProsima_user_DllExport MonitorServiceStatusData& operator =(
-            MonitorServiceStatusData&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::MonitorServiceStatusData object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const MonitorServiceStatusData& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::MonitorServiceStatusData object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const MonitorServiceStatusData& x) const;
-
-    /*!
-     * @brief This function copies the value in member local_entity
-     * @param _local_entity New value to be copied in member local_entity
-     */
-    eProsima_user_DllExport void local_entity(
-            const eprosima::fastdds::statistics::detail::GUID_s& _local_entity);
-
-    /*!
-     * @brief This function moves the value in member local_entity
-     * @param _local_entity New value to be moved in member local_entity
-     */
-    eProsima_user_DllExport void local_entity(
-            eprosima::fastdds::statistics::detail::GUID_s&& _local_entity);
-
-    /*!
-     * @brief This function returns a constant reference to member local_entity
-     * @return Constant reference to member local_entity
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& local_entity() const;
-
-    /*!
-     * @brief This function returns a reference to member local_entity
-     * @return Reference to member local_entity
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& local_entity();
-
-
-    /*!
-     * @brief This function sets a value in member status_kind
-     * @param _status_kind New value for member status_kind
-     */
-    eProsima_user_DllExport void status_kind(
-            eprosima::fastdds::statistics::StatusKind _status_kind);
-
-    /*!
-     * @brief This function returns the value of member status_kind
-     * @return Value of member status_kind
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::StatusKind status_kind() const;
-
-    /*!
-     * @brief This function returns a reference to member status_kind
-     * @return Reference to member status_kind
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::StatusKind& status_kind();
-
-
-    /*!
-     * @brief This function copies the value in member value
-     * @param _value New value to be copied in member value
-     */
-    eProsima_user_DllExport void value(
-            const eprosima::fastdds::statistics::MonitorServiceData& _value);
-
-    /*!
-     * @brief This function moves the value in member value
-     * @param _value New value to be moved in member value
-     */
-    eProsima_user_DllExport void value(
-            eprosima::fastdds::statistics::MonitorServiceData&& _value);
-
-    /*!
-     * @brief This function returns a constant reference to member value
-     * @return Constant reference to member value
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::MonitorServiceData& value() const;
-
-    /*!
-     * @brief This function returns a reference to member value
-     * @return Reference to member value
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::MonitorServiceData& value();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::MonitorServiceStatusData& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_local_entity;
-    eprosima::fastdds::statistics::StatusKind m_status_kind;
-    eprosima::fastdds::statistics::MonitorServiceData m_value;
-
-};
+                /*!
+                 * @brief This function sets a value in member total_count
+                 * @param _total_count New value for member total_count
+                 */
+                eProsima_user_DllExport void total_count(
+                        uint32_t _total_count);
+
+                /*!
+                 * @brief This function returns the value of member total_count
+                 * @return Value of member total_count
+                 */
+                eProsima_user_DllExport uint32_t total_count() const;
+
+                /*!
+                 * @brief This function returns a reference to member total_count
+                 * @return Reference to member total_count
+                 */
+                eProsima_user_DllExport uint32_t& total_count();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::BaseStatus_s& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                uint32_t m_total_count;
+
+            };
+
+
+
+            typedef std::vector<eprosima::fastdds::statistics::QosPolicyCount_s> QosPolicyCountSeq_s;
+
+
+
+            /*!
+             * @brief This class represents the structure IncompatibleQoSStatus_s defined by the user in the IDL file.
+             * @ingroup monitorservice_types
+             */
+            class IncompatibleQoSStatus_s
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport IncompatibleQoSStatus_s();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~IncompatibleQoSStatus_s();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::IncompatibleQoSStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport IncompatibleQoSStatus_s(
+                        const IncompatibleQoSStatus_s& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::IncompatibleQoSStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport IncompatibleQoSStatus_s(
+                        IncompatibleQoSStatus_s&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::IncompatibleQoSStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport IncompatibleQoSStatus_s& operator =(
+                        const IncompatibleQoSStatus_s& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::IncompatibleQoSStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport IncompatibleQoSStatus_s& operator =(
+                        IncompatibleQoSStatus_s&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::IncompatibleQoSStatus_s object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const IncompatibleQoSStatus_s& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::IncompatibleQoSStatus_s object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const IncompatibleQoSStatus_s& x) const;
+
+                /*!
+                 * @brief This function sets a value in member total_count
+                 * @param _total_count New value for member total_count
+                 */
+                eProsima_user_DllExport void total_count(
+                        uint32_t _total_count);
+
+                /*!
+                 * @brief This function returns the value of member total_count
+                 * @return Value of member total_count
+                 */
+                eProsima_user_DllExport uint32_t total_count() const;
+
+                /*!
+                 * @brief This function returns a reference to member total_count
+                 * @return Reference to member total_count
+                 */
+                eProsima_user_DllExport uint32_t& total_count();
+
+
+                /*!
+                 * @brief This function sets a value in member last_policy_id
+                 * @param _last_policy_id New value for member last_policy_id
+                 */
+                eProsima_user_DllExport void last_policy_id(
+                        uint32_t _last_policy_id);
+
+                /*!
+                 * @brief This function returns the value of member last_policy_id
+                 * @return Value of member last_policy_id
+                 */
+                eProsima_user_DllExport uint32_t last_policy_id() const;
+
+                /*!
+                 * @brief This function returns a reference to member last_policy_id
+                 * @return Reference to member last_policy_id
+                 */
+                eProsima_user_DllExport uint32_t& last_policy_id();
+
+
+                /*!
+                 * @brief This function copies the value in member policies
+                 * @param _policies New value to be copied in member policies
+                 */
+                eProsima_user_DllExport void policies(
+                        const eprosima::fastdds::statistics::QosPolicyCountSeq_s& _policies);
+
+                /*!
+                 * @brief This function moves the value in member policies
+                 * @param _policies New value to be moved in member policies
+                 */
+                eProsima_user_DllExport void policies(
+                        eprosima::fastdds::statistics::QosPolicyCountSeq_s&& _policies);
+
+                /*!
+                 * @brief This function returns a constant reference to member policies
+                 * @return Constant reference to member policies
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::QosPolicyCountSeq_s& policies() const;
+
+                /*!
+                 * @brief This function returns a reference to member policies
+                 * @return Reference to member policies
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::QosPolicyCountSeq_s& policies();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                uint32_t m_total_count;
+                uint32_t m_last_policy_id;
+                eprosima::fastdds::statistics::QosPolicyCountSeq_s m_policies;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure LivelinessChangedStatus_s defined by the user in the IDL file.
+             * @ingroup monitorservice_types
+             */
+            class LivelinessChangedStatus_s
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport LivelinessChangedStatus_s();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~LivelinessChangedStatus_s();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::LivelinessChangedStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport LivelinessChangedStatus_s(
+                        const LivelinessChangedStatus_s& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::LivelinessChangedStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport LivelinessChangedStatus_s(
+                        LivelinessChangedStatus_s&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::LivelinessChangedStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport LivelinessChangedStatus_s& operator =(
+                        const LivelinessChangedStatus_s& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::LivelinessChangedStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport LivelinessChangedStatus_s& operator =(
+                        LivelinessChangedStatus_s&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::LivelinessChangedStatus_s object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const LivelinessChangedStatus_s& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::LivelinessChangedStatus_s object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const LivelinessChangedStatus_s& x) const;
+
+                /*!
+                 * @brief This function sets a value in member alive_count
+                 * @param _alive_count New value for member alive_count
+                 */
+                eProsima_user_DllExport void alive_count(
+                        uint32_t _alive_count);
+
+                /*!
+                 * @brief This function returns the value of member alive_count
+                 * @return Value of member alive_count
+                 */
+                eProsima_user_DllExport uint32_t alive_count() const;
+
+                /*!
+                 * @brief This function returns a reference to member alive_count
+                 * @return Reference to member alive_count
+                 */
+                eProsima_user_DllExport uint32_t& alive_count();
+
+
+                /*!
+                 * @brief This function sets a value in member not_alive_count
+                 * @param _not_alive_count New value for member not_alive_count
+                 */
+                eProsima_user_DllExport void not_alive_count(
+                        uint32_t _not_alive_count);
+
+                /*!
+                 * @brief This function returns the value of member not_alive_count
+                 * @return Value of member not_alive_count
+                 */
+                eProsima_user_DllExport uint32_t not_alive_count() const;
+
+                /*!
+                 * @brief This function returns a reference to member not_alive_count
+                 * @return Reference to member not_alive_count
+                 */
+                eProsima_user_DllExport uint32_t& not_alive_count();
+
+
+                /*!
+                 * @brief This function copies the value in member last_publication_handle
+                 * @param _last_publication_handle New value to be copied in member last_publication_handle
+                 */
+                eProsima_user_DllExport void last_publication_handle(
+                        const std::array<uint8_t, 16>& _last_publication_handle);
+
+                /*!
+                 * @brief This function moves the value in member last_publication_handle
+                 * @param _last_publication_handle New value to be moved in member last_publication_handle
+                 */
+                eProsima_user_DllExport void last_publication_handle(
+                        std::array<uint8_t, 16>&& _last_publication_handle);
+
+                /*!
+                 * @brief This function returns a constant reference to member last_publication_handle
+                 * @return Constant reference to member last_publication_handle
+                 */
+                eProsima_user_DllExport const std::array<uint8_t, 16>& last_publication_handle() const;
+
+                /*!
+                 * @brief This function returns a reference to member last_publication_handle
+                 * @return Reference to member last_publication_handle
+                 */
+                eProsima_user_DllExport std::array<uint8_t, 16>& last_publication_handle();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::LivelinessChangedStatus_s& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                uint32_t m_alive_count;
+                uint32_t m_not_alive_count;
+                std::array<uint8_t, 16> m_last_publication_handle;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure DeadlineMissedStatus_s defined by the user in the IDL file.
+             * @ingroup monitorservice_types
+             */
+            class DeadlineMissedStatus_s
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport DeadlineMissedStatus_s();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~DeadlineMissedStatus_s();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::DeadlineMissedStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport DeadlineMissedStatus_s(
+                        const DeadlineMissedStatus_s& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::DeadlineMissedStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport DeadlineMissedStatus_s(
+                        DeadlineMissedStatus_s&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::DeadlineMissedStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport DeadlineMissedStatus_s& operator =(
+                        const DeadlineMissedStatus_s& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::DeadlineMissedStatus_s that will be copied.
+                 */
+                eProsima_user_DllExport DeadlineMissedStatus_s& operator =(
+                        DeadlineMissedStatus_s&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::DeadlineMissedStatus_s object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const DeadlineMissedStatus_s& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::DeadlineMissedStatus_s object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const DeadlineMissedStatus_s& x) const;
+
+                /*!
+                 * @brief This function sets a value in member total_count
+                 * @param _total_count New value for member total_count
+                 */
+                eProsima_user_DllExport void total_count(
+                        uint32_t _total_count);
+
+                /*!
+                 * @brief This function returns the value of member total_count
+                 * @return Value of member total_count
+                 */
+                eProsima_user_DllExport uint32_t total_count() const;
+
+                /*!
+                 * @brief This function returns a reference to member total_count
+                 * @return Reference to member total_count
+                 */
+                eProsima_user_DllExport uint32_t& total_count();
+
+
+                /*!
+                 * @brief This function copies the value in member last_instance_handle
+                 * @param _last_instance_handle New value to be copied in member last_instance_handle
+                 */
+                eProsima_user_DllExport void last_instance_handle(
+                        const std::array<uint8_t, 16>& _last_instance_handle);
+
+                /*!
+                 * @brief This function moves the value in member last_instance_handle
+                 * @param _last_instance_handle New value to be moved in member last_instance_handle
+                 */
+                eProsima_user_DllExport void last_instance_handle(
+                        std::array<uint8_t, 16>&& _last_instance_handle);
+
+                /*!
+                 * @brief This function returns a constant reference to member last_instance_handle
+                 * @return Constant reference to member last_instance_handle
+                 */
+                eProsima_user_DllExport const std::array<uint8_t, 16>& last_instance_handle() const;
+
+                /*!
+                 * @brief This function returns a reference to member last_instance_handle
+                 * @return Reference to member last_instance_handle
+                 */
+                eProsima_user_DllExport std::array<uint8_t, 16>& last_instance_handle();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::DeadlineMissedStatus_s& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                uint32_t m_total_count;
+                std::array<uint8_t, 16> m_last_instance_handle;
+
+            };
+
+            typedef eprosima::fastdds::statistics::BaseStatus_s LivelinessLostStatus_s;
+
+            typedef eprosima::fastdds::statistics::BaseStatus_s InconsistentTopicStatus_s;
+
+            typedef eprosima::fastdds::statistics::BaseStatus_s SampleLostStatus_s;
+
+            /*!
+             * @brief This class represents the enumeration StatusKind defined by the user in the IDL file.
+             * @ingroup monitorservice_types
+             */
+            enum StatusKind : uint32_t
+            {
+                PROXY,
+                CONNECTION_LIST,
+                INCOMPATIBLE_QOS,
+                INCONSISTENT_TOPIC,
+                LIVELINESS_LOST,
+                LIVELINESS_CHANGED,
+                DEADLINE_MISSED,
+                SAMPLE_LOST,
+                STATUSES_SIZE
+            };
+
+
+            /*!
+             * @brief This class represents the union MonitorServiceData defined by the user in the IDL file.
+             * @ingroup monitorservice_types
+             */
+            class MonitorServiceData
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport MonitorServiceData();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~MonitorServiceData();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceData that will be copied.
+                 */
+                eProsima_user_DllExport MonitorServiceData(
+                        const MonitorServiceData& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceData that will be copied.
+                 */
+                eProsima_user_DllExport MonitorServiceData(
+                        MonitorServiceData&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceData that will be copied.
+                 */
+                eProsima_user_DllExport MonitorServiceData& operator =(
+                        const MonitorServiceData& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceData that will be copied.
+                 */
+                eProsima_user_DllExport MonitorServiceData& operator =(
+                        MonitorServiceData&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::MonitorServiceData object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const MonitorServiceData& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::MonitorServiceData object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const MonitorServiceData& x) const;
+
+                /*!
+                 * @brief This function sets the discriminator value.
+                 * @param __d New value for the discriminator.
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the new value doesn't correspond to the selected union member.
+                 */
+                eProsima_user_DllExport void _d(
+                        eprosima::fastdds::statistics::StatusKind __d);
+
+                /*!
+                 * @brief This function returns the value of the discriminator.
+                 * @return Value of the discriminator
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::StatusKind _d() const;
+
+                /*!
+                 * @brief This function returns a reference to the discriminator.
+                 * @return Reference to the discriminator.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::StatusKind& _d();
+
+                /*!
+                 * @brief This function copies the value in member entity_proxy
+                 * @param _entity_proxy New value to be copied in member entity_proxy
+                 */
+                eProsima_user_DllExport void entity_proxy(
+                        const std::vector<uint8_t>& _entity_proxy);
+
+                /*!
+                 * @brief This function moves the value in member entity_proxy
+                 * @param _entity_proxy New value to be moved in member entity_proxy
+                 */
+                eProsima_user_DllExport void entity_proxy(
+                        std::vector<uint8_t>&& _entity_proxy);
+
+                /*!
+                 * @brief This function returns a constant reference to member entity_proxy
+                 * @return Constant reference to member entity_proxy
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const std::vector<uint8_t>& entity_proxy() const;
+
+                /*!
+                 * @brief This function returns a reference to member entity_proxy
+                 * @return Reference to member entity_proxy
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport std::vector<uint8_t>& entity_proxy();
+
+
+                /*!
+                 * @brief This function copies the value in member connection_list
+                 * @param _connection_list New value to be copied in member connection_list
+                 */
+                eProsima_user_DllExport void connection_list(
+                        const std::vector<eprosima::fastdds::statistics::Connection>& _connection_list);
+
+                /*!
+                 * @brief This function moves the value in member connection_list
+                 * @param _connection_list New value to be moved in member connection_list
+                 */
+                eProsima_user_DllExport void connection_list(
+                        std::vector<eprosima::fastdds::statistics::Connection>&& _connection_list);
+
+                /*!
+                 * @brief This function returns a constant reference to member connection_list
+                 * @return Constant reference to member connection_list
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const std::vector<eprosima::fastdds::statistics::Connection>& connection_list() const;
+
+                /*!
+                 * @brief This function returns a reference to member connection_list
+                 * @return Reference to member connection_list
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport std::vector<eprosima::fastdds::statistics::Connection>& connection_list();
+
+
+                /*!
+                 * @brief This function copies the value in member incompatible_qos_status
+                 * @param _incompatible_qos_status New value to be copied in member incompatible_qos_status
+                 */
+                eProsima_user_DllExport void incompatible_qos_status(
+                        const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& _incompatible_qos_status);
+
+                /*!
+                 * @brief This function moves the value in member incompatible_qos_status
+                 * @param _incompatible_qos_status New value to be moved in member incompatible_qos_status
+                 */
+                eProsima_user_DllExport void incompatible_qos_status(
+                        eprosima::fastdds::statistics::IncompatibleQoSStatus_s&& _incompatible_qos_status);
+
+                /*!
+                 * @brief This function returns a constant reference to member incompatible_qos_status
+                 * @return Constant reference to member incompatible_qos_status
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status()
+                const;
+
+                /*!
+                 * @brief This function returns a reference to member incompatible_qos_status
+                 * @return Reference to member incompatible_qos_status
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status();
+
+
+                /*!
+                 * @brief This function copies the value in member inconsistent_topic_status
+                 * @param _inconsistent_topic_status New value to be copied in member inconsistent_topic_status
+                 */
+                eProsima_user_DllExport void inconsistent_topic_status(
+                        const eprosima::fastdds::statistics::InconsistentTopicStatus_s& _inconsistent_topic_status);
+
+                /*!
+                 * @brief This function moves the value in member inconsistent_topic_status
+                 * @param _inconsistent_topic_status New value to be moved in member inconsistent_topic_status
+                 */
+                eProsima_user_DllExport void inconsistent_topic_status(
+                        eprosima::fastdds::statistics::InconsistentTopicStatus_s&& _inconsistent_topic_status);
+
+                /*!
+                 * @brief This function returns a constant reference to member inconsistent_topic_status
+                 * @return Constant reference to member inconsistent_topic_status
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status()
+                const;
+
+                /*!
+                 * @brief This function returns a reference to member inconsistent_topic_status
+                 * @return Reference to member inconsistent_topic_status
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status();
+
+
+                /*!
+                 * @brief This function copies the value in member liveliness_lost_status
+                 * @param _liveliness_lost_status New value to be copied in member liveliness_lost_status
+                 */
+                eProsima_user_DllExport void liveliness_lost_status(
+                        const eprosima::fastdds::statistics::LivelinessLostStatus_s& _liveliness_lost_status);
+
+                /*!
+                 * @brief This function moves the value in member liveliness_lost_status
+                 * @param _liveliness_lost_status New value to be moved in member liveliness_lost_status
+                 */
+                eProsima_user_DllExport void liveliness_lost_status(
+                        eprosima::fastdds::statistics::LivelinessLostStatus_s&& _liveliness_lost_status);
+
+                /*!
+                 * @brief This function returns a constant reference to member liveliness_lost_status
+                 * @return Constant reference to member liveliness_lost_status
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessLostStatus_s& liveliness_lost_status() const;
+
+                /*!
+                 * @brief This function returns a reference to member liveliness_lost_status
+                 * @return Reference to member liveliness_lost_status
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::LivelinessLostStatus_s& liveliness_lost_status();
+
+
+                /*!
+                 * @brief This function copies the value in member liveliness_changed_status
+                 * @param _liveliness_changed_status New value to be copied in member liveliness_changed_status
+                 */
+                eProsima_user_DllExport void liveliness_changed_status(
+                        const eprosima::fastdds::statistics::LivelinessChangedStatus_s& _liveliness_changed_status);
+
+                /*!
+                 * @brief This function moves the value in member liveliness_changed_status
+                 * @param _liveliness_changed_status New value to be moved in member liveliness_changed_status
+                 */
+                eProsima_user_DllExport void liveliness_changed_status(
+                        eprosima::fastdds::statistics::LivelinessChangedStatus_s&& _liveliness_changed_status);
+
+                /*!
+                 * @brief This function returns a constant reference to member liveliness_changed_status
+                 * @return Constant reference to member liveliness_changed_status
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status()
+                const;
+
+                /*!
+                 * @brief This function returns a reference to member liveliness_changed_status
+                 * @return Reference to member liveliness_changed_status
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status();
+
+
+                /*!
+                 * @brief This function copies the value in member deadline_missed_status
+                 * @param _deadline_missed_status New value to be copied in member deadline_missed_status
+                 */
+                eProsima_user_DllExport void deadline_missed_status(
+                        const eprosima::fastdds::statistics::DeadlineMissedStatus_s& _deadline_missed_status);
+
+                /*!
+                 * @brief This function moves the value in member deadline_missed_status
+                 * @param _deadline_missed_status New value to be moved in member deadline_missed_status
+                 */
+                eProsima_user_DllExport void deadline_missed_status(
+                        eprosima::fastdds::statistics::DeadlineMissedStatus_s&& _deadline_missed_status);
+
+                /*!
+                 * @brief This function returns a constant reference to member deadline_missed_status
+                 * @return Constant reference to member deadline_missed_status
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::DeadlineMissedStatus_s& deadline_missed_status() const;
+
+                /*!
+                 * @brief This function returns a reference to member deadline_missed_status
+                 * @return Reference to member deadline_missed_status
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::DeadlineMissedStatus_s& deadline_missed_status();
+
+
+                /*!
+                 * @brief This function copies the value in member sample_lost_status
+                 * @param _sample_lost_status New value to be copied in member sample_lost_status
+                 */
+                eProsima_user_DllExport void sample_lost_status(
+                        const eprosima::fastdds::statistics::SampleLostStatus_s& _sample_lost_status);
+
+                /*!
+                 * @brief This function moves the value in member sample_lost_status
+                 * @param _sample_lost_status New value to be moved in member sample_lost_status
+                 */
+                eProsima_user_DllExport void sample_lost_status(
+                        eprosima::fastdds::statistics::SampleLostStatus_s&& _sample_lost_status);
+
+                /*!
+                 * @brief This function returns a constant reference to member sample_lost_status
+                 * @return Constant reference to member sample_lost_status
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::SampleLostStatus_s& sample_lost_status() const;
+
+                /*!
+                 * @brief This function returns a reference to member sample_lost_status
+                 * @return Reference to member sample_lost_status
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::SampleLostStatus_s& sample_lost_status();
+
+
+                /*!
+                 * @brief This function sets a value in member statuses_size
+                 * @param _statuses_size New value for member statuses_size
+                 */
+                eProsima_user_DllExport void statuses_size(
+                        uint8_t _statuses_size);
+
+                /*!
+                 * @brief This function returns the value of member statuses_size
+                 * @return Value of member statuses_size
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport uint8_t statuses_size() const;
+
+                /*!
+                 * @brief This function returns a reference to member statuses_size
+                 * @return Reference to member statuses_size
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport uint8_t& statuses_size();
+
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::MonitorServiceData& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+            private:
+
+                eprosima::fastdds::statistics::StatusKind m__d;
+
+                std::vector<uint8_t> m_entity_proxy;
+                std::vector<eprosima::fastdds::statistics::Connection> m_connection_list;
+                eprosima::fastdds::statistics::IncompatibleQoSStatus_s m_incompatible_qos_status;
+                eprosima::fastdds::statistics::InconsistentTopicStatus_s m_inconsistent_topic_status;
+                eprosima::fastdds::statistics::LivelinessLostStatus_s m_liveliness_lost_status;
+                eprosima::fastdds::statistics::LivelinessChangedStatus_s m_liveliness_changed_status;
+                eprosima::fastdds::statistics::DeadlineMissedStatus_s m_deadline_missed_status;
+                eprosima::fastdds::statistics::SampleLostStatus_s m_sample_lost_status;
+                uint8_t m_statuses_size;
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure MonitorServiceStatusData defined by the user in the IDL file.
+             * @ingroup monitorservice_types
+             */
+            class MonitorServiceStatusData
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport MonitorServiceStatusData();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~MonitorServiceStatusData();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceStatusData that will be copied.
+                 */
+                eProsima_user_DllExport MonitorServiceStatusData(
+                        const MonitorServiceStatusData& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceStatusData that will be copied.
+                 */
+                eProsima_user_DllExport MonitorServiceStatusData(
+                        MonitorServiceStatusData&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceStatusData that will be copied.
+                 */
+                eProsima_user_DllExport MonitorServiceStatusData& operator =(
+                        const MonitorServiceStatusData& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::MonitorServiceStatusData that will be copied.
+                 */
+                eProsima_user_DllExport MonitorServiceStatusData& operator =(
+                        MonitorServiceStatusData&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::MonitorServiceStatusData object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const MonitorServiceStatusData& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::MonitorServiceStatusData object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const MonitorServiceStatusData& x) const;
+
+                /*!
+                 * @brief This function copies the value in member local_entity
+                 * @param _local_entity New value to be copied in member local_entity
+                 */
+                eProsima_user_DllExport void local_entity(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _local_entity);
+
+                /*!
+                 * @brief This function moves the value in member local_entity
+                 * @param _local_entity New value to be moved in member local_entity
+                 */
+                eProsima_user_DllExport void local_entity(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _local_entity);
+
+                /*!
+                 * @brief This function returns a constant reference to member local_entity
+                 * @return Constant reference to member local_entity
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& local_entity() const;
+
+                /*!
+                 * @brief This function returns a reference to member local_entity
+                 * @return Reference to member local_entity
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& local_entity();
+
+
+                /*!
+                 * @brief This function sets a value in member status_kind
+                 * @param _status_kind New value for member status_kind
+                 */
+                eProsima_user_DllExport void status_kind(
+                        eprosima::fastdds::statistics::StatusKind _status_kind);
+
+                /*!
+                 * @brief This function returns the value of member status_kind
+                 * @return Value of member status_kind
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::StatusKind status_kind() const;
+
+                /*!
+                 * @brief This function returns a reference to member status_kind
+                 * @return Reference to member status_kind
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::StatusKind& status_kind();
+
+
+                /*!
+                 * @brief This function copies the value in member value
+                 * @param _value New value to be copied in member value
+                 */
+                eProsima_user_DllExport void value(
+                        const eprosima::fastdds::statistics::MonitorServiceData& _value);
+
+                /*!
+                 * @brief This function moves the value in member value
+                 * @param _value New value to be moved in member value
+                 */
+                eProsima_user_DllExport void value(
+                        eprosima::fastdds::statistics::MonitorServiceData&& _value);
+
+                /*!
+                 * @brief This function returns a constant reference to member value
+                 * @return Constant reference to member value
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::MonitorServiceData& value() const;
+
+                /*!
+                 * @brief This function returns a reference to member value
+                 * @return Reference to member value
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::MonitorServiceData& value();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::MonitorServiceStatusData& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::GUID_s m_local_entity;
+                eprosima::fastdds::statistics::StatusKind m_status_kind;
+                eprosima::fastdds::statistics::MonitorServiceData m_value;
+
+            };
 
 }         // namespace statistics
 }     // namespace fastdds
diff --git a/src/cpp/statistics/types/typesPubSubTypes.h b/src/cpp/statistics/types/typesPubSubTypes.h
index 33e545416c8..4cee82044c4 100644
--- a/src/cpp/statistics/types/typesPubSubTypes.h
+++ b/src/cpp/statistics/types/typesPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "types.h"
 
@@ -37,1283 +37,1279 @@
     Generated types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
 #endif  // GEN_API_VER
 
-namespace eprosima
-{
-    namespace fastdds
-    {
-        namespace statistics
-        {
-            namespace detail
-            {
+namespace eprosima {
+namespace fastdds {
+namespace statistics {
+namespace detail {
 
 
 
-                /*!
-                 * @brief This class represents the TopicDataType of the type EntityId_s defined by the user in the IDL file.
-                 * @ingroup types
-                 */
-                class EntityId_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-                {
-                public:
+/*!
+ * @brief This class represents the TopicDataType of the type EntityId_s defined by the user in the IDL file.
+ * @ingroup types
+ */
+class EntityId_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                    typedef EntityId_s type;
+    typedef EntityId_s type;
 
-                    eProsima_user_DllExport EntityId_sPubSubType();
+    eProsima_user_DllExport EntityId_sPubSubType();
 
-                    eProsima_user_DllExport ~EntityId_sPubSubType() override;
+    eProsima_user_DllExport ~EntityId_sPubSubType() override;
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                    {
-                        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool deserialize(
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data) override
-                    {
-                        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool getKey(
-                            void* data,
-                            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                            bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                    eProsima_user_DllExport void deleteData(
-                            void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                    eProsima_user_DllExport inline bool is_bounded() const override
-                    {
-                        return true;
-                    }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                    eProsima_user_DllExport inline bool is_plain() const override
-                    {
-                        return false;
-                    }
-
-                    eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                    {
-                        static_cast<void>(data_representation);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                    eProsima_user_DllExport inline bool construct_sample(
-                            void* memory) const override
-                    {
-                        static_cast<void>(memory);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
-                    unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-                };
+};
 
 
 
-                /*!
-                 * @brief This class represents the TopicDataType of the type GuidPrefix_s defined by the user in the IDL file.
-                 * @ingroup types
-                 */
-                class GuidPrefix_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-                {
-                public:
+/*!
+ * @brief This class represents the TopicDataType of the type GuidPrefix_s defined by the user in the IDL file.
+ * @ingroup types
+ */
+class GuidPrefix_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                    typedef GuidPrefix_s type;
+    typedef GuidPrefix_s type;
 
-                    eProsima_user_DllExport GuidPrefix_sPubSubType();
+    eProsima_user_DllExport GuidPrefix_sPubSubType();
 
-                    eProsima_user_DllExport ~GuidPrefix_sPubSubType() override;
+    eProsima_user_DllExport ~GuidPrefix_sPubSubType() override;
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                    {
-                        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool deserialize(
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data) override
-                    {
-                        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool getKey(
-                            void* data,
-                            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                            bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                    eProsima_user_DllExport void deleteData(
-                            void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                    eProsima_user_DllExport inline bool is_bounded() const override
-                    {
-                        return true;
-                    }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                    eProsima_user_DllExport inline bool is_plain() const override
-                    {
-                        return false;
-                    }
-
-                    eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                    {
-                        static_cast<void>(data_representation);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                    eProsima_user_DllExport inline bool construct_sample(
-                            void* memory) const override
-                    {
-                        static_cast<void>(memory);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
-                    unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-                };
+};
 
 
 
-                /*!
-                 * @brief This class represents the TopicDataType of the type GUID_s defined by the user in the IDL file.
-                 * @ingroup types
-                 */
-                class GUID_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-                {
-                public:
+/*!
+ * @brief This class represents the TopicDataType of the type GUID_s defined by the user in the IDL file.
+ * @ingroup types
+ */
+class GUID_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                    typedef GUID_s type;
+    typedef GUID_s type;
 
-                    eProsima_user_DllExport GUID_sPubSubType();
+    eProsima_user_DllExport GUID_sPubSubType();
 
-                    eProsima_user_DllExport ~GUID_sPubSubType() override;
+    eProsima_user_DllExport ~GUID_sPubSubType() override;
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                    {
-                        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool deserialize(
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data) override
-                    {
-                        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool getKey(
-                            void* data,
-                            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                            bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                    eProsima_user_DllExport void deleteData(
-                            void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                    eProsima_user_DllExport inline bool is_bounded() const override
-                    {
-                        return true;
-                    }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                    eProsima_user_DllExport inline bool is_plain() const override
-                    {
-                        return false;
-                    }
-
-                    eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                    {
-                        static_cast<void>(data_representation);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                    eProsima_user_DllExport inline bool construct_sample(
-                            void* memory) const override
-                    {
-                        static_cast<void>(memory);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
-                    unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-                };
+};
 
 
 
-                /*!
-                 * @brief This class represents the TopicDataType of the type SequenceNumber_s defined by the user in the IDL file.
-                 * @ingroup types
-                 */
-                class SequenceNumber_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-                {
-                public:
+/*!
+ * @brief This class represents the TopicDataType of the type SequenceNumber_s defined by the user in the IDL file.
+ * @ingroup types
+ */
+class SequenceNumber_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                    typedef SequenceNumber_s type;
+    typedef SequenceNumber_s type;
 
-                    eProsima_user_DllExport SequenceNumber_sPubSubType();
+    eProsima_user_DllExport SequenceNumber_sPubSubType();
 
-                    eProsima_user_DllExport ~SequenceNumber_sPubSubType() override;
+    eProsima_user_DllExport ~SequenceNumber_sPubSubType() override;
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                    {
-                        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool deserialize(
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data) override
-                    {
-                        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool getKey(
-                            void* data,
-                            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                            bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                    eProsima_user_DllExport void deleteData(
-                            void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                    eProsima_user_DllExport inline bool is_bounded() const override
-                    {
-                        return true;
-                    }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                    eProsima_user_DllExport inline bool is_plain() const override
-                    {
-                        return false;
-                    }
-
-                    eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                    {
-                        static_cast<void>(data_representation);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                    eProsima_user_DllExport inline bool construct_sample(
-                            void* memory) const override
-                    {
-                        static_cast<void>(memory);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
-                    unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-                };
+};
 
 
 
-                /*!
-                 * @brief This class represents the TopicDataType of the type SampleIdentity_s defined by the user in the IDL file.
-                 * @ingroup types
-                 */
-                class SampleIdentity_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-                {
-                public:
+/*!
+ * @brief This class represents the TopicDataType of the type SampleIdentity_s defined by the user in the IDL file.
+ * @ingroup types
+ */
+class SampleIdentity_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                    typedef SampleIdentity_s type;
+    typedef SampleIdentity_s type;
 
-                    eProsima_user_DllExport SampleIdentity_sPubSubType();
+    eProsima_user_DllExport SampleIdentity_sPubSubType();
 
-                    eProsima_user_DllExport ~SampleIdentity_sPubSubType() override;
+    eProsima_user_DllExport ~SampleIdentity_sPubSubType() override;
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                    {
-                        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool deserialize(
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data) override
-                    {
-                        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool getKey(
-                            void* data,
-                            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                            bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                    eProsima_user_DllExport void deleteData(
-                            void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                    eProsima_user_DllExport inline bool is_bounded() const override
-                    {
-                        return true;
-                    }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                    eProsima_user_DllExport inline bool is_plain() const override
-                    {
-                        return false;
-                    }
-
-                    eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                    {
-                        static_cast<void>(data_representation);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                    eProsima_user_DllExport inline bool construct_sample(
-                            void* memory) const override
-                    {
-                        static_cast<void>(memory);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
-                    unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-                };
+};
 
 
 
-                /*!
-                 * @brief This class represents the TopicDataType of the type Locator_s defined by the user in the IDL file.
-                 * @ingroup types
-                 */
-                class Locator_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-                {
-                public:
+/*!
+ * @brief This class represents the TopicDataType of the type Locator_s defined by the user in the IDL file.
+ * @ingroup types
+ */
+class Locator_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                    typedef Locator_s type;
+    typedef Locator_s type;
 
-                    eProsima_user_DllExport Locator_sPubSubType();
+    eProsima_user_DllExport Locator_sPubSubType();
 
-                    eProsima_user_DllExport ~Locator_sPubSubType() override;
+    eProsima_user_DllExport ~Locator_sPubSubType() override;
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                    {
-                        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool deserialize(
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data) override
-                    {
-                        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool getKey(
-                            void* data,
-                            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                            bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                    eProsima_user_DllExport void deleteData(
-                            void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                    eProsima_user_DllExport inline bool is_bounded() const override
-                    {
-                        return true;
-                    }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                    eProsima_user_DllExport inline bool is_plain() const override
-                    {
-                        return false;
-                    }
-
-                    eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                    {
-                        static_cast<void>(data_representation);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                    eProsima_user_DllExport inline bool construct_sample(
-                            void* memory) const override
-                    {
-                        static_cast<void>(memory);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
-                    unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-                };
-            }
+};
+} // namespace detail
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type DiscoveryTime defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class DiscoveryTimePubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type DiscoveryTime defined by the user in the IDL file.
+ * @ingroup types
+ */
+class DiscoveryTimePubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef DiscoveryTime type;
+    typedef DiscoveryTime type;
 
-                eProsima_user_DllExport DiscoveryTimePubSubType();
+    eProsima_user_DllExport DiscoveryTimePubSubType();
 
-                eProsima_user_DllExport ~DiscoveryTimePubSubType() override;
+    eProsima_user_DllExport ~DiscoveryTimePubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type EntityCount defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class EntityCountPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type EntityCount defined by the user in the IDL file.
+ * @ingroup types
+ */
+class EntityCountPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef EntityCount type;
+    typedef EntityCount type;
 
-                eProsima_user_DllExport EntityCountPubSubType();
+    eProsima_user_DllExport EntityCountPubSubType();
 
-                eProsima_user_DllExport ~EntityCountPubSubType() override;
+    eProsima_user_DllExport ~EntityCountPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type SampleIdentityCount defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class SampleIdentityCountPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type SampleIdentityCount defined by the user in the IDL file.
+ * @ingroup types
+ */
+class SampleIdentityCountPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef SampleIdentityCount type;
+    typedef SampleIdentityCount type;
 
-                eProsima_user_DllExport SampleIdentityCountPubSubType();
+    eProsima_user_DllExport SampleIdentityCountPubSubType();
 
-                eProsima_user_DllExport ~SampleIdentityCountPubSubType() override;
+    eProsima_user_DllExport ~SampleIdentityCountPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type Entity2LocatorTraffic defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class Entity2LocatorTrafficPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type Entity2LocatorTraffic defined by the user in the IDL file.
+ * @ingroup types
+ */
+class Entity2LocatorTrafficPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef Entity2LocatorTraffic type;
+    typedef Entity2LocatorTraffic type;
 
-                eProsima_user_DllExport Entity2LocatorTrafficPubSubType();
+    eProsima_user_DllExport Entity2LocatorTrafficPubSubType();
 
-                eProsima_user_DllExport ~Entity2LocatorTrafficPubSubType() override;
+    eProsima_user_DllExport ~Entity2LocatorTrafficPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type WriterReaderData defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class WriterReaderDataPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type WriterReaderData defined by the user in the IDL file.
+ * @ingroup types
+ */
+class WriterReaderDataPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef WriterReaderData type;
+    typedef WriterReaderData type;
 
-                eProsima_user_DllExport WriterReaderDataPubSubType();
+    eProsima_user_DllExport WriterReaderDataPubSubType();
 
-                eProsima_user_DllExport ~WriterReaderDataPubSubType() override;
+    eProsima_user_DllExport ~WriterReaderDataPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type Locator2LocatorData defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class Locator2LocatorDataPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type Locator2LocatorData defined by the user in the IDL file.
+ * @ingroup types
+ */
+class Locator2LocatorDataPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef Locator2LocatorData type;
+    typedef Locator2LocatorData type;
 
-                eProsima_user_DllExport Locator2LocatorDataPubSubType();
+    eProsima_user_DllExport Locator2LocatorDataPubSubType();
 
-                eProsima_user_DllExport ~Locator2LocatorDataPubSubType() override;
+    eProsima_user_DllExport ~Locator2LocatorDataPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type EntityData defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class EntityDataPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type EntityData defined by the user in the IDL file.
+ * @ingroup types
+ */
+class EntityDataPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef EntityData type;
+    typedef EntityData type;
 
-                eProsima_user_DllExport EntityDataPubSubType();
+    eProsima_user_DllExport EntityDataPubSubType();
 
-                eProsima_user_DllExport ~EntityDataPubSubType() override;
+    eProsima_user_DllExport ~EntityDataPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type PhysicalData defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class PhysicalDataPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type PhysicalData defined by the user in the IDL file.
+ * @ingroup types
+ */
+class PhysicalDataPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef PhysicalData type;
+    typedef PhysicalData type;
 
-                eProsima_user_DllExport PhysicalDataPubSubType();
+    eProsima_user_DllExport PhysicalDataPubSubType();
 
-                eProsima_user_DllExport ~PhysicalDataPubSubType() override;
+    eProsima_user_DllExport ~PhysicalDataPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
 
 
-        }
-    }
-}
+} // namespace statistics
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_H_
 
diff --git a/src/cpp/statistics/types/typesv1.h b/src/cpp/statistics/types/typesv1.h
index ab41589a322..ab918b661cc 100644
--- a/src/cpp/statistics/types/typesv1.h
+++ b/src/cpp/statistics/types/typesv1.h
@@ -70,3002 +70,3020 @@ class Cdr;
 
 
 namespace eprosima {
-namespace fastdds {
-namespace statistics {
-namespace detail {
-
-
-/*!
- * @brief This class represents the structure EntityId_s defined by the user in the IDL file.
- * @ingroup types
- */
-class EntityId_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport EntityId_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~EntityId_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
-     */
-    eProsima_user_DllExport EntityId_s(
-            const EntityId_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
-     */
-    eProsima_user_DllExport EntityId_s(
-            EntityId_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
-     */
-    eProsima_user_DllExport EntityId_s& operator =(
-            const EntityId_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
-     */
-    eProsima_user_DllExport EntityId_s& operator =(
-            EntityId_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::EntityId_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const EntityId_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::EntityId_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const EntityId_s& x) const;
-
-    /*!
-     * @brief This function copies the value in member value
-     * @param _value New value to be copied in member value
-     */
-    eProsima_user_DllExport void value(
-            const std::array<uint8_t, 4>& _value);
-
-    /*!
-     * @brief This function moves the value in member value
-     * @param _value New value to be moved in member value
-     */
-    eProsima_user_DllExport void value(
-            std::array<uint8_t, 4>&& _value);
-
-    /*!
-     * @brief This function returns a constant reference to member value
-     * @return Constant reference to member value
-     */
-    eProsima_user_DllExport const std::array<uint8_t, 4>& value() const;
-
-    /*!
-     * @brief This function returns a reference to member value
-     * @return Reference to member value
-     */
-    eProsima_user_DllExport std::array<uint8_t, 4>& value();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::detail::EntityId_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    std::array<uint8_t, 4> m_value;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure GuidPrefix_s defined by the user in the IDL file.
- * @ingroup types
- */
-class GuidPrefix_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport GuidPrefix_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~GuidPrefix_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
-     */
-    eProsima_user_DllExport GuidPrefix_s(
-            const GuidPrefix_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
-     */
-    eProsima_user_DllExport GuidPrefix_s(
-            GuidPrefix_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
-     */
-    eProsima_user_DllExport GuidPrefix_s& operator =(
-            const GuidPrefix_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
-     */
-    eProsima_user_DllExport GuidPrefix_s& operator =(
-            GuidPrefix_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::GuidPrefix_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const GuidPrefix_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::GuidPrefix_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const GuidPrefix_s& x) const;
-
-    /*!
-     * @brief This function copies the value in member value
-     * @param _value New value to be copied in member value
-     */
-    eProsima_user_DllExport void value(
-            const std::array<uint8_t, 12>& _value);
-
-    /*!
-     * @brief This function moves the value in member value
-     * @param _value New value to be moved in member value
-     */
-    eProsima_user_DllExport void value(
-            std::array<uint8_t, 12>&& _value);
-
-    /*!
-     * @brief This function returns a constant reference to member value
-     * @return Constant reference to member value
-     */
-    eProsima_user_DllExport const std::array<uint8_t, 12>& value() const;
-
-    /*!
-     * @brief This function returns a reference to member value
-     * @return Reference to member value
-     */
-    eProsima_user_DllExport std::array<uint8_t, 12>& value();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::detail::GuidPrefix_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    std::array<uint8_t, 12> m_value;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure GUID_s defined by the user in the IDL file.
- * @ingroup types
- */
-class GUID_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport GUID_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~GUID_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
-     */
-    eProsima_user_DllExport GUID_s(
-            const GUID_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
-     */
-    eProsima_user_DllExport GUID_s(
-            GUID_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
-     */
-    eProsima_user_DllExport GUID_s& operator =(
-            const GUID_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
-     */
-    eProsima_user_DllExport GUID_s& operator =(
-            GUID_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::GUID_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const GUID_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::GUID_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const GUID_s& x) const;
-
-    /*!
-     * @brief This function copies the value in member guidPrefix
-     * @param _guidPrefix New value to be copied in member guidPrefix
-     */
-    eProsima_user_DllExport void guidPrefix(
-            const eprosima::fastdds::statistics::detail::GuidPrefix_s& _guidPrefix);
-
-    /*!
-     * @brief This function moves the value in member guidPrefix
-     * @param _guidPrefix New value to be moved in member guidPrefix
-     */
-    eProsima_user_DllExport void guidPrefix(
-            eprosima::fastdds::statistics::detail::GuidPrefix_s&& _guidPrefix);
-
-    /*!
-     * @brief This function returns a constant reference to member guidPrefix
-     * @return Constant reference to member guidPrefix
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GuidPrefix_s& guidPrefix() const;
-
-    /*!
-     * @brief This function returns a reference to member guidPrefix
-     * @return Reference to member guidPrefix
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GuidPrefix_s& guidPrefix();
-
-
-    /*!
-     * @brief This function copies the value in member entityId
-     * @param _entityId New value to be copied in member entityId
-     */
-    eProsima_user_DllExport void entityId(
-            const eprosima::fastdds::statistics::detail::EntityId_s& _entityId);
-
-    /*!
-     * @brief This function moves the value in member entityId
-     * @param _entityId New value to be moved in member entityId
-     */
-    eProsima_user_DllExport void entityId(
-            eprosima::fastdds::statistics::detail::EntityId_s&& _entityId);
-
-    /*!
-     * @brief This function returns a constant reference to member entityId
-     * @return Constant reference to member entityId
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::EntityId_s& entityId() const;
-
-    /*!
-     * @brief This function returns a reference to member entityId
-     * @return Reference to member entityId
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::EntityId_s& entityId();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::detail::GUID_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GuidPrefix_s m_guidPrefix;
-    eprosima::fastdds::statistics::detail::EntityId_s m_entityId;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure SequenceNumber_s defined by the user in the IDL file.
- * @ingroup types
- */
-class SequenceNumber_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport SequenceNumber_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~SequenceNumber_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
-     */
-    eProsima_user_DllExport SequenceNumber_s(
-            const SequenceNumber_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
-     */
-    eProsima_user_DllExport SequenceNumber_s(
-            SequenceNumber_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
-     */
-    eProsima_user_DllExport SequenceNumber_s& operator =(
-            const SequenceNumber_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
-     */
-    eProsima_user_DllExport SequenceNumber_s& operator =(
-            SequenceNumber_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::SequenceNumber_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const SequenceNumber_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::SequenceNumber_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const SequenceNumber_s& x) const;
-
-    /*!
-     * @brief This function sets a value in member high
-     * @param _high New value for member high
-     */
-    eProsima_user_DllExport void high(
-            int32_t _high);
-
-    /*!
-     * @brief This function returns the value of member high
-     * @return Value of member high
-     */
-    eProsima_user_DllExport int32_t high() const;
-
-    /*!
-     * @brief This function returns a reference to member high
-     * @return Reference to member high
-     */
-    eProsima_user_DllExport int32_t& high();
-
-
-    /*!
-     * @brief This function sets a value in member low
-     * @param _low New value for member low
-     */
-    eProsima_user_DllExport void low(
-            uint32_t _low);
-
-    /*!
-     * @brief This function returns the value of member low
-     * @return Value of member low
-     */
-    eProsima_user_DllExport uint32_t low() const;
-
-    /*!
-     * @brief This function returns a reference to member low
-     * @return Reference to member low
-     */
-    eProsima_user_DllExport uint32_t& low();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::detail::SequenceNumber_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    int32_t m_high;
-    uint32_t m_low;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure SampleIdentity_s defined by the user in the IDL file.
- * @ingroup types
- */
-class SampleIdentity_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport SampleIdentity_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~SampleIdentity_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentity_s(
-            const SampleIdentity_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentity_s(
-            SampleIdentity_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentity_s& operator =(
-            const SampleIdentity_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentity_s& operator =(
-            SampleIdentity_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::SampleIdentity_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const SampleIdentity_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::SampleIdentity_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const SampleIdentity_s& x) const;
-
-    /*!
-     * @brief This function copies the value in member writer_guid
-     * @param _writer_guid New value to be copied in member writer_guid
-     */
-    eProsima_user_DllExport void writer_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _writer_guid);
-
-    /*!
-     * @brief This function moves the value in member writer_guid
-     * @param _writer_guid New value to be moved in member writer_guid
-     */
-    eProsima_user_DllExport void writer_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _writer_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member writer_guid
-     * @return Constant reference to member writer_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& writer_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member writer_guid
-     * @return Reference to member writer_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& writer_guid();
-
-
-    /*!
-     * @brief This function copies the value in member sequence_number
-     * @param _sequence_number New value to be copied in member sequence_number
-     */
-    eProsima_user_DllExport void sequence_number(
-            const eprosima::fastdds::statistics::detail::SequenceNumber_s& _sequence_number);
-
-    /*!
-     * @brief This function moves the value in member sequence_number
-     * @param _sequence_number New value to be moved in member sequence_number
-     */
-    eProsima_user_DllExport void sequence_number(
-            eprosima::fastdds::statistics::detail::SequenceNumber_s&& _sequence_number);
-
-    /*!
-     * @brief This function returns a constant reference to member sequence_number
-     * @return Constant reference to member sequence_number
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::SequenceNumber_s& sequence_number() const;
-
-    /*!
-     * @brief This function returns a reference to member sequence_number
-     * @return Reference to member sequence_number
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::SequenceNumber_s& sequence_number();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::detail::SampleIdentity_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_writer_guid;
-    eprosima::fastdds::statistics::detail::SequenceNumber_s m_sequence_number;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure Locator_s defined by the user in the IDL file.
- * @ingroup types
- */
-class Locator_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport Locator_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~Locator_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
-     */
-    eProsima_user_DllExport Locator_s(
-            const Locator_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
-     */
-    eProsima_user_DllExport Locator_s(
-            Locator_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
-     */
-    eProsima_user_DllExport Locator_s& operator =(
-            const Locator_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
-     */
-    eProsima_user_DllExport Locator_s& operator =(
-            Locator_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::Locator_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const Locator_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::Locator_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const Locator_s& x) const;
-
-    /*!
-     * @brief This function sets a value in member kind
-     * @param _kind New value for member kind
-     */
-    eProsima_user_DllExport void kind(
-            int32_t _kind);
-
-    /*!
-     * @brief This function returns the value of member kind
-     * @return Value of member kind
-     */
-    eProsima_user_DllExport int32_t kind() const;
-
-    /*!
-     * @brief This function returns a reference to member kind
-     * @return Reference to member kind
-     */
-    eProsima_user_DllExport int32_t& kind();
-
-
-    /*!
-     * @brief This function sets a value in member port
-     * @param _port New value for member port
-     */
-    eProsima_user_DllExport void port(
-            uint32_t _port);
-
-    /*!
-     * @brief This function returns the value of member port
-     * @return Value of member port
-     */
-    eProsima_user_DllExport uint32_t port() const;
-
-    /*!
-     * @brief This function returns a reference to member port
-     * @return Reference to member port
-     */
-    eProsima_user_DllExport uint32_t& port();
-
-
-    /*!
-     * @brief This function copies the value in member address
-     * @param _address New value to be copied in member address
-     */
-    eProsima_user_DllExport void address(
-            const std::array<uint8_t, 16>& _address);
-
-    /*!
-     * @brief This function moves the value in member address
-     * @param _address New value to be moved in member address
-     */
-    eProsima_user_DllExport void address(
-            std::array<uint8_t, 16>&& _address);
-
-    /*!
-     * @brief This function returns a constant reference to member address
-     * @return Constant reference to member address
-     */
-    eProsima_user_DllExport const std::array<uint8_t, 16>& address() const;
-
-    /*!
-     * @brief This function returns a reference to member address
-     * @return Reference to member address
-     */
-    eProsima_user_DllExport std::array<uint8_t, 16>& address();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::detail::Locator_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    int32_t m_kind;
-    uint32_t m_port;
-    std::array<uint8_t, 16> m_address;
-
-};
-
-}             // namespace detail
-
-
-/*!
- * @brief This class represents the structure DiscoveryTime defined by the user in the IDL file.
- * @ingroup types
- */
-class DiscoveryTime
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport DiscoveryTime();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~DiscoveryTime();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
-     */
-    eProsima_user_DllExport DiscoveryTime(
-            const DiscoveryTime& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
-     */
-    eProsima_user_DllExport DiscoveryTime(
-            DiscoveryTime&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
-     */
-    eProsima_user_DllExport DiscoveryTime& operator =(
-            const DiscoveryTime& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
-     */
-    eProsima_user_DllExport DiscoveryTime& operator =(
-            DiscoveryTime&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::DiscoveryTime object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const DiscoveryTime& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::DiscoveryTime object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const DiscoveryTime& x) const;
-
-    /*!
-     * @brief This function copies the value in member local_participant_guid
-     * @param _local_participant_guid New value to be copied in member local_participant_guid
-     */
-    eProsima_user_DllExport void local_participant_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _local_participant_guid);
-
-    /*!
-     * @brief This function moves the value in member local_participant_guid
-     * @param _local_participant_guid New value to be moved in member local_participant_guid
-     */
-    eProsima_user_DllExport void local_participant_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _local_participant_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member local_participant_guid
-     * @return Constant reference to member local_participant_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& local_participant_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member local_participant_guid
-     * @return Reference to member local_participant_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& local_participant_guid();
-
-
-    /*!
-     * @brief This function copies the value in member remote_entity_guid
-     * @param _remote_entity_guid New value to be copied in member remote_entity_guid
-     */
-    eProsima_user_DllExport void remote_entity_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _remote_entity_guid);
-
-    /*!
-     * @brief This function moves the value in member remote_entity_guid
-     * @param _remote_entity_guid New value to be moved in member remote_entity_guid
-     */
-    eProsima_user_DllExport void remote_entity_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _remote_entity_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member remote_entity_guid
-     * @return Constant reference to member remote_entity_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& remote_entity_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member remote_entity_guid
-     * @return Reference to member remote_entity_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& remote_entity_guid();
-
-
-    /*!
-     * @brief This function sets a value in member time
-     * @param _time New value for member time
-     */
-    eProsima_user_DllExport void time(
-            uint64_t _time);
-
-    /*!
-     * @brief This function returns the value of member time
-     * @return Value of member time
-     */
-    eProsima_user_DllExport uint64_t time() const;
-
-    /*!
-     * @brief This function returns a reference to member time
-     * @return Reference to member time
-     */
-    eProsima_user_DllExport uint64_t& time();
-
-
-    /*!
-     * @brief This function copies the value in member host
-     * @param _host New value to be copied in member host
-     */
-    eProsima_user_DllExport void host(
-            const std::string& _host);
-
-    /*!
-     * @brief This function moves the value in member host
-     * @param _host New value to be moved in member host
-     */
-    eProsima_user_DllExport void host(
-            std::string&& _host);
-
-    /*!
-     * @brief This function returns a constant reference to member host
-     * @return Constant reference to member host
-     */
-    eProsima_user_DllExport const std::string& host() const;
-
-    /*!
-     * @brief This function returns a reference to member host
-     * @return Reference to member host
-     */
-    eProsima_user_DllExport std::string& host();
-
-
-    /*!
-     * @brief This function copies the value in member user
-     * @param _user New value to be copied in member user
-     */
-    eProsima_user_DllExport void user(
-            const std::string& _user);
-
-    /*!
-     * @brief This function moves the value in member user
-     * @param _user New value to be moved in member user
-     */
-    eProsima_user_DllExport void user(
-            std::string&& _user);
-
-    /*!
-     * @brief This function returns a constant reference to member user
-     * @return Constant reference to member user
-     */
-    eProsima_user_DllExport const std::string& user() const;
-
-    /*!
-     * @brief This function returns a reference to member user
-     * @return Reference to member user
-     */
-    eProsima_user_DllExport std::string& user();
-
-
-    /*!
-     * @brief This function copies the value in member process
-     * @param _process New value to be copied in member process
-     */
-    eProsima_user_DllExport void process(
-            const std::string& _process);
-
-    /*!
-     * @brief This function moves the value in member process
-     * @param _process New value to be moved in member process
-     */
-    eProsima_user_DllExport void process(
-            std::string&& _process);
-
-    /*!
-     * @brief This function returns a constant reference to member process
-     * @return Constant reference to member process
-     */
-    eProsima_user_DllExport const std::string& process() const;
-
-    /*!
-     * @brief This function returns a reference to member process
-     * @return Reference to member process
-     */
-    eProsima_user_DllExport std::string& process();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::DiscoveryTime& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_local_participant_guid;
-    eprosima::fastdds::statistics::detail::GUID_s m_remote_entity_guid;
-    uint64_t m_time;
-    std::string m_host;
-    std::string m_user;
-    std::string m_process;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure EntityCount defined by the user in the IDL file.
- * @ingroup types
- */
-class EntityCount
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport EntityCount();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~EntityCount();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
-     */
-    eProsima_user_DllExport EntityCount(
-            const EntityCount& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
-     */
-    eProsima_user_DllExport EntityCount(
-            EntityCount&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
-     */
-    eProsima_user_DllExport EntityCount& operator =(
-            const EntityCount& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
-     */
-    eProsima_user_DllExport EntityCount& operator =(
-            EntityCount&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::EntityCount object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const EntityCount& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::EntityCount object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const EntityCount& x) const;
-
-    /*!
-     * @brief This function copies the value in member guid
-     * @param _guid New value to be copied in member guid
-     */
-    eProsima_user_DllExport void guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _guid);
-
-    /*!
-     * @brief This function moves the value in member guid
-     * @param _guid New value to be moved in member guid
-     */
-    eProsima_user_DllExport void guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _guid);
-
-    /*!
-     * @brief This function returns a constant reference to member guid
-     * @return Constant reference to member guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& guid() const;
-
-    /*!
-     * @brief This function returns a reference to member guid
-     * @return Reference to member guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& guid();
-
-
-    /*!
-     * @brief This function sets a value in member count
-     * @param _count New value for member count
-     */
-    eProsima_user_DllExport void count(
-            uint64_t _count);
-
-    /*!
-     * @brief This function returns the value of member count
-     * @return Value of member count
-     */
-    eProsima_user_DllExport uint64_t count() const;
-
-    /*!
-     * @brief This function returns a reference to member count
-     * @return Reference to member count
-     */
-    eProsima_user_DllExport uint64_t& count();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::EntityCount& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_guid;
-    uint64_t m_count;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure SampleIdentityCount defined by the user in the IDL file.
- * @ingroup types
- */
-class SampleIdentityCount
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport SampleIdentityCount();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~SampleIdentityCount();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentityCount(
-            const SampleIdentityCount& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentityCount(
-            SampleIdentityCount&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentityCount& operator =(
-            const SampleIdentityCount& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentityCount& operator =(
-            SampleIdentityCount&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::SampleIdentityCount object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const SampleIdentityCount& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::SampleIdentityCount object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const SampleIdentityCount& x) const;
-
-    /*!
-     * @brief This function copies the value in member sample_id
-     * @param _sample_id New value to be copied in member sample_id
-     */
-    eProsima_user_DllExport void sample_id(
-            const eprosima::fastdds::statistics::detail::SampleIdentity_s& _sample_id);
-
-    /*!
-     * @brief This function moves the value in member sample_id
-     * @param _sample_id New value to be moved in member sample_id
-     */
-    eProsima_user_DllExport void sample_id(
-            eprosima::fastdds::statistics::detail::SampleIdentity_s&& _sample_id);
-
-    /*!
-     * @brief This function returns a constant reference to member sample_id
-     * @return Constant reference to member sample_id
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::SampleIdentity_s& sample_id() const;
-
-    /*!
-     * @brief This function returns a reference to member sample_id
-     * @return Reference to member sample_id
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::SampleIdentity_s& sample_id();
-
-
-    /*!
-     * @brief This function sets a value in member count
-     * @param _count New value for member count
-     */
-    eProsima_user_DllExport void count(
-            uint64_t _count);
-
-    /*!
-     * @brief This function returns the value of member count
-     * @return Value of member count
-     */
-    eProsima_user_DllExport uint64_t count() const;
-
-    /*!
-     * @brief This function returns a reference to member count
-     * @return Reference to member count
-     */
-    eProsima_user_DllExport uint64_t& count();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::SampleIdentityCount& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::SampleIdentity_s m_sample_id;
-    uint64_t m_count;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure Entity2LocatorTraffic defined by the user in the IDL file.
- * @ingroup types
- */
-class Entity2LocatorTraffic
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport Entity2LocatorTraffic();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~Entity2LocatorTraffic();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
-     */
-    eProsima_user_DllExport Entity2LocatorTraffic(
-            const Entity2LocatorTraffic& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
-     */
-    eProsima_user_DllExport Entity2LocatorTraffic(
-            Entity2LocatorTraffic&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
-     */
-    eProsima_user_DllExport Entity2LocatorTraffic& operator =(
-            const Entity2LocatorTraffic& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
-     */
-    eProsima_user_DllExport Entity2LocatorTraffic& operator =(
-            Entity2LocatorTraffic&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Entity2LocatorTraffic object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const Entity2LocatorTraffic& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Entity2LocatorTraffic object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const Entity2LocatorTraffic& x) const;
-
-    /*!
-     * @brief This function copies the value in member src_guid
-     * @param _src_guid New value to be copied in member src_guid
-     */
-    eProsima_user_DllExport void src_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _src_guid);
-
-    /*!
-     * @brief This function moves the value in member src_guid
-     * @param _src_guid New value to be moved in member src_guid
-     */
-    eProsima_user_DllExport void src_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _src_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member src_guid
-     * @return Constant reference to member src_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& src_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member src_guid
-     * @return Reference to member src_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& src_guid();
-
-
-    /*!
-     * @brief This function copies the value in member dst_locator
-     * @param _dst_locator New value to be copied in member dst_locator
-     */
-    eProsima_user_DllExport void dst_locator(
-            const eprosima::fastdds::statistics::detail::Locator_s& _dst_locator);
-
-    /*!
-     * @brief This function moves the value in member dst_locator
-     * @param _dst_locator New value to be moved in member dst_locator
-     */
-    eProsima_user_DllExport void dst_locator(
-            eprosima::fastdds::statistics::detail::Locator_s&& _dst_locator);
-
-    /*!
-     * @brief This function returns a constant reference to member dst_locator
-     * @return Constant reference to member dst_locator
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::Locator_s& dst_locator() const;
-
-    /*!
-     * @brief This function returns a reference to member dst_locator
-     * @return Reference to member dst_locator
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::Locator_s& dst_locator();
-
-
-    /*!
-     * @brief This function sets a value in member packet_count
-     * @param _packet_count New value for member packet_count
-     */
-    eProsima_user_DllExport void packet_count(
-            uint64_t _packet_count);
-
-    /*!
-     * @brief This function returns the value of member packet_count
-     * @return Value of member packet_count
-     */
-    eProsima_user_DllExport uint64_t packet_count() const;
-
-    /*!
-     * @brief This function returns a reference to member packet_count
-     * @return Reference to member packet_count
-     */
-    eProsima_user_DllExport uint64_t& packet_count();
-
-
-    /*!
-     * @brief This function sets a value in member byte_count
-     * @param _byte_count New value for member byte_count
-     */
-    eProsima_user_DllExport void byte_count(
-            uint64_t _byte_count);
-
-    /*!
-     * @brief This function returns the value of member byte_count
-     * @return Value of member byte_count
-     */
-    eProsima_user_DllExport uint64_t byte_count() const;
-
-    /*!
-     * @brief This function returns a reference to member byte_count
-     * @return Reference to member byte_count
-     */
-    eProsima_user_DllExport uint64_t& byte_count();
-
-
-    /*!
-     * @brief This function sets a value in member byte_magnitude_order
-     * @param _byte_magnitude_order New value for member byte_magnitude_order
-     */
-    eProsima_user_DllExport void byte_magnitude_order(
-            int16_t _byte_magnitude_order);
-
-    /*!
-     * @brief This function returns the value of member byte_magnitude_order
-     * @return Value of member byte_magnitude_order
-     */
-    eProsima_user_DllExport int16_t byte_magnitude_order() const;
-
-    /*!
-     * @brief This function returns a reference to member byte_magnitude_order
-     * @return Reference to member byte_magnitude_order
-     */
-    eProsima_user_DllExport int16_t& byte_magnitude_order();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::Entity2LocatorTraffic& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_src_guid;
-    eprosima::fastdds::statistics::detail::Locator_s m_dst_locator;
-    uint64_t m_packet_count;
-    uint64_t m_byte_count;
-    int16_t m_byte_magnitude_order;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure WriterReaderData defined by the user in the IDL file.
- * @ingroup types
- */
-class WriterReaderData
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport WriterReaderData();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~WriterReaderData();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
-     */
-    eProsima_user_DllExport WriterReaderData(
-            const WriterReaderData& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
-     */
-    eProsima_user_DllExport WriterReaderData(
-            WriterReaderData&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
-     */
-    eProsima_user_DllExport WriterReaderData& operator =(
-            const WriterReaderData& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
-     */
-    eProsima_user_DllExport WriterReaderData& operator =(
-            WriterReaderData&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::WriterReaderData object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const WriterReaderData& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::WriterReaderData object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const WriterReaderData& x) const;
-
-    /*!
-     * @brief This function copies the value in member writer_guid
-     * @param _writer_guid New value to be copied in member writer_guid
-     */
-    eProsima_user_DllExport void writer_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _writer_guid);
-
-    /*!
-     * @brief This function moves the value in member writer_guid
-     * @param _writer_guid New value to be moved in member writer_guid
-     */
-    eProsima_user_DllExport void writer_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _writer_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member writer_guid
-     * @return Constant reference to member writer_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& writer_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member writer_guid
-     * @return Reference to member writer_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& writer_guid();
-
-
-    /*!
-     * @brief This function copies the value in member reader_guid
-     * @param _reader_guid New value to be copied in member reader_guid
-     */
-    eProsima_user_DllExport void reader_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _reader_guid);
-
-    /*!
-     * @brief This function moves the value in member reader_guid
-     * @param _reader_guid New value to be moved in member reader_guid
-     */
-    eProsima_user_DllExport void reader_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _reader_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member reader_guid
-     * @return Constant reference to member reader_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& reader_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member reader_guid
-     * @return Reference to member reader_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& reader_guid();
-
-
-    /*!
-     * @brief This function sets a value in member data
-     * @param _data New value for member data
-     */
-    eProsima_user_DllExport void data(
-            float _data);
-
-    /*!
-     * @brief This function returns the value of member data
-     * @return Value of member data
-     */
-    eProsima_user_DllExport float data() const;
-
-    /*!
-     * @brief This function returns a reference to member data
-     * @return Reference to member data
-     */
-    eProsima_user_DllExport float& data();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::WriterReaderData& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_writer_guid;
-    eprosima::fastdds::statistics::detail::GUID_s m_reader_guid;
-    float m_data;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure Locator2LocatorData defined by the user in the IDL file.
- * @ingroup types
- */
-class Locator2LocatorData
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport Locator2LocatorData();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~Locator2LocatorData();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
-     */
-    eProsima_user_DllExport Locator2LocatorData(
-            const Locator2LocatorData& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
-     */
-    eProsima_user_DllExport Locator2LocatorData(
-            Locator2LocatorData&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
-     */
-    eProsima_user_DllExport Locator2LocatorData& operator =(
-            const Locator2LocatorData& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
-     */
-    eProsima_user_DllExport Locator2LocatorData& operator =(
-            Locator2LocatorData&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Locator2LocatorData object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const Locator2LocatorData& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Locator2LocatorData object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const Locator2LocatorData& x) const;
-
-    /*!
-     * @brief This function copies the value in member src_locator
-     * @param _src_locator New value to be copied in member src_locator
-     */
-    eProsima_user_DllExport void src_locator(
-            const eprosima::fastdds::statistics::detail::Locator_s& _src_locator);
-
-    /*!
-     * @brief This function moves the value in member src_locator
-     * @param _src_locator New value to be moved in member src_locator
-     */
-    eProsima_user_DllExport void src_locator(
-            eprosima::fastdds::statistics::detail::Locator_s&& _src_locator);
-
-    /*!
-     * @brief This function returns a constant reference to member src_locator
-     * @return Constant reference to member src_locator
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::Locator_s& src_locator() const;
-
-    /*!
-     * @brief This function returns a reference to member src_locator
-     * @return Reference to member src_locator
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::Locator_s& src_locator();
-
-
-    /*!
-     * @brief This function copies the value in member dst_locator
-     * @param _dst_locator New value to be copied in member dst_locator
-     */
-    eProsima_user_DllExport void dst_locator(
-            const eprosima::fastdds::statistics::detail::Locator_s& _dst_locator);
-
-    /*!
-     * @brief This function moves the value in member dst_locator
-     * @param _dst_locator New value to be moved in member dst_locator
-     */
-    eProsima_user_DllExport void dst_locator(
-            eprosima::fastdds::statistics::detail::Locator_s&& _dst_locator);
-
-    /*!
-     * @brief This function returns a constant reference to member dst_locator
-     * @return Constant reference to member dst_locator
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::Locator_s& dst_locator() const;
-
-    /*!
-     * @brief This function returns a reference to member dst_locator
-     * @return Reference to member dst_locator
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::Locator_s& dst_locator();
-
-
-    /*!
-     * @brief This function sets a value in member data
-     * @param _data New value for member data
-     */
-    eProsima_user_DllExport void data(
-            float _data);
-
-    /*!
-     * @brief This function returns the value of member data
-     * @return Value of member data
-     */
-    eProsima_user_DllExport float data() const;
-
-    /*!
-     * @brief This function returns a reference to member data
-     * @return Reference to member data
-     */
-    eProsima_user_DllExport float& data();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::Locator2LocatorData& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::Locator_s m_src_locator;
-    eprosima::fastdds::statistics::detail::Locator_s m_dst_locator;
-    float m_data;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure EntityData defined by the user in the IDL file.
- * @ingroup types
- */
-class EntityData
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport EntityData();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~EntityData();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
-     */
-    eProsima_user_DllExport EntityData(
-            const EntityData& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
-     */
-    eProsima_user_DllExport EntityData(
-            EntityData&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
-     */
-    eProsima_user_DllExport EntityData& operator =(
-            const EntityData& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
-     */
-    eProsima_user_DllExport EntityData& operator =(
-            EntityData&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::EntityData object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const EntityData& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::EntityData object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const EntityData& x) const;
-
-    /*!
-     * @brief This function copies the value in member guid
-     * @param _guid New value to be copied in member guid
-     */
-    eProsima_user_DllExport void guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _guid);
-
-    /*!
-     * @brief This function moves the value in member guid
-     * @param _guid New value to be moved in member guid
-     */
-    eProsima_user_DllExport void guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _guid);
-
-    /*!
-     * @brief This function returns a constant reference to member guid
-     * @return Constant reference to member guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& guid() const;
-
-    /*!
-     * @brief This function returns a reference to member guid
-     * @return Reference to member guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& guid();
-
-
-    /*!
-     * @brief This function sets a value in member data
-     * @param _data New value for member data
-     */
-    eProsima_user_DllExport void data(
-            float _data);
-
-    /*!
-     * @brief This function returns the value of member data
-     * @return Value of member data
-     */
-    eProsima_user_DllExport float data() const;
-
-    /*!
-     * @brief This function returns a reference to member data
-     * @return Reference to member data
-     */
-    eProsima_user_DllExport float& data();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::EntityData& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_guid;
-    float m_data;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure PhysicalData defined by the user in the IDL file.
- * @ingroup types
- */
-class PhysicalData
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport PhysicalData();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~PhysicalData();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
-     */
-    eProsima_user_DllExport PhysicalData(
-            const PhysicalData& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
-     */
-    eProsima_user_DllExport PhysicalData(
-            PhysicalData&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
-     */
-    eProsima_user_DllExport PhysicalData& operator =(
-            const PhysicalData& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
-     */
-    eProsima_user_DllExport PhysicalData& operator =(
-            PhysicalData&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::PhysicalData object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const PhysicalData& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::PhysicalData object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const PhysicalData& x) const;
-
-    /*!
-     * @brief This function copies the value in member participant_guid
-     * @param _participant_guid New value to be copied in member participant_guid
-     */
-    eProsima_user_DllExport void participant_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _participant_guid);
-
-    /*!
-     * @brief This function moves the value in member participant_guid
-     * @param _participant_guid New value to be moved in member participant_guid
-     */
-    eProsima_user_DllExport void participant_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _participant_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member participant_guid
-     * @return Constant reference to member participant_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& participant_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member participant_guid
-     * @return Reference to member participant_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& participant_guid();
-
-
-    /*!
-     * @brief This function copies the value in member host
-     * @param _host New value to be copied in member host
-     */
-    eProsima_user_DllExport void host(
-            const std::string& _host);
-
-    /*!
-     * @brief This function moves the value in member host
-     * @param _host New value to be moved in member host
-     */
-    eProsima_user_DllExport void host(
-            std::string&& _host);
-
-    /*!
-     * @brief This function returns a constant reference to member host
-     * @return Constant reference to member host
-     */
-    eProsima_user_DllExport const std::string& host() const;
-
-    /*!
-     * @brief This function returns a reference to member host
-     * @return Reference to member host
-     */
-    eProsima_user_DllExport std::string& host();
-
-
-    /*!
-     * @brief This function copies the value in member user
-     * @param _user New value to be copied in member user
-     */
-    eProsima_user_DllExport void user(
-            const std::string& _user);
-
-    /*!
-     * @brief This function moves the value in member user
-     * @param _user New value to be moved in member user
-     */
-    eProsima_user_DllExport void user(
-            std::string&& _user);
-
-    /*!
-     * @brief This function returns a constant reference to member user
-     * @return Constant reference to member user
-     */
-    eProsima_user_DllExport const std::string& user() const;
-
-    /*!
-     * @brief This function returns a reference to member user
-     * @return Reference to member user
-     */
-    eProsima_user_DllExport std::string& user();
-
-
-    /*!
-     * @brief This function copies the value in member process
-     * @param _process New value to be copied in member process
-     */
-    eProsima_user_DllExport void process(
-            const std::string& _process);
-
-    /*!
-     * @brief This function moves the value in member process
-     * @param _process New value to be moved in member process
-     */
-    eProsima_user_DllExport void process(
-            std::string&& _process);
-
-    /*!
-     * @brief This function returns a constant reference to member process
-     * @return Constant reference to member process
-     */
-    eProsima_user_DllExport const std::string& process() const;
-
-    /*!
-     * @brief This function returns a reference to member process
-     * @return Reference to member process
-     */
-    eProsima_user_DllExport std::string& process();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::PhysicalData& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_participant_guid;
-    std::string m_host;
-    std::string m_user;
-    std::string m_process;
-
-};
-
-/*!
- * @brief This class represents the bitmask EventKind defined by the user in the IDL file.
- * @ingroup types
- */
-enum EventKindBits : uint32_t
-{
-    HISTORY2HISTORY_LATENCY = 0x01ull << 0,
-    NETWORK_LATENCY = 0x01ull << 1,
-    PUBLICATION_THROUGHPUT = 0x01ull << 2,
-    SUBSCRIPTION_THROUGHPUT = 0x01ull << 3,
-    RTPS_SENT = 0x01ull << 4,
-    RTPS_LOST = 0x01ull << 5,
-    RESENT_DATAS = 0x01ull << 6,
-    HEARTBEAT_COUNT = 0x01ull << 7,
-    ACKNACK_COUNT = 0x01ull << 8,
-    NACKFRAG_COUNT = 0x01ull << 9,
-    GAP_COUNT = 0x01ull << 10,
-    DATA_COUNT = 0x01ull << 11,
-    PDP_PACKETS = 0x01ull << 12,
-    EDP_PACKETS = 0x01ull << 13,
-    DISCOVERED_ENTITY = 0x01ull << 14,
-    SAMPLE_DATAS = 0x01ull << 15,
-    PHYSICAL_DATA = 0x01ull << 16
-};
-typedef uint32_t EventKind;
-
-
-/*!
- * @brief This class represents the union Data defined by the user in the IDL file.
- * @ingroup types
- */
-class Data
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport Data();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~Data();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
-     */
-    eProsima_user_DllExport Data(
-            const Data& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
-     */
-    eProsima_user_DllExport Data(
-            Data&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
-     */
-    eProsima_user_DllExport Data& operator =(
-            const Data& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
-     */
-    eProsima_user_DllExport Data& operator =(
-            Data&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Data object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const Data& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Data object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const Data& x) const;
-
-    /*!
-     * @brief This function sets the discriminator value.
-     * @param __d New value for the discriminator.
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the new value doesn't correspond to the selected union member.
-     */
-    eProsima_user_DllExport void _d(
-            eprosima::fastdds::statistics::EventKind __d);
-
-    /*!
-     * @brief This function returns the value of the discriminator.
-     * @return Value of the discriminator
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::EventKind _d() const;
-
-    /*!
-     * @brief This function returns a reference to the discriminator.
-     * @return Reference to the discriminator.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::EventKind& _d();
-
-    /*!
-     * @brief This function copies the value in member writer_reader_data
-     * @param _writer_reader_data New value to be copied in member writer_reader_data
-     */
-    eProsima_user_DllExport void writer_reader_data(
-            const eprosima::fastdds::statistics::WriterReaderData& _writer_reader_data);
-
-    /*!
-     * @brief This function moves the value in member writer_reader_data
-     * @param _writer_reader_data New value to be moved in member writer_reader_data
-     */
-    eProsima_user_DllExport void writer_reader_data(
-            eprosima::fastdds::statistics::WriterReaderData&& _writer_reader_data);
-
-    /*!
-     * @brief This function returns a constant reference to member writer_reader_data
-     * @return Constant reference to member writer_reader_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::WriterReaderData& writer_reader_data() const;
-
-    /*!
-     * @brief This function returns a reference to member writer_reader_data
-     * @return Reference to member writer_reader_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::WriterReaderData& writer_reader_data();
-
-
-    /*!
-     * @brief This function copies the value in member locator2locator_data
-     * @param _locator2locator_data New value to be copied in member locator2locator_data
-     */
-    eProsima_user_DllExport void locator2locator_data(
-            const eprosima::fastdds::statistics::Locator2LocatorData& _locator2locator_data);
-
-    /*!
-     * @brief This function moves the value in member locator2locator_data
-     * @param _locator2locator_data New value to be moved in member locator2locator_data
-     */
-    eProsima_user_DllExport void locator2locator_data(
-            eprosima::fastdds::statistics::Locator2LocatorData&& _locator2locator_data);
-
-    /*!
-     * @brief This function returns a constant reference to member locator2locator_data
-     * @return Constant reference to member locator2locator_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::Locator2LocatorData& locator2locator_data() const;
-
-    /*!
-     * @brief This function returns a reference to member locator2locator_data
-     * @return Reference to member locator2locator_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::Locator2LocatorData& locator2locator_data();
-
-
-    /*!
-     * @brief This function copies the value in member entity_data
-     * @param _entity_data New value to be copied in member entity_data
-     */
-    eProsima_user_DllExport void entity_data(
-            const eprosima::fastdds::statistics::EntityData& _entity_data);
-
-    /*!
-     * @brief This function moves the value in member entity_data
-     * @param _entity_data New value to be moved in member entity_data
-     */
-    eProsima_user_DllExport void entity_data(
-            eprosima::fastdds::statistics::EntityData&& _entity_data);
-
-    /*!
-     * @brief This function returns a constant reference to member entity_data
-     * @return Constant reference to member entity_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::EntityData& entity_data() const;
-
-    /*!
-     * @brief This function returns a reference to member entity_data
-     * @return Reference to member entity_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::EntityData& entity_data();
-
-
-    /*!
-     * @brief This function copies the value in member entity2locator_traffic
-     * @param _entity2locator_traffic New value to be copied in member entity2locator_traffic
-     */
-    eProsima_user_DllExport void entity2locator_traffic(
-            const eprosima::fastdds::statistics::Entity2LocatorTraffic& _entity2locator_traffic);
-
-    /*!
-     * @brief This function moves the value in member entity2locator_traffic
-     * @param _entity2locator_traffic New value to be moved in member entity2locator_traffic
-     */
-    eProsima_user_DllExport void entity2locator_traffic(
-            eprosima::fastdds::statistics::Entity2LocatorTraffic&& _entity2locator_traffic);
-
-    /*!
-     * @brief This function returns a constant reference to member entity2locator_traffic
-     * @return Constant reference to member entity2locator_traffic
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::Entity2LocatorTraffic& entity2locator_traffic() const;
-
-    /*!
-     * @brief This function returns a reference to member entity2locator_traffic
-     * @return Reference to member entity2locator_traffic
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::Entity2LocatorTraffic& entity2locator_traffic();
-
-
-    /*!
-     * @brief This function copies the value in member entity_count
-     * @param _entity_count New value to be copied in member entity_count
-     */
-    eProsima_user_DllExport void entity_count(
-            const eprosima::fastdds::statistics::EntityCount& _entity_count);
-
-    /*!
-     * @brief This function moves the value in member entity_count
-     * @param _entity_count New value to be moved in member entity_count
-     */
-    eProsima_user_DllExport void entity_count(
-            eprosima::fastdds::statistics::EntityCount&& _entity_count);
-
-    /*!
-     * @brief This function returns a constant reference to member entity_count
-     * @return Constant reference to member entity_count
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::EntityCount& entity_count() const;
-
-    /*!
-     * @brief This function returns a reference to member entity_count
-     * @return Reference to member entity_count
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::EntityCount& entity_count();
-
-
-    /*!
-     * @brief This function copies the value in member discovery_time
-     * @param _discovery_time New value to be copied in member discovery_time
-     */
-    eProsima_user_DllExport void discovery_time(
-            const eprosima::fastdds::statistics::DiscoveryTime& _discovery_time);
-
-    /*!
-     * @brief This function moves the value in member discovery_time
-     * @param _discovery_time New value to be moved in member discovery_time
-     */
-    eProsima_user_DllExport void discovery_time(
-            eprosima::fastdds::statistics::DiscoveryTime&& _discovery_time);
-
-    /*!
-     * @brief This function returns a constant reference to member discovery_time
-     * @return Constant reference to member discovery_time
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::DiscoveryTime& discovery_time() const;
-
-    /*!
-     * @brief This function returns a reference to member discovery_time
-     * @return Reference to member discovery_time
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::DiscoveryTime& discovery_time();
-
-
-    /*!
-     * @brief This function copies the value in member sample_identity_count
-     * @param _sample_identity_count New value to be copied in member sample_identity_count
-     */
-    eProsima_user_DllExport void sample_identity_count(
-            const eprosima::fastdds::statistics::SampleIdentityCount& _sample_identity_count);
-
-    /*!
-     * @brief This function moves the value in member sample_identity_count
-     * @param _sample_identity_count New value to be moved in member sample_identity_count
-     */
-    eProsima_user_DllExport void sample_identity_count(
-            eprosima::fastdds::statistics::SampleIdentityCount&& _sample_identity_count);
-
-    /*!
-     * @brief This function returns a constant reference to member sample_identity_count
-     * @return Constant reference to member sample_identity_count
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::SampleIdentityCount& sample_identity_count() const;
-
-    /*!
-     * @brief This function returns a reference to member sample_identity_count
-     * @return Reference to member sample_identity_count
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::SampleIdentityCount& sample_identity_count();
-
-
-    /*!
-     * @brief This function copies the value in member physical_data
-     * @param _physical_data New value to be copied in member physical_data
-     */
-    eProsima_user_DllExport void physical_data(
-            const eprosima::fastdds::statistics::PhysicalData& _physical_data);
-
-    /*!
-     * @brief This function moves the value in member physical_data
-     * @param _physical_data New value to be moved in member physical_data
-     */
-    eProsima_user_DllExport void physical_data(
-            eprosima::fastdds::statistics::PhysicalData&& _physical_data);
-
-    /*!
-     * @brief This function returns a constant reference to member physical_data
-     * @return Constant reference to member physical_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::PhysicalData& physical_data() const;
-
-    /*!
-     * @brief This function returns a reference to member physical_data
-     * @return Reference to member physical_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::PhysicalData& physical_data();
-
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::Data& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-private:
-
-    eprosima::fastdds::statistics::EventKind m__d;
-
-    eprosima::fastdds::statistics::WriterReaderData m_writer_reader_data;
-    eprosima::fastdds::statistics::Locator2LocatorData m_locator2locator_data;
-    eprosima::fastdds::statistics::EntityData m_entity_data;
-    eprosima::fastdds::statistics::Entity2LocatorTraffic m_entity2locator_traffic;
-    eprosima::fastdds::statistics::EntityCount m_entity_count;
-    eprosima::fastdds::statistics::DiscoveryTime m_discovery_time;
-    eprosima::fastdds::statistics::SampleIdentityCount m_sample_identity_count;
-    eprosima::fastdds::statistics::PhysicalData m_physical_data;
-};
-
-}         // namespace statistics
-}     // namespace fastdds
+    namespace fastdds {
+        namespace statistics {
+            namespace detail {
+
+
+                /*!
+                 * @brief This class represents the structure EntityId_s defined by the user in the IDL file.
+                 * @ingroup types
+                 */
+                class EntityId_s
+                {
+                public:
+
+                    /*!
+                     * @brief Default constructor.
+                     */
+                    eProsima_user_DllExport EntityId_s();
+
+                    /*!
+                     * @brief Default destructor.
+                     */
+                    eProsima_user_DllExport ~EntityId_s();
+
+                    /*!
+                     * @brief Copy constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
+                     */
+                    eProsima_user_DllExport EntityId_s(
+                            const EntityId_s& x);
+
+                    /*!
+                     * @brief Move constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
+                     */
+                    eProsima_user_DllExport EntityId_s(
+                            EntityId_s&& x) noexcept;
+
+                    /*!
+                     * @brief Copy assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
+                     */
+                    eProsima_user_DllExport EntityId_s& operator =(
+                            const EntityId_s& x);
+
+                    /*!
+                     * @brief Move assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
+                     */
+                    eProsima_user_DllExport EntityId_s& operator =(
+                            EntityId_s&& x) noexcept;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::EntityId_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator ==(
+                            const EntityId_s& x) const;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::EntityId_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator !=(
+                            const EntityId_s& x) const;
+
+                    /*!
+                     * @brief This function copies the value in member value
+                     * @param _value New value to be copied in member value
+                     */
+                    eProsima_user_DllExport void value(
+                            const std::array<uint8_t, 4>& _value);
+
+                    /*!
+                     * @brief This function moves the value in member value
+                     * @param _value New value to be moved in member value
+                     */
+                    eProsima_user_DllExport void value(
+                            std::array<uint8_t, 4>&& _value);
+
+                    /*!
+                     * @brief This function returns a constant reference to member value
+                     * @return Constant reference to member value
+                     */
+                    eProsima_user_DllExport const std::array<uint8_t, 4>& value() const;
+
+                    /*!
+                     * @brief This function returns a reference to member value
+                     * @return Reference to member value
+                     */
+                    eProsima_user_DllExport std::array<uint8_t, 4>& value();
+
+
+                    /*!
+                    * @brief This function returns the maximum serialized size of an object
+                    * depending on the buffer alignment.
+                    * @param current_alignment Buffer alignment.
+                    * @return Maximum serialized size.
+                    */
+                    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                            size_t current_alignment = 0);
+
+                    /*!
+                     * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                     * @param data Data which is calculated its serialized size.
+                     * @param current_alignment Buffer alignment.
+                     * @return Serialized size.
+                     */
+                    eProsima_user_DllExport static size_t getCdrSerializedSize(
+                            const eprosima::fastdds::statistics::detail::EntityId_s& data,
+                            size_t current_alignment = 0);
+
+
+
+                    /*!
+                     * @brief This function serializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void serialize(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+                    /*!
+                     * @brief This function deserializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void deserialize(
+                            eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                    /*!
+                    * @brief This function tells you if the Key has been defined for this type
+                    */
+                    eProsima_user_DllExport static bool isKeyDefined();
+
+                    /*!
+                    * @brief This function serializes the key members of an object using CDR serialization.
+                    * @param cdr CDR serialization object.
+                    */
+                    eProsima_user_DllExport void serializeKey(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+
+                private:
+
+                    std::array<uint8_t, 4> m_value;
+
+                };
+
+
+
+                /*!
+                 * @brief This class represents the structure GuidPrefix_s defined by the user in the IDL file.
+                 * @ingroup types
+                 */
+                class GuidPrefix_s
+                {
+                public:
+
+                    /*!
+                     * @brief Default constructor.
+                     */
+                    eProsima_user_DllExport GuidPrefix_s();
+
+                    /*!
+                     * @brief Default destructor.
+                     */
+                    eProsima_user_DllExport ~GuidPrefix_s();
+
+                    /*!
+                     * @brief Copy constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
+                     */
+                    eProsima_user_DllExport GuidPrefix_s(
+                            const GuidPrefix_s& x);
+
+                    /*!
+                     * @brief Move constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
+                     */
+                    eProsima_user_DllExport GuidPrefix_s(
+                            GuidPrefix_s&& x) noexcept;
+
+                    /*!
+                     * @brief Copy assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
+                     */
+                    eProsima_user_DllExport GuidPrefix_s& operator =(
+                            const GuidPrefix_s& x);
+
+                    /*!
+                     * @brief Move assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
+                     */
+                    eProsima_user_DllExport GuidPrefix_s& operator =(
+                            GuidPrefix_s&& x) noexcept;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::GuidPrefix_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator ==(
+                            const GuidPrefix_s& x) const;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::GuidPrefix_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator !=(
+                            const GuidPrefix_s& x) const;
+
+                    /*!
+                     * @brief This function copies the value in member value
+                     * @param _value New value to be copied in member value
+                     */
+                    eProsima_user_DllExport void value(
+                            const std::array<uint8_t, 12>& _value);
+
+                    /*!
+                     * @brief This function moves the value in member value
+                     * @param _value New value to be moved in member value
+                     */
+                    eProsima_user_DllExport void value(
+                            std::array<uint8_t, 12>&& _value);
+
+                    /*!
+                     * @brief This function returns a constant reference to member value
+                     * @return Constant reference to member value
+                     */
+                    eProsima_user_DllExport const std::array<uint8_t, 12>& value() const;
+
+                    /*!
+                     * @brief This function returns a reference to member value
+                     * @return Reference to member value
+                     */
+                    eProsima_user_DllExport std::array<uint8_t, 12>& value();
+
+
+                    /*!
+                    * @brief This function returns the maximum serialized size of an object
+                    * depending on the buffer alignment.
+                    * @param current_alignment Buffer alignment.
+                    * @return Maximum serialized size.
+                    */
+                    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                            size_t current_alignment = 0);
+
+                    /*!
+                     * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                     * @param data Data which is calculated its serialized size.
+                     * @param current_alignment Buffer alignment.
+                     * @return Serialized size.
+                     */
+                    eProsima_user_DllExport static size_t getCdrSerializedSize(
+                            const eprosima::fastdds::statistics::detail::GuidPrefix_s& data,
+                            size_t current_alignment = 0);
+
+
+
+                    /*!
+                     * @brief This function serializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void serialize(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+                    /*!
+                     * @brief This function deserializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void deserialize(
+                            eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                    /*!
+                    * @brief This function tells you if the Key has been defined for this type
+                    */
+                    eProsima_user_DllExport static bool isKeyDefined();
+
+                    /*!
+                    * @brief This function serializes the key members of an object using CDR serialization.
+                    * @param cdr CDR serialization object.
+                    */
+                    eProsima_user_DllExport void serializeKey(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+
+                private:
+
+                    std::array<uint8_t, 12> m_value;
+
+                };
+
+
+
+                /*!
+                 * @brief This class represents the structure GUID_s defined by the user in the IDL file.
+                 * @ingroup types
+                 */
+                class GUID_s
+                {
+                public:
+
+                    /*!
+                     * @brief Default constructor.
+                     */
+                    eProsima_user_DllExport GUID_s();
+
+                    /*!
+                     * @brief Default destructor.
+                     */
+                    eProsima_user_DllExport ~GUID_s();
+
+                    /*!
+                     * @brief Copy constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
+                     */
+                    eProsima_user_DllExport GUID_s(
+                            const GUID_s& x);
+
+                    /*!
+                     * @brief Move constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
+                     */
+                    eProsima_user_DllExport GUID_s(
+                            GUID_s&& x) noexcept;
+
+                    /*!
+                     * @brief Copy assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
+                     */
+                    eProsima_user_DllExport GUID_s& operator =(
+                            const GUID_s& x);
+
+                    /*!
+                     * @brief Move assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
+                     */
+                    eProsima_user_DllExport GUID_s& operator =(
+                            GUID_s&& x) noexcept;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::GUID_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator ==(
+                            const GUID_s& x) const;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::GUID_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator !=(
+                            const GUID_s& x) const;
+
+                    /*!
+                     * @brief This function copies the value in member guidPrefix
+                     * @param _guidPrefix New value to be copied in member guidPrefix
+                     */
+                    eProsima_user_DllExport void guidPrefix(
+                            const eprosima::fastdds::statistics::detail::GuidPrefix_s& _guidPrefix);
+
+                    /*!
+                     * @brief This function moves the value in member guidPrefix
+                     * @param _guidPrefix New value to be moved in member guidPrefix
+                     */
+                    eProsima_user_DllExport void guidPrefix(
+                            eprosima::fastdds::statistics::detail::GuidPrefix_s&& _guidPrefix);
+
+                    /*!
+                     * @brief This function returns a constant reference to member guidPrefix
+                     * @return Constant reference to member guidPrefix
+                     */
+                    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GuidPrefix_s& guidPrefix() const;
+
+                    /*!
+                     * @brief This function returns a reference to member guidPrefix
+                     * @return Reference to member guidPrefix
+                     */
+                    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GuidPrefix_s& guidPrefix();
+
+
+                    /*!
+                     * @brief This function copies the value in member entityId
+                     * @param _entityId New value to be copied in member entityId
+                     */
+                    eProsima_user_DllExport void entityId(
+                            const eprosima::fastdds::statistics::detail::EntityId_s& _entityId);
+
+                    /*!
+                     * @brief This function moves the value in member entityId
+                     * @param _entityId New value to be moved in member entityId
+                     */
+                    eProsima_user_DllExport void entityId(
+                            eprosima::fastdds::statistics::detail::EntityId_s&& _entityId);
+
+                    /*!
+                     * @brief This function returns a constant reference to member entityId
+                     * @return Constant reference to member entityId
+                     */
+                    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::EntityId_s& entityId() const;
+
+                    /*!
+                     * @brief This function returns a reference to member entityId
+                     * @return Reference to member entityId
+                     */
+                    eProsima_user_DllExport eprosima::fastdds::statistics::detail::EntityId_s& entityId();
+
+
+                    /*!
+                    * @brief This function returns the maximum serialized size of an object
+                    * depending on the buffer alignment.
+                    * @param current_alignment Buffer alignment.
+                    * @return Maximum serialized size.
+                    */
+                    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                            size_t current_alignment = 0);
+
+                    /*!
+                     * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                     * @param data Data which is calculated its serialized size.
+                     * @param current_alignment Buffer alignment.
+                     * @return Serialized size.
+                     */
+                    eProsima_user_DllExport static size_t getCdrSerializedSize(
+                            const eprosima::fastdds::statistics::detail::GUID_s& data,
+                            size_t current_alignment = 0);
+
+
+
+                    /*!
+                     * @brief This function serializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void serialize(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+                    /*!
+                     * @brief This function deserializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void deserialize(
+                            eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                    /*!
+                    * @brief This function tells you if the Key has been defined for this type
+                    */
+                    eProsima_user_DllExport static bool isKeyDefined();
+
+                    /*!
+                    * @brief This function serializes the key members of an object using CDR serialization.
+                    * @param cdr CDR serialization object.
+                    */
+                    eProsima_user_DllExport void serializeKey(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+
+                private:
+
+                    eprosima::fastdds::statistics::detail::GuidPrefix_s m_guidPrefix;
+                    eprosima::fastdds::statistics::detail::EntityId_s m_entityId;
+
+                };
+
+
+
+                /*!
+                 * @brief This class represents the structure SequenceNumber_s defined by the user in the IDL file.
+                 * @ingroup types
+                 */
+                class SequenceNumber_s
+                {
+                public:
+
+                    /*!
+                     * @brief Default constructor.
+                     */
+                    eProsima_user_DllExport SequenceNumber_s();
+
+                    /*!
+                     * @brief Default destructor.
+                     */
+                    eProsima_user_DllExport ~SequenceNumber_s();
+
+                    /*!
+                     * @brief Copy constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
+                     */
+                    eProsima_user_DllExport SequenceNumber_s(
+                            const SequenceNumber_s& x);
+
+                    /*!
+                     * @brief Move constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
+                     */
+                    eProsima_user_DllExport SequenceNumber_s(
+                            SequenceNumber_s&& x) noexcept;
+
+                    /*!
+                     * @brief Copy assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
+                     */
+                    eProsima_user_DllExport SequenceNumber_s& operator =(
+                            const SequenceNumber_s& x);
+
+                    /*!
+                     * @brief Move assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
+                     */
+                    eProsima_user_DllExport SequenceNumber_s& operator =(
+                            SequenceNumber_s&& x) noexcept;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::SequenceNumber_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator ==(
+                            const SequenceNumber_s& x) const;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::SequenceNumber_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator !=(
+                            const SequenceNumber_s& x) const;
+
+                    /*!
+                     * @brief This function sets a value in member high
+                     * @param _high New value for member high
+                     */
+                    eProsima_user_DllExport void high(
+                            int32_t _high);
+
+                    /*!
+                     * @brief This function returns the value of member high
+                     * @return Value of member high
+                     */
+                    eProsima_user_DllExport int32_t high() const;
+
+                    /*!
+                     * @brief This function returns a reference to member high
+                     * @return Reference to member high
+                     */
+                    eProsima_user_DllExport int32_t& high();
+
+
+                    /*!
+                     * @brief This function sets a value in member low
+                     * @param _low New value for member low
+                     */
+                    eProsima_user_DllExport void low(
+                            uint32_t _low);
+
+                    /*!
+                     * @brief This function returns the value of member low
+                     * @return Value of member low
+                     */
+                    eProsima_user_DllExport uint32_t low() const;
+
+                    /*!
+                     * @brief This function returns a reference to member low
+                     * @return Reference to member low
+                     */
+                    eProsima_user_DllExport uint32_t& low();
+
+
+                    /*!
+                    * @brief This function returns the maximum serialized size of an object
+                    * depending on the buffer alignment.
+                    * @param current_alignment Buffer alignment.
+                    * @return Maximum serialized size.
+                    */
+                    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                            size_t current_alignment = 0);
+
+                    /*!
+                     * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                     * @param data Data which is calculated its serialized size.
+                     * @param current_alignment Buffer alignment.
+                     * @return Serialized size.
+                     */
+                    eProsima_user_DllExport static size_t getCdrSerializedSize(
+                            const eprosima::fastdds::statistics::detail::SequenceNumber_s& data,
+                            size_t current_alignment = 0);
+
+
+
+                    /*!
+                     * @brief This function serializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void serialize(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+                    /*!
+                     * @brief This function deserializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void deserialize(
+                            eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                    /*!
+                    * @brief This function tells you if the Key has been defined for this type
+                    */
+                    eProsima_user_DllExport static bool isKeyDefined();
+
+                    /*!
+                    * @brief This function serializes the key members of an object using CDR serialization.
+                    * @param cdr CDR serialization object.
+                    */
+                    eProsima_user_DllExport void serializeKey(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+
+                private:
+
+                    int32_t m_high;
+                    uint32_t m_low;
+
+                };
+
+
+
+                /*!
+                 * @brief This class represents the structure SampleIdentity_s defined by the user in the IDL file.
+                 * @ingroup types
+                 */
+                class SampleIdentity_s
+                {
+                public:
+
+                    /*!
+                     * @brief Default constructor.
+                     */
+                    eProsima_user_DllExport SampleIdentity_s();
+
+                    /*!
+                     * @brief Default destructor.
+                     */
+                    eProsima_user_DllExport ~SampleIdentity_s();
+
+                    /*!
+                     * @brief Copy constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
+                     */
+                    eProsima_user_DllExport SampleIdentity_s(
+                            const SampleIdentity_s& x);
+
+                    /*!
+                     * @brief Move constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
+                     */
+                    eProsima_user_DllExport SampleIdentity_s(
+                            SampleIdentity_s&& x) noexcept;
+
+                    /*!
+                     * @brief Copy assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
+                     */
+                    eProsima_user_DllExport SampleIdentity_s& operator =(
+                            const SampleIdentity_s& x);
+
+                    /*!
+                     * @brief Move assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
+                     */
+                    eProsima_user_DllExport SampleIdentity_s& operator =(
+                            SampleIdentity_s&& x) noexcept;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::SampleIdentity_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator ==(
+                            const SampleIdentity_s& x) const;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::SampleIdentity_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator !=(
+                            const SampleIdentity_s& x) const;
+
+                    /*!
+                     * @brief This function copies the value in member writer_guid
+                     * @param _writer_guid New value to be copied in member writer_guid
+                     */
+                    eProsima_user_DllExport void writer_guid(
+                            const eprosima::fastdds::statistics::detail::GUID_s& _writer_guid);
+
+                    /*!
+                     * @brief This function moves the value in member writer_guid
+                     * @param _writer_guid New value to be moved in member writer_guid
+                     */
+                    eProsima_user_DllExport void writer_guid(
+                            eprosima::fastdds::statistics::detail::GUID_s&& _writer_guid);
+
+                    /*!
+                     * @brief This function returns a constant reference to member writer_guid
+                     * @return Constant reference to member writer_guid
+                     */
+                    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& writer_guid() const;
+
+                    /*!
+                     * @brief This function returns a reference to member writer_guid
+                     * @return Reference to member writer_guid
+                     */
+                    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& writer_guid();
+
+
+                    /*!
+                     * @brief This function copies the value in member sequence_number
+                     * @param _sequence_number New value to be copied in member sequence_number
+                     */
+                    eProsima_user_DllExport void sequence_number(
+                            const eprosima::fastdds::statistics::detail::SequenceNumber_s& _sequence_number);
+
+                    /*!
+                     * @brief This function moves the value in member sequence_number
+                     * @param _sequence_number New value to be moved in member sequence_number
+                     */
+                    eProsima_user_DllExport void sequence_number(
+                            eprosima::fastdds::statistics::detail::SequenceNumber_s&& _sequence_number);
+
+                    /*!
+                     * @brief This function returns a constant reference to member sequence_number
+                     * @return Constant reference to member sequence_number
+                     */
+                    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::SequenceNumber_s& sequence_number() const;
+
+                    /*!
+                     * @brief This function returns a reference to member sequence_number
+                     * @return Reference to member sequence_number
+                     */
+                    eProsima_user_DllExport eprosima::fastdds::statistics::detail::SequenceNumber_s& sequence_number();
+
+
+                    /*!
+                    * @brief This function returns the maximum serialized size of an object
+                    * depending on the buffer alignment.
+                    * @param current_alignment Buffer alignment.
+                    * @return Maximum serialized size.
+                    */
+                    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                            size_t current_alignment = 0);
+
+                    /*!
+                     * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                     * @param data Data which is calculated its serialized size.
+                     * @param current_alignment Buffer alignment.
+                     * @return Serialized size.
+                     */
+                    eProsima_user_DllExport static size_t getCdrSerializedSize(
+                            const eprosima::fastdds::statistics::detail::SampleIdentity_s& data,
+                            size_t current_alignment = 0);
+
+
+
+                    /*!
+                     * @brief This function serializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void serialize(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+                    /*!
+                     * @brief This function deserializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void deserialize(
+                            eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                    /*!
+                    * @brief This function tells you if the Key has been defined for this type
+                    */
+                    eProsima_user_DllExport static bool isKeyDefined();
+
+                    /*!
+                    * @brief This function serializes the key members of an object using CDR serialization.
+                    * @param cdr CDR serialization object.
+                    */
+                    eProsima_user_DllExport void serializeKey(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+
+                private:
+
+                    eprosima::fastdds::statistics::detail::GUID_s m_writer_guid;
+                    eprosima::fastdds::statistics::detail::SequenceNumber_s m_sequence_number;
+
+                };
+
+
+
+                /*!
+                 * @brief This class represents the structure Locator_s defined by the user in the IDL file.
+                 * @ingroup types
+                 */
+                class Locator_s
+                {
+                public:
+
+                    /*!
+                     * @brief Default constructor.
+                     */
+                    eProsima_user_DllExport Locator_s();
+
+                    /*!
+                     * @brief Default destructor.
+                     */
+                    eProsima_user_DllExport ~Locator_s();
+
+                    /*!
+                     * @brief Copy constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
+                     */
+                    eProsima_user_DllExport Locator_s(
+                            const Locator_s& x);
+
+                    /*!
+                     * @brief Move constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
+                     */
+                    eProsima_user_DllExport Locator_s(
+                            Locator_s&& x) noexcept;
+
+                    /*!
+                     * @brief Copy assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
+                     */
+                    eProsima_user_DllExport Locator_s& operator =(
+                            const Locator_s& x);
+
+                    /*!
+                     * @brief Move assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
+                     */
+                    eProsima_user_DllExport Locator_s& operator =(
+                            Locator_s&& x) noexcept;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::Locator_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator ==(
+                            const Locator_s& x) const;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::Locator_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator !=(
+                            const Locator_s& x) const;
+
+                    /*!
+                     * @brief This function sets a value in member kind
+                     * @param _kind New value for member kind
+                     */
+                    eProsima_user_DllExport void kind(
+                            int32_t _kind);
+
+                    /*!
+                     * @brief This function returns the value of member kind
+                     * @return Value of member kind
+                     */
+                    eProsima_user_DllExport int32_t kind() const;
+
+                    /*!
+                     * @brief This function returns a reference to member kind
+                     * @return Reference to member kind
+                     */
+                    eProsima_user_DllExport int32_t& kind();
+
+
+                    /*!
+                     * @brief This function sets a value in member port
+                     * @param _port New value for member port
+                     */
+                    eProsima_user_DllExport void port(
+                            uint32_t _port);
+
+                    /*!
+                     * @brief This function returns the value of member port
+                     * @return Value of member port
+                     */
+                    eProsima_user_DllExport uint32_t port() const;
+
+                    /*!
+                     * @brief This function returns a reference to member port
+                     * @return Reference to member port
+                     */
+                    eProsima_user_DllExport uint32_t& port();
+
+
+                    /*!
+                     * @brief This function copies the value in member address
+                     * @param _address New value to be copied in member address
+                     */
+                    eProsima_user_DllExport void address(
+                            const std::array<uint8_t, 16>& _address);
+
+                    /*!
+                     * @brief This function moves the value in member address
+                     * @param _address New value to be moved in member address
+                     */
+                    eProsima_user_DllExport void address(
+                            std::array<uint8_t, 16>&& _address);
+
+                    /*!
+                     * @brief This function returns a constant reference to member address
+                     * @return Constant reference to member address
+                     */
+                    eProsima_user_DllExport const std::array<uint8_t, 16>& address() const;
+
+                    /*!
+                     * @brief This function returns a reference to member address
+                     * @return Reference to member address
+                     */
+                    eProsima_user_DllExport std::array<uint8_t, 16>& address();
+
+
+                    /*!
+                    * @brief This function returns the maximum serialized size of an object
+                    * depending on the buffer alignment.
+                    * @param current_alignment Buffer alignment.
+                    * @return Maximum serialized size.
+                    */
+                    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                            size_t current_alignment = 0);
+
+                    /*!
+                     * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                     * @param data Data which is calculated its serialized size.
+                     * @param current_alignment Buffer alignment.
+                     * @return Serialized size.
+                     */
+                    eProsima_user_DllExport static size_t getCdrSerializedSize(
+                            const eprosima::fastdds::statistics::detail::Locator_s& data,
+                            size_t current_alignment = 0);
+
+
+
+                    /*!
+                     * @brief This function serializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void serialize(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+                    /*!
+                     * @brief This function deserializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void deserialize(
+                            eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                    /*!
+                    * @brief This function tells you if the Key has been defined for this type
+                    */
+                    eProsima_user_DllExport static bool isKeyDefined();
+
+                    /*!
+                    * @brief This function serializes the key members of an object using CDR serialization.
+                    * @param cdr CDR serialization object.
+                    */
+                    eProsima_user_DllExport void serializeKey(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+
+                private:
+
+                    int32_t m_kind;
+                    uint32_t m_port;
+                    std::array<uint8_t, 16> m_address;
+
+                };
+
+            } // namespace detail
+
+
+            /*!
+             * @brief This class represents the structure DiscoveryTime defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class DiscoveryTime
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport DiscoveryTime();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~DiscoveryTime();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
+                 */
+                eProsima_user_DllExport DiscoveryTime(
+                        const DiscoveryTime& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
+                 */
+                eProsima_user_DllExport DiscoveryTime(
+                        DiscoveryTime&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
+                 */
+                eProsima_user_DllExport DiscoveryTime& operator =(
+                        const DiscoveryTime& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
+                 */
+                eProsima_user_DllExport DiscoveryTime& operator =(
+                        DiscoveryTime&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::DiscoveryTime object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const DiscoveryTime& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::DiscoveryTime object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const DiscoveryTime& x) const;
+
+                /*!
+                 * @brief This function copies the value in member local_participant_guid
+                 * @param _local_participant_guid New value to be copied in member local_participant_guid
+                 */
+                eProsima_user_DllExport void local_participant_guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _local_participant_guid);
+
+                /*!
+                 * @brief This function moves the value in member local_participant_guid
+                 * @param _local_participant_guid New value to be moved in member local_participant_guid
+                 */
+                eProsima_user_DllExport void local_participant_guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _local_participant_guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member local_participant_guid
+                 * @return Constant reference to member local_participant_guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& local_participant_guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member local_participant_guid
+                 * @return Reference to member local_participant_guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& local_participant_guid();
+
+
+                /*!
+                 * @brief This function copies the value in member remote_entity_guid
+                 * @param _remote_entity_guid New value to be copied in member remote_entity_guid
+                 */
+                eProsima_user_DllExport void remote_entity_guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _remote_entity_guid);
+
+                /*!
+                 * @brief This function moves the value in member remote_entity_guid
+                 * @param _remote_entity_guid New value to be moved in member remote_entity_guid
+                 */
+                eProsima_user_DllExport void remote_entity_guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _remote_entity_guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member remote_entity_guid
+                 * @return Constant reference to member remote_entity_guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& remote_entity_guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member remote_entity_guid
+                 * @return Reference to member remote_entity_guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& remote_entity_guid();
+
+
+                /*!
+                 * @brief This function sets a value in member time
+                 * @param _time New value for member time
+                 */
+                eProsima_user_DllExport void time(
+                        uint64_t _time);
+
+                /*!
+                 * @brief This function returns the value of member time
+                 * @return Value of member time
+                 */
+                eProsima_user_DllExport uint64_t time() const;
+
+                /*!
+                 * @brief This function returns a reference to member time
+                 * @return Reference to member time
+                 */
+                eProsima_user_DllExport uint64_t& time();
+
+
+                /*!
+                 * @brief This function copies the value in member host
+                 * @param _host New value to be copied in member host
+                 */
+                eProsima_user_DllExport void host(
+                        const std::string& _host);
+
+                /*!
+                 * @brief This function moves the value in member host
+                 * @param _host New value to be moved in member host
+                 */
+                eProsima_user_DllExport void host(
+                        std::string&& _host);
+
+                /*!
+                 * @brief This function returns a constant reference to member host
+                 * @return Constant reference to member host
+                 */
+                eProsima_user_DllExport const std::string& host() const;
+
+                /*!
+                 * @brief This function returns a reference to member host
+                 * @return Reference to member host
+                 */
+                eProsima_user_DllExport std::string& host();
+
+
+                /*!
+                 * @brief This function copies the value in member user
+                 * @param _user New value to be copied in member user
+                 */
+                eProsima_user_DllExport void user(
+                        const std::string& _user);
+
+                /*!
+                 * @brief This function moves the value in member user
+                 * @param _user New value to be moved in member user
+                 */
+                eProsima_user_DllExport void user(
+                        std::string&& _user);
+
+                /*!
+                 * @brief This function returns a constant reference to member user
+                 * @return Constant reference to member user
+                 */
+                eProsima_user_DllExport const std::string& user() const;
+
+                /*!
+                 * @brief This function returns a reference to member user
+                 * @return Reference to member user
+                 */
+                eProsima_user_DllExport std::string& user();
+
+
+                /*!
+                 * @brief This function copies the value in member process
+                 * @param _process New value to be copied in member process
+                 */
+                eProsima_user_DllExport void process(
+                        const std::string& _process);
+
+                /*!
+                 * @brief This function moves the value in member process
+                 * @param _process New value to be moved in member process
+                 */
+                eProsima_user_DllExport void process(
+                        std::string&& _process);
+
+                /*!
+                 * @brief This function returns a constant reference to member process
+                 * @return Constant reference to member process
+                 */
+                eProsima_user_DllExport const std::string& process() const;
+
+                /*!
+                 * @brief This function returns a reference to member process
+                 * @return Reference to member process
+                 */
+                eProsima_user_DllExport std::string& process();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::DiscoveryTime& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::GUID_s m_local_participant_guid;
+                eprosima::fastdds::statistics::detail::GUID_s m_remote_entity_guid;
+                uint64_t m_time;
+                std::string m_host;
+                std::string m_user;
+                std::string m_process;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure EntityCount defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class EntityCount
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport EntityCount();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~EntityCount();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
+                 */
+                eProsima_user_DllExport EntityCount(
+                        const EntityCount& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
+                 */
+                eProsima_user_DllExport EntityCount(
+                        EntityCount&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
+                 */
+                eProsima_user_DllExport EntityCount& operator =(
+                        const EntityCount& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
+                 */
+                eProsima_user_DllExport EntityCount& operator =(
+                        EntityCount&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::EntityCount object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const EntityCount& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::EntityCount object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const EntityCount& x) const;
+
+                /*!
+                 * @brief This function copies the value in member guid
+                 * @param _guid New value to be copied in member guid
+                 */
+                eProsima_user_DllExport void guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _guid);
+
+                /*!
+                 * @brief This function moves the value in member guid
+                 * @param _guid New value to be moved in member guid
+                 */
+                eProsima_user_DllExport void guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member guid
+                 * @return Constant reference to member guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member guid
+                 * @return Reference to member guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& guid();
+
+
+                /*!
+                 * @brief This function sets a value in member count
+                 * @param _count New value for member count
+                 */
+                eProsima_user_DllExport void count(
+                        uint64_t _count);
+
+                /*!
+                 * @brief This function returns the value of member count
+                 * @return Value of member count
+                 */
+                eProsima_user_DllExport uint64_t count() const;
+
+                /*!
+                 * @brief This function returns a reference to member count
+                 * @return Reference to member count
+                 */
+                eProsima_user_DllExport uint64_t& count();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::EntityCount& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::GUID_s m_guid;
+                uint64_t m_count;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure SampleIdentityCount defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class SampleIdentityCount
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport SampleIdentityCount();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~SampleIdentityCount();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
+                 */
+                eProsima_user_DllExport SampleIdentityCount(
+                        const SampleIdentityCount& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
+                 */
+                eProsima_user_DllExport SampleIdentityCount(
+                        SampleIdentityCount&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
+                 */
+                eProsima_user_DllExport SampleIdentityCount& operator =(
+                        const SampleIdentityCount& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
+                 */
+                eProsima_user_DllExport SampleIdentityCount& operator =(
+                        SampleIdentityCount&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::SampleIdentityCount object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const SampleIdentityCount& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::SampleIdentityCount object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const SampleIdentityCount& x) const;
+
+                /*!
+                 * @brief This function copies the value in member sample_id
+                 * @param _sample_id New value to be copied in member sample_id
+                 */
+                eProsima_user_DllExport void sample_id(
+                        const eprosima::fastdds::statistics::detail::SampleIdentity_s& _sample_id);
+
+                /*!
+                 * @brief This function moves the value in member sample_id
+                 * @param _sample_id New value to be moved in member sample_id
+                 */
+                eProsima_user_DllExport void sample_id(
+                        eprosima::fastdds::statistics::detail::SampleIdentity_s&& _sample_id);
+
+                /*!
+                 * @brief This function returns a constant reference to member sample_id
+                 * @return Constant reference to member sample_id
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::SampleIdentity_s& sample_id() const;
+
+                /*!
+                 * @brief This function returns a reference to member sample_id
+                 * @return Reference to member sample_id
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::SampleIdentity_s& sample_id();
+
+
+                /*!
+                 * @brief This function sets a value in member count
+                 * @param _count New value for member count
+                 */
+                eProsima_user_DllExport void count(
+                        uint64_t _count);
+
+                /*!
+                 * @brief This function returns the value of member count
+                 * @return Value of member count
+                 */
+                eProsima_user_DllExport uint64_t count() const;
+
+                /*!
+                 * @brief This function returns a reference to member count
+                 * @return Reference to member count
+                 */
+                eProsima_user_DllExport uint64_t& count();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::SampleIdentityCount& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::SampleIdentity_s m_sample_id;
+                uint64_t m_count;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure Entity2LocatorTraffic defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class Entity2LocatorTraffic
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport Entity2LocatorTraffic();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~Entity2LocatorTraffic();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
+                 */
+                eProsima_user_DllExport Entity2LocatorTraffic(
+                        const Entity2LocatorTraffic& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
+                 */
+                eProsima_user_DllExport Entity2LocatorTraffic(
+                        Entity2LocatorTraffic&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
+                 */
+                eProsima_user_DllExport Entity2LocatorTraffic& operator =(
+                        const Entity2LocatorTraffic& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
+                 */
+                eProsima_user_DllExport Entity2LocatorTraffic& operator =(
+                        Entity2LocatorTraffic&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Entity2LocatorTraffic object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const Entity2LocatorTraffic& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Entity2LocatorTraffic object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const Entity2LocatorTraffic& x) const;
+
+                /*!
+                 * @brief This function copies the value in member src_guid
+                 * @param _src_guid New value to be copied in member src_guid
+                 */
+                eProsima_user_DllExport void src_guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _src_guid);
+
+                /*!
+                 * @brief This function moves the value in member src_guid
+                 * @param _src_guid New value to be moved in member src_guid
+                 */
+                eProsima_user_DllExport void src_guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _src_guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member src_guid
+                 * @return Constant reference to member src_guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& src_guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member src_guid
+                 * @return Reference to member src_guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& src_guid();
+
+
+                /*!
+                 * @brief This function copies the value in member dst_locator
+                 * @param _dst_locator New value to be copied in member dst_locator
+                 */
+                eProsima_user_DllExport void dst_locator(
+                        const eprosima::fastdds::statistics::detail::Locator_s& _dst_locator);
+
+                /*!
+                 * @brief This function moves the value in member dst_locator
+                 * @param _dst_locator New value to be moved in member dst_locator
+                 */
+                eProsima_user_DllExport void dst_locator(
+                        eprosima::fastdds::statistics::detail::Locator_s&& _dst_locator);
+
+                /*!
+                 * @brief This function returns a constant reference to member dst_locator
+                 * @return Constant reference to member dst_locator
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::Locator_s& dst_locator() const;
+
+                /*!
+                 * @brief This function returns a reference to member dst_locator
+                 * @return Reference to member dst_locator
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::Locator_s& dst_locator();
+
+
+                /*!
+                 * @brief This function sets a value in member packet_count
+                 * @param _packet_count New value for member packet_count
+                 */
+                eProsima_user_DllExport void packet_count(
+                        uint64_t _packet_count);
+
+                /*!
+                 * @brief This function returns the value of member packet_count
+                 * @return Value of member packet_count
+                 */
+                eProsima_user_DllExport uint64_t packet_count() const;
+
+                /*!
+                 * @brief This function returns a reference to member packet_count
+                 * @return Reference to member packet_count
+                 */
+                eProsima_user_DllExport uint64_t& packet_count();
+
+
+                /*!
+                 * @brief This function sets a value in member byte_count
+                 * @param _byte_count New value for member byte_count
+                 */
+                eProsima_user_DllExport void byte_count(
+                        uint64_t _byte_count);
+
+                /*!
+                 * @brief This function returns the value of member byte_count
+                 * @return Value of member byte_count
+                 */
+                eProsima_user_DllExport uint64_t byte_count() const;
+
+                /*!
+                 * @brief This function returns a reference to member byte_count
+                 * @return Reference to member byte_count
+                 */
+                eProsima_user_DllExport uint64_t& byte_count();
+
+
+                /*!
+                 * @brief This function sets a value in member byte_magnitude_order
+                 * @param _byte_magnitude_order New value for member byte_magnitude_order
+                 */
+                eProsima_user_DllExport void byte_magnitude_order(
+                        int16_t _byte_magnitude_order);
+
+                /*!
+                 * @brief This function returns the value of member byte_magnitude_order
+                 * @return Value of member byte_magnitude_order
+                 */
+                eProsima_user_DllExport int16_t byte_magnitude_order() const;
+
+                /*!
+                 * @brief This function returns a reference to member byte_magnitude_order
+                 * @return Reference to member byte_magnitude_order
+                 */
+                eProsima_user_DllExport int16_t& byte_magnitude_order();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::Entity2LocatorTraffic& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::GUID_s m_src_guid;
+                eprosima::fastdds::statistics::detail::Locator_s m_dst_locator;
+                uint64_t m_packet_count;
+                uint64_t m_byte_count;
+                int16_t m_byte_magnitude_order;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure WriterReaderData defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class WriterReaderData
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport WriterReaderData();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~WriterReaderData();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
+                 */
+                eProsima_user_DllExport WriterReaderData(
+                        const WriterReaderData& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
+                 */
+                eProsima_user_DllExport WriterReaderData(
+                        WriterReaderData&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
+                 */
+                eProsima_user_DllExport WriterReaderData& operator =(
+                        const WriterReaderData& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
+                 */
+                eProsima_user_DllExport WriterReaderData& operator =(
+                        WriterReaderData&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::WriterReaderData object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const WriterReaderData& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::WriterReaderData object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const WriterReaderData& x) const;
+
+                /*!
+                 * @brief This function copies the value in member writer_guid
+                 * @param _writer_guid New value to be copied in member writer_guid
+                 */
+                eProsima_user_DllExport void writer_guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _writer_guid);
+
+                /*!
+                 * @brief This function moves the value in member writer_guid
+                 * @param _writer_guid New value to be moved in member writer_guid
+                 */
+                eProsima_user_DllExport void writer_guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _writer_guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member writer_guid
+                 * @return Constant reference to member writer_guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& writer_guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member writer_guid
+                 * @return Reference to member writer_guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& writer_guid();
+
+
+                /*!
+                 * @brief This function copies the value in member reader_guid
+                 * @param _reader_guid New value to be copied in member reader_guid
+                 */
+                eProsima_user_DllExport void reader_guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _reader_guid);
+
+                /*!
+                 * @brief This function moves the value in member reader_guid
+                 * @param _reader_guid New value to be moved in member reader_guid
+                 */
+                eProsima_user_DllExport void reader_guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _reader_guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member reader_guid
+                 * @return Constant reference to member reader_guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& reader_guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member reader_guid
+                 * @return Reference to member reader_guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& reader_guid();
+
+
+                /*!
+                 * @brief This function sets a value in member data
+                 * @param _data New value for member data
+                 */
+                eProsima_user_DllExport void data(
+                        float _data);
+
+                /*!
+                 * @brief This function returns the value of member data
+                 * @return Value of member data
+                 */
+                eProsima_user_DllExport float data() const;
+
+                /*!
+                 * @brief This function returns a reference to member data
+                 * @return Reference to member data
+                 */
+                eProsima_user_DllExport float& data();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::WriterReaderData& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::GUID_s m_writer_guid;
+                eprosima::fastdds::statistics::detail::GUID_s m_reader_guid;
+                float m_data;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure Locator2LocatorData defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class Locator2LocatorData
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport Locator2LocatorData();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~Locator2LocatorData();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
+                 */
+                eProsima_user_DllExport Locator2LocatorData(
+                        const Locator2LocatorData& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
+                 */
+                eProsima_user_DllExport Locator2LocatorData(
+                        Locator2LocatorData&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
+                 */
+                eProsima_user_DllExport Locator2LocatorData& operator =(
+                        const Locator2LocatorData& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
+                 */
+                eProsima_user_DllExport Locator2LocatorData& operator =(
+                        Locator2LocatorData&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Locator2LocatorData object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const Locator2LocatorData& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Locator2LocatorData object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const Locator2LocatorData& x) const;
+
+                /*!
+                 * @brief This function copies the value in member src_locator
+                 * @param _src_locator New value to be copied in member src_locator
+                 */
+                eProsima_user_DllExport void src_locator(
+                        const eprosima::fastdds::statistics::detail::Locator_s& _src_locator);
+
+                /*!
+                 * @brief This function moves the value in member src_locator
+                 * @param _src_locator New value to be moved in member src_locator
+                 */
+                eProsima_user_DllExport void src_locator(
+                        eprosima::fastdds::statistics::detail::Locator_s&& _src_locator);
+
+                /*!
+                 * @brief This function returns a constant reference to member src_locator
+                 * @return Constant reference to member src_locator
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::Locator_s& src_locator() const;
+
+                /*!
+                 * @brief This function returns a reference to member src_locator
+                 * @return Reference to member src_locator
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::Locator_s& src_locator();
+
+
+                /*!
+                 * @brief This function copies the value in member dst_locator
+                 * @param _dst_locator New value to be copied in member dst_locator
+                 */
+                eProsima_user_DllExport void dst_locator(
+                        const eprosima::fastdds::statistics::detail::Locator_s& _dst_locator);
+
+                /*!
+                 * @brief This function moves the value in member dst_locator
+                 * @param _dst_locator New value to be moved in member dst_locator
+                 */
+                eProsima_user_DllExport void dst_locator(
+                        eprosima::fastdds::statistics::detail::Locator_s&& _dst_locator);
+
+                /*!
+                 * @brief This function returns a constant reference to member dst_locator
+                 * @return Constant reference to member dst_locator
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::Locator_s& dst_locator() const;
+
+                /*!
+                 * @brief This function returns a reference to member dst_locator
+                 * @return Reference to member dst_locator
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::Locator_s& dst_locator();
+
+
+                /*!
+                 * @brief This function sets a value in member data
+                 * @param _data New value for member data
+                 */
+                eProsima_user_DllExport void data(
+                        float _data);
+
+                /*!
+                 * @brief This function returns the value of member data
+                 * @return Value of member data
+                 */
+                eProsima_user_DllExport float data() const;
+
+                /*!
+                 * @brief This function returns a reference to member data
+                 * @return Reference to member data
+                 */
+                eProsima_user_DllExport float& data();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::Locator2LocatorData& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::Locator_s m_src_locator;
+                eprosima::fastdds::statistics::detail::Locator_s m_dst_locator;
+                float m_data;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure EntityData defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class EntityData
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport EntityData();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~EntityData();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
+                 */
+                eProsima_user_DllExport EntityData(
+                        const EntityData& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
+                 */
+                eProsima_user_DllExport EntityData(
+                        EntityData&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
+                 */
+                eProsima_user_DllExport EntityData& operator =(
+                        const EntityData& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
+                 */
+                eProsima_user_DllExport EntityData& operator =(
+                        EntityData&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::EntityData object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const EntityData& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::EntityData object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const EntityData& x) const;
+
+                /*!
+                 * @brief This function copies the value in member guid
+                 * @param _guid New value to be copied in member guid
+                 */
+                eProsima_user_DllExport void guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _guid);
+
+                /*!
+                 * @brief This function moves the value in member guid
+                 * @param _guid New value to be moved in member guid
+                 */
+                eProsima_user_DllExport void guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member guid
+                 * @return Constant reference to member guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member guid
+                 * @return Reference to member guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& guid();
+
+
+                /*!
+                 * @brief This function sets a value in member data
+                 * @param _data New value for member data
+                 */
+                eProsima_user_DllExport void data(
+                        float _data);
+
+                /*!
+                 * @brief This function returns the value of member data
+                 * @return Value of member data
+                 */
+                eProsima_user_DllExport float data() const;
+
+                /*!
+                 * @brief This function returns a reference to member data
+                 * @return Reference to member data
+                 */
+                eProsima_user_DllExport float& data();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::EntityData& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::GUID_s m_guid;
+                float m_data;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure PhysicalData defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class PhysicalData
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport PhysicalData();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~PhysicalData();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
+                 */
+                eProsima_user_DllExport PhysicalData(
+                        const PhysicalData& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
+                 */
+                eProsima_user_DllExport PhysicalData(
+                        PhysicalData&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
+                 */
+                eProsima_user_DllExport PhysicalData& operator =(
+                        const PhysicalData& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
+                 */
+                eProsima_user_DllExport PhysicalData& operator =(
+                        PhysicalData&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::PhysicalData object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const PhysicalData& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::PhysicalData object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const PhysicalData& x) const;
+
+                /*!
+                 * @brief This function copies the value in member participant_guid
+                 * @param _participant_guid New value to be copied in member participant_guid
+                 */
+                eProsima_user_DllExport void participant_guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _participant_guid);
+
+                /*!
+                 * @brief This function moves the value in member participant_guid
+                 * @param _participant_guid New value to be moved in member participant_guid
+                 */
+                eProsima_user_DllExport void participant_guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _participant_guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member participant_guid
+                 * @return Constant reference to member participant_guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& participant_guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member participant_guid
+                 * @return Reference to member participant_guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& participant_guid();
+
+
+                /*!
+                 * @brief This function copies the value in member host
+                 * @param _host New value to be copied in member host
+                 */
+                eProsima_user_DllExport void host(
+                        const std::string& _host);
+
+                /*!
+                 * @brief This function moves the value in member host
+                 * @param _host New value to be moved in member host
+                 */
+                eProsima_user_DllExport void host(
+                        std::string&& _host);
+
+                /*!
+                 * @brief This function returns a constant reference to member host
+                 * @return Constant reference to member host
+                 */
+                eProsima_user_DllExport const std::string& host() const;
+
+                /*!
+                 * @brief This function returns a reference to member host
+                 * @return Reference to member host
+                 */
+                eProsima_user_DllExport std::string& host();
+
+
+                /*!
+                 * @brief This function copies the value in member user
+                 * @param _user New value to be copied in member user
+                 */
+                eProsima_user_DllExport void user(
+                        const std::string& _user);
+
+                /*!
+                 * @brief This function moves the value in member user
+                 * @param _user New value to be moved in member user
+                 */
+                eProsima_user_DllExport void user(
+                        std::string&& _user);
+
+                /*!
+                 * @brief This function returns a constant reference to member user
+                 * @return Constant reference to member user
+                 */
+                eProsima_user_DllExport const std::string& user() const;
+
+                /*!
+                 * @brief This function returns a reference to member user
+                 * @return Reference to member user
+                 */
+                eProsima_user_DllExport std::string& user();
+
+
+                /*!
+                 * @brief This function copies the value in member process
+                 * @param _process New value to be copied in member process
+                 */
+                eProsima_user_DllExport void process(
+                        const std::string& _process);
+
+                /*!
+                 * @brief This function moves the value in member process
+                 * @param _process New value to be moved in member process
+                 */
+                eProsima_user_DllExport void process(
+                        std::string&& _process);
+
+                /*!
+                 * @brief This function returns a constant reference to member process
+                 * @return Constant reference to member process
+                 */
+                eProsima_user_DllExport const std::string& process() const;
+
+                /*!
+                 * @brief This function returns a reference to member process
+                 * @return Reference to member process
+                 */
+                eProsima_user_DllExport std::string& process();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::PhysicalData& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::GUID_s m_participant_guid;
+                std::string m_host;
+                std::string m_user;
+                std::string m_process;
+
+            };
+
+            /*!
+             * @brief This class represents the bitmask EventKind defined by the user in the IDL file.
+             * @ingroup types
+             */
+            enum EventKindBits : uint32_t
+            {
+                HISTORY2HISTORY_LATENCY = 0x01ull << 0,
+                NETWORK_LATENCY = 0x01ull << 1,
+                PUBLICATION_THROUGHPUT = 0x01ull << 2,
+                SUBSCRIPTION_THROUGHPUT = 0x01ull << 3,
+                RTPS_SENT = 0x01ull << 4,
+                RTPS_LOST = 0x01ull << 5,
+                RESENT_DATAS = 0x01ull << 6,
+                HEARTBEAT_COUNT = 0x01ull << 7,
+                ACKNACK_COUNT = 0x01ull << 8,
+                NACKFRAG_COUNT = 0x01ull << 9,
+                GAP_COUNT = 0x01ull << 10,
+                DATA_COUNT = 0x01ull << 11,
+                PDP_PACKETS = 0x01ull << 12,
+                EDP_PACKETS = 0x01ull << 13,
+                DISCOVERED_ENTITY = 0x01ull << 14,
+                SAMPLE_DATAS = 0x01ull << 15,
+                PHYSICAL_DATA = 0x01ull << 16
+            };
+            typedef uint32_t EventKind;
+
+
+            /*!
+             * @brief This class represents the union Data defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class Data
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport Data();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~Data();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
+                 */
+                eProsima_user_DllExport Data(
+                        const Data& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
+                 */
+                eProsima_user_DllExport Data(
+                        Data&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
+                 */
+                eProsima_user_DllExport Data& operator =(
+                        const Data& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
+                 */
+                eProsima_user_DllExport Data& operator =(
+                        Data&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Data object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const Data& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Data object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const Data& x) const;
+
+                /*!
+                 * @brief This function sets the discriminator value.
+                 * @param __d New value for the discriminator.
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the new value doesn't correspond to the selected union member.
+                 */
+                eProsima_user_DllExport void _d(
+                        eprosima::fastdds::statistics::EventKind __d);
+
+                /*!
+                 * @brief This function returns the value of the discriminator.
+                 * @return Value of the discriminator
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::EventKind _d() const;
+
+                /*!
+                 * @brief This function returns a reference to the discriminator.
+                 * @return Reference to the discriminator.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::EventKind& _d();
+
+                /*!
+                 * @brief This function copies the value in member writer_reader_data
+                 * @param _writer_reader_data New value to be copied in member writer_reader_data
+                 */
+                eProsima_user_DllExport void writer_reader_data(
+                        const eprosima::fastdds::statistics::WriterReaderData& _writer_reader_data);
+
+                /*!
+                 * @brief This function moves the value in member writer_reader_data
+                 * @param _writer_reader_data New value to be moved in member writer_reader_data
+                 */
+                eProsima_user_DllExport void writer_reader_data(
+                        eprosima::fastdds::statistics::WriterReaderData&& _writer_reader_data);
+
+                /*!
+                 * @brief This function returns a constant reference to member writer_reader_data
+                 * @return Constant reference to member writer_reader_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::WriterReaderData& writer_reader_data() const;
+
+                /*!
+                 * @brief This function returns a reference to member writer_reader_data
+                 * @return Reference to member writer_reader_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::WriterReaderData& writer_reader_data();
+
+
+                /*!
+                 * @brief This function copies the value in member locator2locator_data
+                 * @param _locator2locator_data New value to be copied in member locator2locator_data
+                 */
+                eProsima_user_DllExport void locator2locator_data(
+                        const eprosima::fastdds::statistics::Locator2LocatorData& _locator2locator_data);
+
+                /*!
+                 * @brief This function moves the value in member locator2locator_data
+                 * @param _locator2locator_data New value to be moved in member locator2locator_data
+                 */
+                eProsima_user_DllExport void locator2locator_data(
+                        eprosima::fastdds::statistics::Locator2LocatorData&& _locator2locator_data);
+
+                /*!
+                 * @brief This function returns a constant reference to member locator2locator_data
+                 * @return Constant reference to member locator2locator_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::Locator2LocatorData& locator2locator_data() const;
+
+                /*!
+                 * @brief This function returns a reference to member locator2locator_data
+                 * @return Reference to member locator2locator_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::Locator2LocatorData& locator2locator_data();
+
+
+                /*!
+                 * @brief This function copies the value in member entity_data
+                 * @param _entity_data New value to be copied in member entity_data
+                 */
+                eProsima_user_DllExport void entity_data(
+                        const eprosima::fastdds::statistics::EntityData& _entity_data);
+
+                /*!
+                 * @brief This function moves the value in member entity_data
+                 * @param _entity_data New value to be moved in member entity_data
+                 */
+                eProsima_user_DllExport void entity_data(
+                        eprosima::fastdds::statistics::EntityData&& _entity_data);
+
+                /*!
+                 * @brief This function returns a constant reference to member entity_data
+                 * @return Constant reference to member entity_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::EntityData& entity_data() const;
+
+                /*!
+                 * @brief This function returns a reference to member entity_data
+                 * @return Reference to member entity_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::EntityData& entity_data();
+
+
+                /*!
+                 * @brief This function copies the value in member entity2locator_traffic
+                 * @param _entity2locator_traffic New value to be copied in member entity2locator_traffic
+                 */
+                eProsima_user_DllExport void entity2locator_traffic(
+                        const eprosima::fastdds::statistics::Entity2LocatorTraffic& _entity2locator_traffic);
+
+                /*!
+                 * @brief This function moves the value in member entity2locator_traffic
+                 * @param _entity2locator_traffic New value to be moved in member entity2locator_traffic
+                 */
+                eProsima_user_DllExport void entity2locator_traffic(
+                        eprosima::fastdds::statistics::Entity2LocatorTraffic&& _entity2locator_traffic);
+
+                /*!
+                 * @brief This function returns a constant reference to member entity2locator_traffic
+                 * @return Constant reference to member entity2locator_traffic
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::Entity2LocatorTraffic& entity2locator_traffic() const;
+
+                /*!
+                 * @brief This function returns a reference to member entity2locator_traffic
+                 * @return Reference to member entity2locator_traffic
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::Entity2LocatorTraffic& entity2locator_traffic();
+
+
+                /*!
+                 * @brief This function copies the value in member entity_count
+                 * @param _entity_count New value to be copied in member entity_count
+                 */
+                eProsima_user_DllExport void entity_count(
+                        const eprosima::fastdds::statistics::EntityCount& _entity_count);
+
+                /*!
+                 * @brief This function moves the value in member entity_count
+                 * @param _entity_count New value to be moved in member entity_count
+                 */
+                eProsima_user_DllExport void entity_count(
+                        eprosima::fastdds::statistics::EntityCount&& _entity_count);
+
+                /*!
+                 * @brief This function returns a constant reference to member entity_count
+                 * @return Constant reference to member entity_count
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::EntityCount& entity_count() const;
+
+                /*!
+                 * @brief This function returns a reference to member entity_count
+                 * @return Reference to member entity_count
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::EntityCount& entity_count();
+
+
+                /*!
+                 * @brief This function copies the value in member discovery_time
+                 * @param _discovery_time New value to be copied in member discovery_time
+                 */
+                eProsima_user_DllExport void discovery_time(
+                        const eprosima::fastdds::statistics::DiscoveryTime& _discovery_time);
+
+                /*!
+                 * @brief This function moves the value in member discovery_time
+                 * @param _discovery_time New value to be moved in member discovery_time
+                 */
+                eProsima_user_DllExport void discovery_time(
+                        eprosima::fastdds::statistics::DiscoveryTime&& _discovery_time);
+
+                /*!
+                 * @brief This function returns a constant reference to member discovery_time
+                 * @return Constant reference to member discovery_time
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::DiscoveryTime& discovery_time() const;
+
+                /*!
+                 * @brief This function returns a reference to member discovery_time
+                 * @return Reference to member discovery_time
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::DiscoveryTime& discovery_time();
+
+
+                /*!
+                 * @brief This function copies the value in member sample_identity_count
+                 * @param _sample_identity_count New value to be copied in member sample_identity_count
+                 */
+                eProsima_user_DllExport void sample_identity_count(
+                        const eprosima::fastdds::statistics::SampleIdentityCount& _sample_identity_count);
+
+                /*!
+                 * @brief This function moves the value in member sample_identity_count
+                 * @param _sample_identity_count New value to be moved in member sample_identity_count
+                 */
+                eProsima_user_DllExport void sample_identity_count(
+                        eprosima::fastdds::statistics::SampleIdentityCount&& _sample_identity_count);
+
+                /*!
+                 * @brief This function returns a constant reference to member sample_identity_count
+                 * @return Constant reference to member sample_identity_count
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::SampleIdentityCount& sample_identity_count() const;
+
+                /*!
+                 * @brief This function returns a reference to member sample_identity_count
+                 * @return Reference to member sample_identity_count
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::SampleIdentityCount& sample_identity_count();
+
+
+                /*!
+                 * @brief This function copies the value in member physical_data
+                 * @param _physical_data New value to be copied in member physical_data
+                 */
+                eProsima_user_DllExport void physical_data(
+                        const eprosima::fastdds::statistics::PhysicalData& _physical_data);
+
+                /*!
+                 * @brief This function moves the value in member physical_data
+                 * @param _physical_data New value to be moved in member physical_data
+                 */
+                eProsima_user_DllExport void physical_data(
+                        eprosima::fastdds::statistics::PhysicalData&& _physical_data);
+
+                /*!
+                 * @brief This function returns a constant reference to member physical_data
+                 * @return Constant reference to member physical_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::PhysicalData& physical_data() const;
+
+                /*!
+                 * @brief This function returns a reference to member physical_data
+                 * @return Reference to member physical_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::PhysicalData& physical_data();
+
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::Data& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+
+            private:
+
+                eprosima::fastdds::statistics::EventKind m__d;
+
+                eprosima::fastdds::statistics::WriterReaderData m_writer_reader_data;
+                eprosima::fastdds::statistics::Locator2LocatorData m_locator2locator_data;
+                eprosima::fastdds::statistics::EntityData m_entity_data;
+                eprosima::fastdds::statistics::Entity2LocatorTraffic m_entity2locator_traffic;
+                eprosima::fastdds::statistics::EntityCount m_entity_count;
+                eprosima::fastdds::statistics::DiscoveryTime m_discovery_time;
+                eprosima::fastdds::statistics::SampleIdentityCount m_sample_identity_count;
+                eprosima::fastdds::statistics::PhysicalData m_physical_data;
+            };
+
+        } // namespace statistics
+    } // namespace fastdds
 } // namespace eprosima
 
 #endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_H_
diff --git a/src/cpp/utils/Host.hpp b/src/cpp/utils/Host.hpp
index 7d9a3c6d402..427e0ea14af 100644
--- a/src/cpp/utils/Host.hpp
+++ b/src/cpp/utils/Host.hpp
@@ -17,8 +17,8 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastrtps/utils/IPFinder.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/IPFinder.h>
+#include <fastdds/utils/md5.h>
 
 namespace eprosima {
 
diff --git a/src/cpp/utils/IPFinder.cpp b/src/cpp/utils/IPFinder.cpp
index 231173cf000..b2b345a86bb 100644
--- a/src/cpp/utils/IPFinder.cpp
+++ b/src/cpp/utils/IPFinder.cpp
@@ -17,8 +17,8 @@
  *
  */
 
-#include <fastrtps/utils/IPFinder.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPFinder.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include <fastdds/dds/log/Log.hpp>
 
diff --git a/src/cpp/utils/IPLocator.cpp b/src/cpp/utils/IPLocator.cpp
index d624612a883..3127bd5d4db 100644
--- a/src/cpp/utils/IPLocator.cpp
+++ b/src/cpp/utils/IPLocator.cpp
@@ -22,8 +22,8 @@
 
 #include <asio.hpp>
 
-#include <fastrtps/utils/IPLocator.h>
-#include <fastrtps/utils/IPFinder.h>
+#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPFinder.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/utils/SystemInfo.cpp b/src/cpp/utils/SystemInfo.cpp
index 8aab32dbb9d..c871d0e2c1d 100644
--- a/src/cpp/utils/SystemInfo.cpp
+++ b/src/cpp/utils/SystemInfo.cpp
@@ -36,8 +36,8 @@
 
 #include <nlohmann/json.hpp>
 
+#include <fastdds/utils/IPFinder.h>
 #include <fastrtps/types/TypesBase.h>
-#include <fastrtps/utils/IPFinder.h>
 #include <utils/threading.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/utils/SystemInfo.hpp b/src/cpp/utils/SystemInfo.hpp
index 51f7a5fa5ab..db2a3b4434e 100644
--- a/src/cpp/utils/SystemInfo.hpp
+++ b/src/cpp/utils/SystemInfo.hpp
@@ -27,9 +27,8 @@
 #include <string>
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-
+#include <fastdds/utils/IPFinder.h>
 #include <fastrtps/types/TypesBase.h>
-#include <fastrtps/utils/IPFinder.h>
 #include <utils/Host.hpp>
 
 #if defined(_WIN32) || defined(__unix__)
diff --git a/src/cpp/utils/TimedConditionVariable.cpp b/src/cpp/utils/TimedConditionVariable.cpp
index b9aae00039d..f51eb382bbd 100644
--- a/src/cpp/utils/TimedConditionVariable.cpp
+++ b/src/cpp/utils/TimedConditionVariable.cpp
@@ -16,22 +16,22 @@
  * @file TimedConditionVariable.cpp
  */
 
-#include <fastrtps/utils/TimedConditionVariable.hpp>
+#include <fastdds/utils/TimedConditionVariable.hpp>
 
 #if defined(_WIN32)
 #include <windows.h>
 /*
-#define MS_PER_SEC      1000ULL     // MS = milliseconds
-#define US_PER_MS       1000ULL     // US = microseconds
-#define HNS_PER_US      10ULL       // HNS = hundred-nanoseconds (e.g., 1 hns = 100 ns)
-#define NS_PER_US       1000ULL
+ #define MS_PER_SEC      1000ULL     // MS = milliseconds
+ #define US_PER_MS       1000ULL     // US = microseconds
+ #define HNS_PER_US      10ULL       // HNS = hundred-nanoseconds (e.g., 1 hns = 100 ns)
+ #define NS_PER_US       1000ULL
 
-#define HNS_PER_SEC     (MS_PER_SEC * US_PER_MS * HNS_PER_US)
-#define NS_PER_HNS      (100ULL)    // NS = nanoseconds
-#define NS_PER_SEC      (MS_PER_SEC * US_PER_MS * NS_PER_US)
+ #define HNS_PER_SEC     (MS_PER_SEC * US_PER_MS * HNS_PER_US)
+ #define NS_PER_HNS      (100ULL)    // NS = nanoseconds
+ #define NS_PER_SEC      (MS_PER_SEC * US_PER_MS * NS_PER_US)
 
-int clock_gettime(int, struct timespec* tv)
-{
+   int clock_gettime(int, struct timespec* tv)
+   {
     FILETIME ft;
     ULARGE_INTEGER hnsTime;
 
@@ -48,32 +48,40 @@ int clock_gettime(int, struct timespec* tv)
     tv->tv_sec = (long)(hnsTime.QuadPart / HNS_PER_SEC);
 
     return 0;
-}
-*/
+   }
+ */
 #define exp7           10000000i64     //1E+7     //C-file part
 #define exp9         1000000000i64     //1E+9
 #define w2ux 116444736000000000i64     //1.jan1601 to 1.jan1970
-void unix_time(struct timespec* spec)
+void unix_time(
+        struct timespec* spec)
 {
-    __int64 wintime; GetSystemTimeAsFileTime((FILETIME*)& wintime);
+    __int64 wintime; GetSystemTimeAsFileTime((FILETIME*)&wintime);
     wintime -= w2ux;  spec->tv_sec = wintime / exp7;
     spec->tv_nsec = wintime % exp7 * 100;
 }
-int clock_gettime(int, timespec* spec)
+
+int clock_gettime(
+        int,
+        timespec* spec)
 {
-    static  struct timespec startspec; static double ticks2nano;
+    static struct timespec startspec; static double ticks2nano;
     static __int64 startticks, tps = 0;    __int64 tmp, curticks;
-    QueryPerformanceFrequency((LARGE_INTEGER*)& tmp); //some strange system can
-    if (tps != tmp) {
+    QueryPerformanceFrequency((LARGE_INTEGER*)&tmp);  //some strange system can
+    if (tps != tmp)
+    {
         tps = tmp; //init ~~ONCE         //possibly change freq ?
-        QueryPerformanceCounter((LARGE_INTEGER*)& startticks);
+        QueryPerformanceCounter((LARGE_INTEGER*)&startticks);
         unix_time(&startspec); ticks2nano = (double)exp9 / tps;
     }
-    QueryPerformanceCounter((LARGE_INTEGER*)& curticks); curticks -= startticks;
+    QueryPerformanceCounter((LARGE_INTEGER*)&curticks); curticks -= startticks;
     spec->tv_sec = startspec.tv_sec + (curticks / tps);
     spec->tv_nsec = (long)(startspec.tv_nsec + (double)(curticks % tps) * ticks2nano);
-    if (!(spec->tv_nsec < exp9)) { spec->tv_sec++; spec->tv_nsec -= exp9; }
+    if (!(spec->tv_nsec < exp9))
+    {
+        spec->tv_sec++; spec->tv_nsec -= exp9;
+    }
     return 0;
 }
 
-#endif
\ No newline at end of file
+#endif // if defined(_WIN32)
\ No newline at end of file
diff --git a/src/cpp/utils/collections/unordered_vector.hpp b/src/cpp/utils/collections/unordered_vector.hpp
index f9d96d88a58..df08c54a83f 100644
--- a/src/cpp/utils/collections/unordered_vector.hpp
+++ b/src/cpp/utils/collections/unordered_vector.hpp
@@ -19,7 +19,7 @@
 #ifndef SRC_CPP_UTILS_COLLECTIONS_UNORDERED_VECTOR_HPP_
 #define SRC_CPP_UTILS_COLLECTIONS_UNORDERED_VECTOR_HPP_
 
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 namespace eprosima {
 namespace utilities {
diff --git a/src/cpp/utils/md5.cpp b/src/cpp/utils/md5.cpp
index 85aa4eff3cf..c80ac4cb11a 100644
--- a/src/cpp/utils/md5.cpp
+++ b/src/cpp/utils/md5.cpp
@@ -32,7 +32,7 @@
  */
 
 /* interface header */
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 /* system implementation headers */
 #include <cstdio>
diff --git a/src/cpp/xmlparser/XMLElementParser.cpp b/src/cpp/xmlparser/XMLElementParser.cpp
index b8c69fe8622..5ca38e2c3ea 100644
--- a/src/cpp/xmlparser/XMLElementParser.cpp
+++ b/src/cpp/xmlparser/XMLElementParser.cpp
@@ -26,7 +26,7 @@
 #include <tinyxml2.h>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/utils/UnitsParser.hpp>
 
 #include <utils/string_utilities.hpp>
diff --git a/src/cpp/xmlparser/XMLEndpointParser.cpp b/src/cpp/xmlparser/XMLEndpointParser.cpp
index f961a1f403c..61cd550723f 100644
--- a/src/cpp/xmlparser/XMLEndpointParser.cpp
+++ b/src/cpp/xmlparser/XMLEndpointParser.cpp
@@ -27,7 +27,7 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.h>
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/utils/TimeConversion.h>
 
 #include <xmlparser/XMLParserUtils.hpp>
diff --git a/test/blackbox/api/dds-pim/PubSubReader.hpp b/test/blackbox/api/dds-pim/PubSubReader.hpp
index aa010d50d1a..9525aa49c53 100644
--- a/test/blackbox/api/dds-pim/PubSubReader.hpp
+++ b/test/blackbox/api/dds-pim/PubSubReader.hpp
@@ -51,7 +51,7 @@
 #include <fastdds/rtps/transport/UDPTransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 using DomainParticipantFactory = eprosima::fastdds::dds::DomainParticipantFactory;
 using eprosima::fastrtps::rtps::IPLocator;
diff --git a/test/blackbox/api/dds-pim/PubSubWriter.hpp b/test/blackbox/api/dds-pim/PubSubWriter.hpp
index 9aed5ab7cee..503e7b09431 100644
--- a/test/blackbox/api/dds-pim/PubSubWriter.hpp
+++ b/test/blackbox/api/dds-pim/PubSubWriter.hpp
@@ -51,7 +51,7 @@
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 using DomainParticipantFactory = eprosima::fastdds::dds::DomainParticipantFactory;
 using eprosima::fastrtps::rtps::IPLocator;
diff --git a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp
index 67e3c66dccc..5f89c7b5c44 100644
--- a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp
+++ b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp
@@ -24,18 +24,14 @@
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
-
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/dds/subscriber/DataReader.hpp>
-
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
-
 #include <fastdds/dds/publisher/Publisher.hpp>
 #include <fastdds/dds/publisher/DataWriter.hpp>
-
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include <gtest/gtest.h>
 
diff --git a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp
index 7cf5a84f4e1..f9cb4b91c94 100644
--- a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp
+++ b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp
@@ -23,19 +23,15 @@
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
-
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/dds/subscriber/DataReader.hpp>
-
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
-
 #include <fastdds/dds/publisher/Publisher.hpp>
 #include <fastdds/dds/publisher/DataWriter.hpp>
-
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
-#include <fastrtps/utils/IPFinder.h>
+#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPFinder.h>
 
 #include <gtest/gtest.h>
 
diff --git a/test/blackbox/common/BlackboxTestsNetworkConf.cpp b/test/blackbox/common/BlackboxTestsNetworkConf.cpp
index a1fec026ffe..bfd907d04e6 100644
--- a/test/blackbox/common/BlackboxTestsNetworkConf.cpp
+++ b/test/blackbox/common/BlackboxTestsNetworkConf.cpp
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 #include <fastdds/rtps/common/Locator.h>
-#include <fastrtps/utils/IPFinder.h>
+#include <fastdds/utils/IPFinder.h>
 
 #include "BlackboxTests.hpp"
 #include "PubSubReader.hpp"
diff --git a/test/blackbox/common/BlackboxTestsTransportUDP.cpp b/test/blackbox/common/BlackboxTestsTransportUDP.cpp
index 6f4a743d3a2..2a044c6a234 100644
--- a/test/blackbox/common/BlackboxTestsTransportUDP.cpp
+++ b/test/blackbox/common/BlackboxTestsTransportUDP.cpp
@@ -21,7 +21,7 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastrtps/utils/IPFinder.h>
+#include <fastdds/utils/IPFinder.h>
 
 #include "BlackboxTests.hpp"
 #include "DatagramInjectionTransport.hpp"
diff --git a/test/blackbox/common/RTPSAsSocketReader.hpp b/test/blackbox/common/RTPSAsSocketReader.hpp
index 7597b48033a..f50a89b0a44 100644
--- a/test/blackbox/common/RTPSAsSocketReader.hpp
+++ b/test/blackbox/common/RTPSAsSocketReader.hpp
@@ -44,9 +44,9 @@
 #include <fastdds/rtps/reader/ReaderListener.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/TimedMutex.hpp>
 #include <fastrtps/rtps/rtps_fwd.h>
-#include <fastrtps/utils/IPLocator.h>
-#include <fastrtps/utils/TimedMutex.hpp>
 #include <gtest/gtest.h>
 
 using eprosima::fastrtps::rtps::IPLocator;
diff --git a/test/blackbox/common/RTPSAsSocketWriter.hpp b/test/blackbox/common/RTPSAsSocketWriter.hpp
index e0cdaf1efa4..f19a284256d 100644
--- a/test/blackbox/common/RTPSAsSocketWriter.hpp
+++ b/test/blackbox/common/RTPSAsSocketWriter.hpp
@@ -36,8 +36,8 @@
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/rtps/rtps_fwd.h>
-#include <fastrtps/utils/IPLocator.h>
 
 using eprosima::fastrtps::rtps::IPLocator;
 
diff --git a/test/blackbox/common/RTPSWithRegistrationReader.hpp b/test/blackbox/common/RTPSWithRegistrationReader.hpp
index eb16aeaa771..a62fb3af558 100644
--- a/test/blackbox/common/RTPSWithRegistrationReader.hpp
+++ b/test/blackbox/common/RTPSWithRegistrationReader.hpp
@@ -30,16 +30,16 @@
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/ReaderListener.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/RTPSDomain.h>
-#include <fastrtps/attributes/TopicAttributes.h>
+#include <fastdds/utils/IPFinder.h>
+#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/TimedMutex.hpp>
 #include <fastrtps/rtps/rtps_fwd.h>
-#include <fastrtps/utils/IPFinder.h>
-#include <fastrtps/utils/IPLocator.h>
-#include <fastrtps/utils/TimedMutex.hpp>
 #include <gtest/gtest.h>
 
 using eprosima::fastrtps::rtps::IPLocator;
diff --git a/test/blackbox/common/RTPSWithRegistrationWriter.hpp b/test/blackbox/common/RTPSWithRegistrationWriter.hpp
index b2f8ea2d6c5..9287842cbff 100644
--- a/test/blackbox/common/RTPSWithRegistrationWriter.hpp
+++ b/test/blackbox/common/RTPSWithRegistrationWriter.hpp
@@ -32,6 +32,7 @@
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/attributes/WriterAttributes.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
@@ -40,7 +41,6 @@
 #include <fastdds/rtps/transport/TransportDescriptorInterface.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/rtps/writer/WriterListener.h>
-#include <fastrtps/attributes/TopicAttributes.h>
 
 template<class TypeSupport>
 class RTPSWithRegistrationWriter
diff --git a/test/blackbox/common/UDPMessageSender.hpp b/test/blackbox/common/UDPMessageSender.hpp
index 26c340c8d5d..123e46b1873 100644
--- a/test/blackbox/common/UDPMessageSender.hpp
+++ b/test/blackbox/common/UDPMessageSender.hpp
@@ -2,7 +2,7 @@
 #include <asio/ip/udp.hpp>
 
 #include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 using namespace eprosima::fastrtps;
 using namespace eprosima::fastrtps::rtps;
diff --git a/test/blackbox/types/Data1mbPubSubTypes.h b/test/blackbox/types/Data1mbPubSubTypes.h
index a6ec2e9f983..e735efe1204 100644
--- a/test/blackbox/types/Data1mbPubSubTypes.h
+++ b/test/blackbox/types/Data1mbPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "Data1mb.h"
 
diff --git a/test/blackbox/types/Data1mbv1.h b/test/blackbox/types/Data1mbv1.h
index 2f6a28856dd..8c9068897a6 100644
--- a/test/blackbox/types/Data1mbv1.h
+++ b/test/blackbox/types/Data1mbv1.h
@@ -26,6 +26,7 @@
 #ifndef _FAST_DDS_GENERATED_DATA1MB_H_
 #define _FAST_DDS_GENERATED_DATA1MB_H_
 
+
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -160,11 +161,11 @@ class Data1mb
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -198,17 +199,18 @@ class Data1mb
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<uint8_t> m_data;
diff --git a/test/blackbox/types/Data64kbPubSubTypes.h b/test/blackbox/types/Data64kbPubSubTypes.h
index 18364f202c6..057e6fe6695 100644
--- a/test/blackbox/types/Data64kbPubSubTypes.h
+++ b/test/blackbox/types/Data64kbPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "Data64kb.h"
 
diff --git a/test/blackbox/types/Data64kbv1.h b/test/blackbox/types/Data64kbv1.h
index 42a739b7af9..67158678c35 100644
--- a/test/blackbox/types/Data64kbv1.h
+++ b/test/blackbox/types/Data64kbv1.h
@@ -26,6 +26,7 @@
 #ifndef _FAST_DDS_GENERATED_DATA64KB_H_
 #define _FAST_DDS_GENERATED_DATA64KB_H_
 
+
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -160,11 +161,11 @@ class Data64kb
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -198,17 +199,18 @@ class Data64kb
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<uint8_t> m_data;
diff --git a/test/blackbox/types/FixedSizedPubSubTypes.h b/test/blackbox/types/FixedSizedPubSubTypes.h
index ce899fe78d5..6031f646f73 100644
--- a/test/blackbox/types/FixedSizedPubSubTypes.h
+++ b/test/blackbox/types/FixedSizedPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "FixedSized.h"
 
@@ -140,7 +140,7 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType
     eProsima_user_DllExport inline bool is_plain(
         eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
-        if(data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)
+        if (data_representation == eprosima::fastdds::dds::DataRepresentationId_t::XCDR2_DATA_REPRESENTATION)
         {
             return is_plain_xcdrv2_impl();
         }
diff --git a/test/blackbox/types/FixedSizedv1.h b/test/blackbox/types/FixedSizedv1.h
index fa36159ae7c..7bdd5a48bfc 100644
--- a/test/blackbox/types/FixedSizedv1.h
+++ b/test/blackbox/types/FixedSizedv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_FIXEDSIZED_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -152,11 +152,11 @@ class FixedSized
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -190,17 +190,18 @@ class FixedSized
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint16_t m_index;
diff --git a/test/blackbox/types/HelloWorldPubSubTypes.h b/test/blackbox/types/HelloWorldPubSubTypes.h
index ddbfbab5db6..44dc2c8493d 100644
--- a/test/blackbox/types/HelloWorldPubSubTypes.h
+++ b/test/blackbox/types/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 
diff --git a/test/blackbox/types/HelloWorldTypeObject.cxx b/test/blackbox/types/HelloWorldTypeObject.cxx
index 665051b534a..733d4f37686 100644
--- a/test/blackbox/types/HelloWorldTypeObject.cxx
+++ b/test/blackbox/types/HelloWorldTypeObject.cxx
@@ -26,12 +26,14 @@ namespace { char dummy; }
 
 #include "HelloWorld.h"
 #include "HelloWorldTypeObject.h"
+
 #include <mutex>
 #include <utility>
 #include <sstream>
+
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastrtps/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypeObjectFactory.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/AnnotationParameterValue.h>
diff --git a/test/blackbox/types/HelloWorldv1.h b/test/blackbox/types/HelloWorldv1.h
index 85939a78e7e..0da688dc480 100644
--- a/test/blackbox/types/HelloWorldv1.h
+++ b/test/blackbox/types/HelloWorldv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_HELLOWORLD_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -179,11 +179,11 @@ class HelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -217,17 +217,18 @@ class HelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint16_t m_index;
diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.h b/test/blackbox/types/KeyedData1mbPubSubTypes.h
index caf92fbbfad..2633331d907 100644
--- a/test/blackbox/types/KeyedData1mbPubSubTypes.h
+++ b/test/blackbox/types/KeyedData1mbPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "KeyedData1mb.h"
 
diff --git a/test/blackbox/types/KeyedData1mbv1.h b/test/blackbox/types/KeyedData1mbv1.h
index 84efc422ae3..b45cd8747e4 100644
--- a/test/blackbox/types/KeyedData1mbv1.h
+++ b/test/blackbox/types/KeyedData1mbv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_KEYEDDATA1MB_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -181,11 +181,11 @@ class KeyedData1mb
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -219,17 +219,18 @@ class KeyedData1mb
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint16_t m_key;
diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.h b/test/blackbox/types/KeyedHelloWorldPubSubTypes.h
index 827c99ed420..98f38604d8b 100644
--- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.h
+++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "KeyedHelloWorld.h"
 
diff --git a/test/blackbox/types/KeyedHelloWorldv1.h b/test/blackbox/types/KeyedHelloWorldv1.h
index c4de8fbe0ed..ebb09b0585f 100644
--- a/test/blackbox/types/KeyedHelloWorldv1.h
+++ b/test/blackbox/types/KeyedHelloWorldv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_KEYEDHELLOWORLD_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -199,11 +199,11 @@ class KeyedHelloWorld
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -237,17 +237,18 @@ class KeyedHelloWorld
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint16_t m_key;
diff --git a/test/blackbox/types/StringTestPubSubTypes.h b/test/blackbox/types/StringTestPubSubTypes.h
index 51a448b7f62..91f577d73a7 100644
--- a/test/blackbox/types/StringTestPubSubTypes.h
+++ b/test/blackbox/types/StringTestPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "StringTest.h"
 
diff --git a/test/blackbox/types/StringTestv1.h b/test/blackbox/types/StringTestv1.h
index 0a036a76bc4..9eb81c076ce 100644
--- a/test/blackbox/types/StringTestv1.h
+++ b/test/blackbox/types/StringTestv1.h
@@ -159,11 +159,11 @@ class StringTest
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -197,17 +197,18 @@ class StringTest
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     eprosima::fastcdr::fixed_string<10000> m_message;
diff --git a/test/blackbox/types/TestIncludeRegression3361PubSubTypes.h b/test/blackbox/types/TestIncludeRegression3361PubSubTypes.h
index 816d55fe4a4..c915353f8dd 100644
--- a/test/blackbox/types/TestIncludeRegression3361PubSubTypes.h
+++ b/test/blackbox/types/TestIncludeRegression3361PubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "TestIncludeRegression3361.h"
 
diff --git a/test/blackbox/types/TestIncludeRegression3361TypeObject.cxx b/test/blackbox/types/TestIncludeRegression3361TypeObject.cxx
index 9fa90fe1008..06eb75764a2 100644
--- a/test/blackbox/types/TestIncludeRegression3361TypeObject.cxx
+++ b/test/blackbox/types/TestIncludeRegression3361TypeObject.cxx
@@ -26,12 +26,14 @@ namespace { char dummy; }
 
 #include "TestIncludeRegression3361.h"
 #include "TestIncludeRegression3361TypeObject.h"
+
 #include <mutex>
 #include <utility>
 #include <sstream>
+
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastrtps/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypeObjectFactory.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/AnnotationParameterValue.h>
diff --git a/test/blackbox/types/TestIncludeRegression3361v1.h b/test/blackbox/types/TestIncludeRegression3361v1.h
index 1a0e30a4d81..2a1357dd9f2 100644
--- a/test/blackbox/types/TestIncludeRegression3361v1.h
+++ b/test/blackbox/types/TestIncludeRegression3361v1.h
@@ -26,6 +26,7 @@
 #ifndef _FAST_DDS_GENERATED_TESTINCLUDEREGRESSION3361_H_
 #define _FAST_DDS_GENERATED_TESTINCLUDEREGRESSION3361_H_
 
+
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -69,7 +70,7 @@ class Cdr;
 
 
 namespace TestModule {
-typedef std::string MACHINEID;
+    typedef std::string MACHINEID;
 
 } // namespace TestModule
 
diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.h b/test/blackbox/types/TestRegression3361PubSubTypes.h
index a6c5be91dc5..90db335a356 100644
--- a/test/blackbox/types/TestRegression3361PubSubTypes.h
+++ b/test/blackbox/types/TestRegression3361PubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "TestRegression3361.h"
 
diff --git a/test/blackbox/types/TestRegression3361TypeObject.cxx b/test/blackbox/types/TestRegression3361TypeObject.cxx
index 39450c3c9fd..a6c1d5d6ede 100644
--- a/test/blackbox/types/TestRegression3361TypeObject.cxx
+++ b/test/blackbox/types/TestRegression3361TypeObject.cxx
@@ -26,12 +26,14 @@ namespace { char dummy; }
 
 #include "TestRegression3361.h"
 #include "TestRegression3361TypeObject.h"
+
 #include <mutex>
 #include <utility>
 #include <sstream>
+
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastrtps/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypeObjectFactory.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/AnnotationParameterValue.h>
diff --git a/test/blackbox/types/TestRegression3361v1.h b/test/blackbox/types/TestRegression3361v1.h
index 427b759be8f..5d04317654d 100644
--- a/test/blackbox/types/TestRegression3361v1.h
+++ b/test/blackbox/types/TestRegression3361v1.h
@@ -160,11 +160,11 @@ class TestRegression3361
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -198,17 +198,18 @@ class TestRegression3361
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     TestModule::MACHINEID m_uuid;
diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.h b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.h
index 92026849a7a..7c0f6e1f5aa 100644
--- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.h
+++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "UnboundedHelloWorld.h"
 
diff --git a/test/blackbox/types/statistics/monitorservice_types.h b/test/blackbox/types/statistics/monitorservice_types.h
index 08f713a0ee3..646e24b28d8 100644
--- a/test/blackbox/types/statistics/monitorservice_types.h
+++ b/test/blackbox/types/statistics/monitorservice_types.h
@@ -219,7 +219,8 @@ class Connection
      * @brief This function returns a constant reference to member announced_locators
      * @return Constant reference to member announced_locators
      */
-    eProsima_user_DllExport const std::vector<eprosima::fastdds::statistics::detail::Locator_s>& announced_locators() const;
+    eProsima_user_DllExport const std::vector<eprosima::fastdds::statistics::detail::Locator_s>& announced_locators()
+    const;
 
     /*!
      * @brief This function returns a reference to member announced_locators
@@ -1024,7 +1025,8 @@ class MonitorServiceData
      * @return Constant reference to member incompatible_qos_status
      * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
      */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status() const;
+    eProsima_user_DllExport const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status()
+    const;
 
     /*!
      * @brief This function returns a reference to member incompatible_qos_status
@@ -1053,7 +1055,8 @@ class MonitorServiceData
      * @return Constant reference to member inconsistent_topic_status
      * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
      */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status() const;
+    eProsima_user_DllExport const eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status()
+    const;
 
     /*!
      * @brief This function returns a reference to member inconsistent_topic_status
@@ -1111,7 +1114,8 @@ class MonitorServiceData
      * @return Constant reference to member liveliness_changed_status
      * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
      */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status() const;
+    eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status()
+    const;
 
     /*!
      * @brief This function returns a reference to member liveliness_changed_status
diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h
index c5b04255efd..ca95cdfdbf9 100644
--- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h
+++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "monitorservice_types.h"
 
@@ -38,560 +38,557 @@
     Generated monitorservice_types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
 #endif  // GEN_API_VER
 
-namespace eprosima
-{
-    namespace fastdds
-    {
-        namespace statistics
-        {
+namespace eprosima {
+namespace fastdds {
+namespace statistics {
 
 
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type Connection defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class ConnectionPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type Connection defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class ConnectionPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef Connection type;
+    typedef Connection type;
 
-                eProsima_user_DllExport ConnectionPubSubType();
+    eProsima_user_DllExport ConnectionPubSubType();
 
-                eProsima_user_DllExport ~ConnectionPubSubType() override;
+    eProsima_user_DllExport ~ConnectionPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type QosPolicyCount_s defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class QosPolicyCount_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type QosPolicyCount_s defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class QosPolicyCount_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef QosPolicyCount_s type;
+    typedef QosPolicyCount_s type;
 
-                eProsima_user_DllExport QosPolicyCount_sPubSubType();
+    eProsima_user_DllExport QosPolicyCount_sPubSubType();
 
-                eProsima_user_DllExport ~QosPolicyCount_sPubSubType() override;
+    eProsima_user_DllExport ~QosPolicyCount_sPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type BaseStatus_s defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class BaseStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type BaseStatus_s defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class BaseStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef BaseStatus_s type;
+    typedef BaseStatus_s type;
 
-                eProsima_user_DllExport BaseStatus_sPubSubType();
+    eProsima_user_DllExport BaseStatus_sPubSubType();
 
-                eProsima_user_DllExport ~BaseStatus_sPubSubType() override;
+    eProsima_user_DllExport ~BaseStatus_sPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
-            typedef std::vector<eprosima::fastdds::statistics::QosPolicyCount_s> QosPolicyCountSeq_s;
+typedef std::vector<eprosima::fastdds::statistics::QosPolicyCount_s> QosPolicyCountSeq_s;
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type IncompatibleQoSStatus_s defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class IncompatibleQoSStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type IncompatibleQoSStatus_s defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class IncompatibleQoSStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef IncompatibleQoSStatus_s type;
+    typedef IncompatibleQoSStatus_s type;
 
-                eProsima_user_DllExport IncompatibleQoSStatus_sPubSubType();
+    eProsima_user_DllExport IncompatibleQoSStatus_sPubSubType();
 
-                eProsima_user_DllExport ~IncompatibleQoSStatus_sPubSubType() override;
+    eProsima_user_DllExport ~IncompatibleQoSStatus_sPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type LivelinessChangedStatus_s defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class LivelinessChangedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type LivelinessChangedStatus_s defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class LivelinessChangedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef LivelinessChangedStatus_s type;
+    typedef LivelinessChangedStatus_s type;
 
-                eProsima_user_DllExport LivelinessChangedStatus_sPubSubType();
+    eProsima_user_DllExport LivelinessChangedStatus_sPubSubType();
 
-                eProsima_user_DllExport ~LivelinessChangedStatus_sPubSubType() override;
+    eProsima_user_DllExport ~LivelinessChangedStatus_sPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type DeadlineMissedStatus_s defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class DeadlineMissedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type DeadlineMissedStatus_s defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class DeadlineMissedStatus_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef DeadlineMissedStatus_s type;
+    typedef DeadlineMissedStatus_s type;
 
-                eProsima_user_DllExport DeadlineMissedStatus_sPubSubType();
+    eProsima_user_DllExport DeadlineMissedStatus_sPubSubType();
 
-                eProsima_user_DllExport ~DeadlineMissedStatus_sPubSubType() override;
+    eProsima_user_DllExport ~DeadlineMissedStatus_sPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
-            typedef eprosima::fastdds::statistics::BaseStatus_s LivelinessLostStatus_s;
-            typedef eprosima::fastdds::statistics::BaseStatus_s InconsistentTopicStatus_s;
-            typedef eprosima::fastdds::statistics::BaseStatus_s SampleLostStatus_s;
+};
+typedef eprosima::fastdds::statistics::BaseStatus_s LivelinessLostStatus_s;
+typedef eprosima::fastdds::statistics::BaseStatus_s InconsistentTopicStatus_s;
+typedef eprosima::fastdds::statistics::BaseStatus_s SampleLostStatus_s;
 
 
 
@@ -600,96 +597,96 @@ namespace eprosima
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type MonitorServiceStatusData defined by the user in the IDL file.
-             * @ingroup monitorservice_types
-             */
-            class MonitorServiceStatusDataPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type MonitorServiceStatusData defined by the user in the IDL file.
+ * @ingroup monitorservice_types
+ */
+class MonitorServiceStatusDataPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef MonitorServiceStatusData type;
+    typedef MonitorServiceStatusData type;
 
-                eProsima_user_DllExport MonitorServiceStatusDataPubSubType();
+    eProsima_user_DllExport MonitorServiceStatusDataPubSubType();
 
-                eProsima_user_DllExport ~MonitorServiceStatusDataPubSubType() override;
+    eProsima_user_DllExport ~MonitorServiceStatusDataPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
-        }
-    }
-}
+};
+} // namespace statistics
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_H_
 
diff --git a/test/blackbox/types/statistics/monitorservice_typesv1.h b/test/blackbox/types/statistics/monitorservice_typesv1.h
index fde180bb00b..9bdb776f6de 100644
--- a/test/blackbox/types/statistics/monitorservice_typesv1.h
+++ b/test/blackbox/types/statistics/monitorservice_typesv1.h
@@ -28,14 +28,15 @@
 
 #include "types.h"
 
-#include <fastrtps/utils/fixed_size_string.hpp>
-
-#include <stdint.h>
 #include <array>
+#include <bitset>
+#include <cstdint>
+#include <map>
+#include <stdint.h>
 #include <string>
 #include <vector>
-#include <map>
-#include <bitset>
+
+#include <fastcdr/cdr/fixed_size_string.hpp>
 
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
@@ -211,7 +212,8 @@ namespace eprosima {
                  * @brief This function returns a constant reference to member announced_locators
                  * @return Constant reference to member announced_locators
                  */
-                eProsima_user_DllExport const std::vector<eprosima::fastdds::statistics::detail::Locator_s>& announced_locators() const;
+                eProsima_user_DllExport const std::vector<eprosima::fastdds::statistics::detail::Locator_s>& announced_locators()
+                const;
 
                 /*!
                  * @brief This function returns a reference to member announced_locators
@@ -1334,7 +1336,8 @@ namespace eprosima {
                  * @return Constant reference to member incompatible_qos_status
                  * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
                  */
-                eProsima_user_DllExport const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status() const;
+                eProsima_user_DllExport const eprosima::fastdds::statistics::IncompatibleQoSStatus_s& incompatible_qos_status()
+                const;
 
                 /*!
                  * @brief This function returns a reference to member incompatible_qos_status
@@ -1363,7 +1366,8 @@ namespace eprosima {
                  * @return Constant reference to member inconsistent_topic_status
                  * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
                  */
-                eProsima_user_DllExport const eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status() const;
+                eProsima_user_DllExport const eprosima::fastdds::statistics::InconsistentTopicStatus_s& inconsistent_topic_status()
+                const;
 
                 /*!
                  * @brief This function returns a reference to member inconsistent_topic_status
@@ -1421,7 +1425,8 @@ namespace eprosima {
                  * @return Constant reference to member liveliness_changed_status
                  * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
                  */
-                eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status() const;
+                eProsima_user_DllExport const eprosima::fastdds::statistics::LivelinessChangedStatus_s& liveliness_changed_status()
+                const;
 
                 /*!
                  * @brief This function returns a reference to member liveliness_changed_status
@@ -1751,8 +1756,8 @@ namespace eprosima {
 
             };
 
-        } // namespace statistics
-    } // namespace fastdds
+}         // namespace statistics
+}     // namespace fastdds
 } // namespace eprosima
 
 #endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_H_
diff --git a/test/blackbox/types/statistics/typesPubSubTypes.h b/test/blackbox/types/statistics/typesPubSubTypes.h
index 33e545416c8..4cee82044c4 100644
--- a/test/blackbox/types/statistics/typesPubSubTypes.h
+++ b/test/blackbox/types/statistics/typesPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "types.h"
 
@@ -37,1283 +37,1279 @@
     Generated types is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
 #endif  // GEN_API_VER
 
-namespace eprosima
-{
-    namespace fastdds
-    {
-        namespace statistics
-        {
-            namespace detail
-            {
+namespace eprosima {
+namespace fastdds {
+namespace statistics {
+namespace detail {
 
 
 
-                /*!
-                 * @brief This class represents the TopicDataType of the type EntityId_s defined by the user in the IDL file.
-                 * @ingroup types
-                 */
-                class EntityId_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-                {
-                public:
+/*!
+ * @brief This class represents the TopicDataType of the type EntityId_s defined by the user in the IDL file.
+ * @ingroup types
+ */
+class EntityId_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                    typedef EntityId_s type;
+    typedef EntityId_s type;
 
-                    eProsima_user_DllExport EntityId_sPubSubType();
+    eProsima_user_DllExport EntityId_sPubSubType();
 
-                    eProsima_user_DllExport ~EntityId_sPubSubType() override;
+    eProsima_user_DllExport ~EntityId_sPubSubType() override;
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                    {
-                        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool deserialize(
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data) override
-                    {
-                        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool getKey(
-                            void* data,
-                            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                            bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                    eProsima_user_DllExport void deleteData(
-                            void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                    eProsima_user_DllExport inline bool is_bounded() const override
-                    {
-                        return true;
-                    }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                    eProsima_user_DllExport inline bool is_plain() const override
-                    {
-                        return false;
-                    }
-
-                    eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                    {
-                        static_cast<void>(data_representation);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                    eProsima_user_DllExport inline bool construct_sample(
-                            void* memory) const override
-                    {
-                        static_cast<void>(memory);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
-                    unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-                };
+};
 
 
 
-                /*!
-                 * @brief This class represents the TopicDataType of the type GuidPrefix_s defined by the user in the IDL file.
-                 * @ingroup types
-                 */
-                class GuidPrefix_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-                {
-                public:
+/*!
+ * @brief This class represents the TopicDataType of the type GuidPrefix_s defined by the user in the IDL file.
+ * @ingroup types
+ */
+class GuidPrefix_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                    typedef GuidPrefix_s type;
+    typedef GuidPrefix_s type;
 
-                    eProsima_user_DllExport GuidPrefix_sPubSubType();
+    eProsima_user_DllExport GuidPrefix_sPubSubType();
 
-                    eProsima_user_DllExport ~GuidPrefix_sPubSubType() override;
+    eProsima_user_DllExport ~GuidPrefix_sPubSubType() override;
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                    {
-                        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool deserialize(
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data) override
-                    {
-                        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool getKey(
-                            void* data,
-                            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                            bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                    eProsima_user_DllExport void deleteData(
-                            void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                    eProsima_user_DllExport inline bool is_bounded() const override
-                    {
-                        return true;
-                    }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                    eProsima_user_DllExport inline bool is_plain() const override
-                    {
-                        return false;
-                    }
-
-                    eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                    {
-                        static_cast<void>(data_representation);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                    eProsima_user_DllExport inline bool construct_sample(
-                            void* memory) const override
-                    {
-                        static_cast<void>(memory);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
-                    unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-                };
+};
 
 
 
-                /*!
-                 * @brief This class represents the TopicDataType of the type GUID_s defined by the user in the IDL file.
-                 * @ingroup types
-                 */
-                class GUID_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-                {
-                public:
+/*!
+ * @brief This class represents the TopicDataType of the type GUID_s defined by the user in the IDL file.
+ * @ingroup types
+ */
+class GUID_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                    typedef GUID_s type;
+    typedef GUID_s type;
 
-                    eProsima_user_DllExport GUID_sPubSubType();
+    eProsima_user_DllExport GUID_sPubSubType();
 
-                    eProsima_user_DllExport ~GUID_sPubSubType() override;
+    eProsima_user_DllExport ~GUID_sPubSubType() override;
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                    {
-                        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool deserialize(
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data) override
-                    {
-                        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool getKey(
-                            void* data,
-                            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                            bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                    eProsima_user_DllExport void deleteData(
-                            void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                    eProsima_user_DllExport inline bool is_bounded() const override
-                    {
-                        return true;
-                    }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                    eProsima_user_DllExport inline bool is_plain() const override
-                    {
-                        return false;
-                    }
-
-                    eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                    {
-                        static_cast<void>(data_representation);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                    eProsima_user_DllExport inline bool construct_sample(
-                            void* memory) const override
-                    {
-                        static_cast<void>(memory);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
-                    unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-                };
+};
 
 
 
-                /*!
-                 * @brief This class represents the TopicDataType of the type SequenceNumber_s defined by the user in the IDL file.
-                 * @ingroup types
-                 */
-                class SequenceNumber_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-                {
-                public:
+/*!
+ * @brief This class represents the TopicDataType of the type SequenceNumber_s defined by the user in the IDL file.
+ * @ingroup types
+ */
+class SequenceNumber_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                    typedef SequenceNumber_s type;
+    typedef SequenceNumber_s type;
 
-                    eProsima_user_DllExport SequenceNumber_sPubSubType();
+    eProsima_user_DllExport SequenceNumber_sPubSubType();
 
-                    eProsima_user_DllExport ~SequenceNumber_sPubSubType() override;
+    eProsima_user_DllExport ~SequenceNumber_sPubSubType() override;
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                    {
-                        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool deserialize(
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data) override
-                    {
-                        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool getKey(
-                            void* data,
-                            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                            bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                    eProsima_user_DllExport void deleteData(
-                            void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                    eProsima_user_DllExport inline bool is_bounded() const override
-                    {
-                        return true;
-                    }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                    eProsima_user_DllExport inline bool is_plain() const override
-                    {
-                        return false;
-                    }
-
-                    eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                    {
-                        static_cast<void>(data_representation);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                    eProsima_user_DllExport inline bool construct_sample(
-                            void* memory) const override
-                    {
-                        static_cast<void>(memory);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
-                    unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-                };
+};
 
 
 
-                /*!
-                 * @brief This class represents the TopicDataType of the type SampleIdentity_s defined by the user in the IDL file.
-                 * @ingroup types
-                 */
-                class SampleIdentity_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-                {
-                public:
+/*!
+ * @brief This class represents the TopicDataType of the type SampleIdentity_s defined by the user in the IDL file.
+ * @ingroup types
+ */
+class SampleIdentity_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                    typedef SampleIdentity_s type;
+    typedef SampleIdentity_s type;
 
-                    eProsima_user_DllExport SampleIdentity_sPubSubType();
+    eProsima_user_DllExport SampleIdentity_sPubSubType();
 
-                    eProsima_user_DllExport ~SampleIdentity_sPubSubType() override;
+    eProsima_user_DllExport ~SampleIdentity_sPubSubType() override;
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                    {
-                        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool deserialize(
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data) override
-                    {
-                        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool getKey(
-                            void* data,
-                            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                            bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                    eProsima_user_DllExport void deleteData(
-                            void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                    eProsima_user_DllExport inline bool is_bounded() const override
-                    {
-                        return true;
-                    }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                    eProsima_user_DllExport inline bool is_plain() const override
-                    {
-                        return false;
-                    }
-
-                    eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                    {
-                        static_cast<void>(data_representation);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                    eProsima_user_DllExport inline bool construct_sample(
-                            void* memory) const override
-                    {
-                        static_cast<void>(memory);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
-                    unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-                };
+};
 
 
 
-                /*!
-                 * @brief This class represents the TopicDataType of the type Locator_s defined by the user in the IDL file.
-                 * @ingroup types
-                 */
-                class Locator_sPubSubType : public eprosima::fastdds::dds::TopicDataType
-                {
-                public:
+/*!
+ * @brief This class represents the TopicDataType of the type Locator_s defined by the user in the IDL file.
+ * @ingroup types
+ */
+class Locator_sPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                    typedef Locator_s type;
+    typedef Locator_s type;
 
-                    eProsima_user_DllExport Locator_sPubSubType();
+    eProsima_user_DllExport Locator_sPubSubType();
 
-                    eProsima_user_DllExport ~Locator_sPubSubType() override;
+    eProsima_user_DllExport ~Locator_sPubSubType() override;
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                    {
-                        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport bool serialize(
-                            void* data,
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool deserialize(
-                            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                            void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data) override
-                    {
-                        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                    }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                            void* data,
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                    eProsima_user_DllExport bool getKey(
-                            void* data,
-                            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                            bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                    eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                    eProsima_user_DllExport void deleteData(
-                            void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                    eProsima_user_DllExport inline bool is_bounded() const override
-                    {
-                        return true;
-                    }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                    eProsima_user_DllExport inline bool is_plain() const override
-                    {
-                        return false;
-                    }
-
-                    eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                    {
-                        static_cast<void>(data_representation);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
                 #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                    eProsima_user_DllExport inline bool construct_sample(
-                            void* memory) const override
-                    {
-                        static_cast<void>(memory);
-                        return false;
-                    }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
-                    unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-                };
-            }
+};
+} // namespace detail
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type DiscoveryTime defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class DiscoveryTimePubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type DiscoveryTime defined by the user in the IDL file.
+ * @ingroup types
+ */
+class DiscoveryTimePubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef DiscoveryTime type;
+    typedef DiscoveryTime type;
 
-                eProsima_user_DllExport DiscoveryTimePubSubType();
+    eProsima_user_DllExport DiscoveryTimePubSubType();
 
-                eProsima_user_DllExport ~DiscoveryTimePubSubType() override;
+    eProsima_user_DllExport ~DiscoveryTimePubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type EntityCount defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class EntityCountPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type EntityCount defined by the user in the IDL file.
+ * @ingroup types
+ */
+class EntityCountPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef EntityCount type;
+    typedef EntityCount type;
 
-                eProsima_user_DllExport EntityCountPubSubType();
+    eProsima_user_DllExport EntityCountPubSubType();
 
-                eProsima_user_DllExport ~EntityCountPubSubType() override;
+    eProsima_user_DllExport ~EntityCountPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type SampleIdentityCount defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class SampleIdentityCountPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type SampleIdentityCount defined by the user in the IDL file.
+ * @ingroup types
+ */
+class SampleIdentityCountPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef SampleIdentityCount type;
+    typedef SampleIdentityCount type;
 
-                eProsima_user_DllExport SampleIdentityCountPubSubType();
+    eProsima_user_DllExport SampleIdentityCountPubSubType();
 
-                eProsima_user_DllExport ~SampleIdentityCountPubSubType() override;
+    eProsima_user_DllExport ~SampleIdentityCountPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type Entity2LocatorTraffic defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class Entity2LocatorTrafficPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type Entity2LocatorTraffic defined by the user in the IDL file.
+ * @ingroup types
+ */
+class Entity2LocatorTrafficPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef Entity2LocatorTraffic type;
+    typedef Entity2LocatorTraffic type;
 
-                eProsima_user_DllExport Entity2LocatorTrafficPubSubType();
+    eProsima_user_DllExport Entity2LocatorTrafficPubSubType();
 
-                eProsima_user_DllExport ~Entity2LocatorTrafficPubSubType() override;
+    eProsima_user_DllExport ~Entity2LocatorTrafficPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type WriterReaderData defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class WriterReaderDataPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type WriterReaderData defined by the user in the IDL file.
+ * @ingroup types
+ */
+class WriterReaderDataPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef WriterReaderData type;
+    typedef WriterReaderData type;
 
-                eProsima_user_DllExport WriterReaderDataPubSubType();
+    eProsima_user_DllExport WriterReaderDataPubSubType();
 
-                eProsima_user_DllExport ~WriterReaderDataPubSubType() override;
+    eProsima_user_DllExport ~WriterReaderDataPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type Locator2LocatorData defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class Locator2LocatorDataPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type Locator2LocatorData defined by the user in the IDL file.
+ * @ingroup types
+ */
+class Locator2LocatorDataPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef Locator2LocatorData type;
+    typedef Locator2LocatorData type;
 
-                eProsima_user_DllExport Locator2LocatorDataPubSubType();
+    eProsima_user_DllExport Locator2LocatorDataPubSubType();
 
-                eProsima_user_DllExport ~Locator2LocatorDataPubSubType() override;
+    eProsima_user_DllExport ~Locator2LocatorDataPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type EntityData defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class EntityDataPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type EntityData defined by the user in the IDL file.
+ * @ingroup types
+ */
+class EntityDataPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef EntityData type;
+    typedef EntityData type;
 
-                eProsima_user_DllExport EntityDataPubSubType();
+    eProsima_user_DllExport EntityDataPubSubType();
 
-                eProsima_user_DllExport ~EntityDataPubSubType() override;
+    eProsima_user_DllExport ~EntityDataPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return true;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return true;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
-            /*!
-             * @brief This class represents the TopicDataType of the type PhysicalData defined by the user in the IDL file.
-             * @ingroup types
-             */
-            class PhysicalDataPubSubType : public eprosima::fastdds::dds::TopicDataType
-            {
-            public:
+/*!
+ * @brief This class represents the TopicDataType of the type PhysicalData defined by the user in the IDL file.
+ * @ingroup types
+ */
+class PhysicalDataPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
 
-                typedef PhysicalData type;
+    typedef PhysicalData type;
 
-                eProsima_user_DllExport PhysicalDataPubSubType();
+    eProsima_user_DllExport PhysicalDataPubSubType();
 
-                eProsima_user_DllExport ~PhysicalDataPubSubType() override;
+    eProsima_user_DllExport ~PhysicalDataPubSubType() override;
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
-                {
-                    return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport bool serialize(
-                        void* data,
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport bool serialize(
+            void* data,
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool deserialize(
-                        eprosima::fastrtps::rtps::SerializedPayload_t* payload,
-                        void* data) override;
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastrtps::rtps::SerializedPayload_t* payload,
+            void* data) override;
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data) override
-                {
-                    return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-                }
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
 
-                eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-                        void* data,
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            void* data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
 
-                eProsima_user_DllExport bool getKey(
-                        void* data,
-                        eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
-                        bool force_md5 = false) override;
+    eProsima_user_DllExport bool getKey(
+            void* data,
+            eprosima::fastrtps::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
 
-                eProsima_user_DllExport void* createData() override;
+    eProsima_user_DllExport void* createData() override;
 
-                eProsima_user_DllExport void deleteData(
-                        void* data) override;
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-                eProsima_user_DllExport inline bool is_bounded() const override
-                {
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_bounded() const override
+    {
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
-                eProsima_user_DllExport inline bool is_plain() const override
-                {
-                    return false;
-                }
-
-                eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
-                {
-                    static_cast<void>(data_representation);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool is_plain() const override
+    {
+        return false;
+    }
+
+    eProsima_user_DllExport inline bool is_plain(
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+    {
+        static_cast<void>(data_representation);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_IS_PLAIN
 
             #ifdef TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-                eProsima_user_DllExport inline bool construct_sample(
-                        void* memory) const override
-                {
-                    static_cast<void>(memory);
-                    return false;
-                }
+    eProsima_user_DllExport inline bool construct_sample(
+            void* memory) const override
+    {
+        static_cast<void>(memory);
+        return false;
+    }
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
-                unsigned char* m_keyBuffer;
+    MD5 m_md5;
+    unsigned char* m_keyBuffer;
 
-            };
+};
 
 
 
 
 
-        }
-    }
-}
+} // namespace statistics
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_H_
 
diff --git a/test/blackbox/types/statistics/typesv1.h b/test/blackbox/types/statistics/typesv1.h
index ceb29ad5e10..ab918b661cc 100644
--- a/test/blackbox/types/statistics/typesv1.h
+++ b/test/blackbox/types/statistics/typesv1.h
@@ -26,6 +26,7 @@
 #ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_H_
 #define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_H_
 
+
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -69,3002 +70,3020 @@ class Cdr;
 
 
 namespace eprosima {
-namespace fastdds {
-namespace statistics {
-namespace detail {
-
-
-/*!
- * @brief This class represents the structure EntityId_s defined by the user in the IDL file.
- * @ingroup types
- */
-class EntityId_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport EntityId_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~EntityId_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
-     */
-    eProsima_user_DllExport EntityId_s(
-            const EntityId_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
-     */
-    eProsima_user_DllExport EntityId_s(
-            EntityId_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
-     */
-    eProsima_user_DllExport EntityId_s& operator =(
-            const EntityId_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
-     */
-    eProsima_user_DllExport EntityId_s& operator =(
-            EntityId_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::EntityId_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const EntityId_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::EntityId_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const EntityId_s& x) const;
-
-    /*!
-     * @brief This function copies the value in member value
-     * @param _value New value to be copied in member value
-     */
-    eProsima_user_DllExport void value(
-            const std::array<uint8_t, 4>& _value);
-
-    /*!
-     * @brief This function moves the value in member value
-     * @param _value New value to be moved in member value
-     */
-    eProsima_user_DllExport void value(
-            std::array<uint8_t, 4>&& _value);
-
-    /*!
-     * @brief This function returns a constant reference to member value
-     * @return Constant reference to member value
-     */
-    eProsima_user_DllExport const std::array<uint8_t, 4>& value() const;
-
-    /*!
-     * @brief This function returns a reference to member value
-     * @return Reference to member value
-     */
-    eProsima_user_DllExport std::array<uint8_t, 4>& value();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::detail::EntityId_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    std::array<uint8_t, 4> m_value;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure GuidPrefix_s defined by the user in the IDL file.
- * @ingroup types
- */
-class GuidPrefix_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport GuidPrefix_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~GuidPrefix_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
-     */
-    eProsima_user_DllExport GuidPrefix_s(
-            const GuidPrefix_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
-     */
-    eProsima_user_DllExport GuidPrefix_s(
-            GuidPrefix_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
-     */
-    eProsima_user_DllExport GuidPrefix_s& operator =(
-            const GuidPrefix_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
-     */
-    eProsima_user_DllExport GuidPrefix_s& operator =(
-            GuidPrefix_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::GuidPrefix_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const GuidPrefix_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::GuidPrefix_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const GuidPrefix_s& x) const;
-
-    /*!
-     * @brief This function copies the value in member value
-     * @param _value New value to be copied in member value
-     */
-    eProsima_user_DllExport void value(
-            const std::array<uint8_t, 12>& _value);
-
-    /*!
-     * @brief This function moves the value in member value
-     * @param _value New value to be moved in member value
-     */
-    eProsima_user_DllExport void value(
-            std::array<uint8_t, 12>&& _value);
-
-    /*!
-     * @brief This function returns a constant reference to member value
-     * @return Constant reference to member value
-     */
-    eProsima_user_DllExport const std::array<uint8_t, 12>& value() const;
-
-    /*!
-     * @brief This function returns a reference to member value
-     * @return Reference to member value
-     */
-    eProsima_user_DllExport std::array<uint8_t, 12>& value();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::detail::GuidPrefix_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    std::array<uint8_t, 12> m_value;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure GUID_s defined by the user in the IDL file.
- * @ingroup types
- */
-class GUID_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport GUID_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~GUID_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
-     */
-    eProsima_user_DllExport GUID_s(
-            const GUID_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
-     */
-    eProsima_user_DllExport GUID_s(
-            GUID_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
-     */
-    eProsima_user_DllExport GUID_s& operator =(
-            const GUID_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
-     */
-    eProsima_user_DllExport GUID_s& operator =(
-            GUID_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::GUID_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const GUID_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::GUID_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const GUID_s& x) const;
-
-    /*!
-     * @brief This function copies the value in member guidPrefix
-     * @param _guidPrefix New value to be copied in member guidPrefix
-     */
-    eProsima_user_DllExport void guidPrefix(
-            const eprosima::fastdds::statistics::detail::GuidPrefix_s& _guidPrefix);
-
-    /*!
-     * @brief This function moves the value in member guidPrefix
-     * @param _guidPrefix New value to be moved in member guidPrefix
-     */
-    eProsima_user_DllExport void guidPrefix(
-            eprosima::fastdds::statistics::detail::GuidPrefix_s&& _guidPrefix);
-
-    /*!
-     * @brief This function returns a constant reference to member guidPrefix
-     * @return Constant reference to member guidPrefix
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GuidPrefix_s& guidPrefix() const;
-
-    /*!
-     * @brief This function returns a reference to member guidPrefix
-     * @return Reference to member guidPrefix
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GuidPrefix_s& guidPrefix();
-
-
-    /*!
-     * @brief This function copies the value in member entityId
-     * @param _entityId New value to be copied in member entityId
-     */
-    eProsima_user_DllExport void entityId(
-            const eprosima::fastdds::statistics::detail::EntityId_s& _entityId);
-
-    /*!
-     * @brief This function moves the value in member entityId
-     * @param _entityId New value to be moved in member entityId
-     */
-    eProsima_user_DllExport void entityId(
-            eprosima::fastdds::statistics::detail::EntityId_s&& _entityId);
-
-    /*!
-     * @brief This function returns a constant reference to member entityId
-     * @return Constant reference to member entityId
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::EntityId_s& entityId() const;
-
-    /*!
-     * @brief This function returns a reference to member entityId
-     * @return Reference to member entityId
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::EntityId_s& entityId();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::detail::GUID_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GuidPrefix_s m_guidPrefix;
-    eprosima::fastdds::statistics::detail::EntityId_s m_entityId;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure SequenceNumber_s defined by the user in the IDL file.
- * @ingroup types
- */
-class SequenceNumber_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport SequenceNumber_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~SequenceNumber_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
-     */
-    eProsima_user_DllExport SequenceNumber_s(
-            const SequenceNumber_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
-     */
-    eProsima_user_DllExport SequenceNumber_s(
-            SequenceNumber_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
-     */
-    eProsima_user_DllExport SequenceNumber_s& operator =(
-            const SequenceNumber_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
-     */
-    eProsima_user_DllExport SequenceNumber_s& operator =(
-            SequenceNumber_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::SequenceNumber_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const SequenceNumber_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::SequenceNumber_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const SequenceNumber_s& x) const;
-
-    /*!
-     * @brief This function sets a value in member high
-     * @param _high New value for member high
-     */
-    eProsima_user_DllExport void high(
-            int32_t _high);
-
-    /*!
-     * @brief This function returns the value of member high
-     * @return Value of member high
-     */
-    eProsima_user_DllExport int32_t high() const;
-
-    /*!
-     * @brief This function returns a reference to member high
-     * @return Reference to member high
-     */
-    eProsima_user_DllExport int32_t& high();
-
-
-    /*!
-     * @brief This function sets a value in member low
-     * @param _low New value for member low
-     */
-    eProsima_user_DllExport void low(
-            uint32_t _low);
-
-    /*!
-     * @brief This function returns the value of member low
-     * @return Value of member low
-     */
-    eProsima_user_DllExport uint32_t low() const;
-
-    /*!
-     * @brief This function returns a reference to member low
-     * @return Reference to member low
-     */
-    eProsima_user_DllExport uint32_t& low();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::detail::SequenceNumber_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    int32_t m_high;
-    uint32_t m_low;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure SampleIdentity_s defined by the user in the IDL file.
- * @ingroup types
- */
-class SampleIdentity_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport SampleIdentity_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~SampleIdentity_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentity_s(
-            const SampleIdentity_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentity_s(
-            SampleIdentity_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentity_s& operator =(
-            const SampleIdentity_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentity_s& operator =(
-            SampleIdentity_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::SampleIdentity_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const SampleIdentity_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::SampleIdentity_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const SampleIdentity_s& x) const;
-
-    /*!
-     * @brief This function copies the value in member writer_guid
-     * @param _writer_guid New value to be copied in member writer_guid
-     */
-    eProsima_user_DllExport void writer_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _writer_guid);
-
-    /*!
-     * @brief This function moves the value in member writer_guid
-     * @param _writer_guid New value to be moved in member writer_guid
-     */
-    eProsima_user_DllExport void writer_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _writer_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member writer_guid
-     * @return Constant reference to member writer_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& writer_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member writer_guid
-     * @return Reference to member writer_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& writer_guid();
-
-
-    /*!
-     * @brief This function copies the value in member sequence_number
-     * @param _sequence_number New value to be copied in member sequence_number
-     */
-    eProsima_user_DllExport void sequence_number(
-            const eprosima::fastdds::statistics::detail::SequenceNumber_s& _sequence_number);
-
-    /*!
-     * @brief This function moves the value in member sequence_number
-     * @param _sequence_number New value to be moved in member sequence_number
-     */
-    eProsima_user_DllExport void sequence_number(
-            eprosima::fastdds::statistics::detail::SequenceNumber_s&& _sequence_number);
-
-    /*!
-     * @brief This function returns a constant reference to member sequence_number
-     * @return Constant reference to member sequence_number
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::SequenceNumber_s& sequence_number() const;
-
-    /*!
-     * @brief This function returns a reference to member sequence_number
-     * @return Reference to member sequence_number
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::SequenceNumber_s& sequence_number();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::detail::SampleIdentity_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_writer_guid;
-    eprosima::fastdds::statistics::detail::SequenceNumber_s m_sequence_number;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure Locator_s defined by the user in the IDL file.
- * @ingroup types
- */
-class Locator_s
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport Locator_s();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~Locator_s();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
-     */
-    eProsima_user_DllExport Locator_s(
-            const Locator_s& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
-     */
-    eProsima_user_DllExport Locator_s(
-            Locator_s&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
-     */
-    eProsima_user_DllExport Locator_s& operator =(
-            const Locator_s& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
-     */
-    eProsima_user_DllExport Locator_s& operator =(
-            Locator_s&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::Locator_s object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const Locator_s& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::detail::Locator_s object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const Locator_s& x) const;
-
-    /*!
-     * @brief This function sets a value in member kind
-     * @param _kind New value for member kind
-     */
-    eProsima_user_DllExport void kind(
-            int32_t _kind);
-
-    /*!
-     * @brief This function returns the value of member kind
-     * @return Value of member kind
-     */
-    eProsima_user_DllExport int32_t kind() const;
-
-    /*!
-     * @brief This function returns a reference to member kind
-     * @return Reference to member kind
-     */
-    eProsima_user_DllExport int32_t& kind();
-
-
-    /*!
-     * @brief This function sets a value in member port
-     * @param _port New value for member port
-     */
-    eProsima_user_DllExport void port(
-            uint32_t _port);
-
-    /*!
-     * @brief This function returns the value of member port
-     * @return Value of member port
-     */
-    eProsima_user_DllExport uint32_t port() const;
-
-    /*!
-     * @brief This function returns a reference to member port
-     * @return Reference to member port
-     */
-    eProsima_user_DllExport uint32_t& port();
-
-
-    /*!
-     * @brief This function copies the value in member address
-     * @param _address New value to be copied in member address
-     */
-    eProsima_user_DllExport void address(
-            const std::array<uint8_t, 16>& _address);
-
-    /*!
-     * @brief This function moves the value in member address
-     * @param _address New value to be moved in member address
-     */
-    eProsima_user_DllExport void address(
-            std::array<uint8_t, 16>&& _address);
-
-    /*!
-     * @brief This function returns a constant reference to member address
-     * @return Constant reference to member address
-     */
-    eProsima_user_DllExport const std::array<uint8_t, 16>& address() const;
-
-    /*!
-     * @brief This function returns a reference to member address
-     * @return Reference to member address
-     */
-    eProsima_user_DllExport std::array<uint8_t, 16>& address();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::detail::Locator_s& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    int32_t m_kind;
-    uint32_t m_port;
-    std::array<uint8_t, 16> m_address;
-
-};
-
-}             // namespace detail
-
-
-/*!
- * @brief This class represents the structure DiscoveryTime defined by the user in the IDL file.
- * @ingroup types
- */
-class DiscoveryTime
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport DiscoveryTime();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~DiscoveryTime();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
-     */
-    eProsima_user_DllExport DiscoveryTime(
-            const DiscoveryTime& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
-     */
-    eProsima_user_DllExport DiscoveryTime(
-            DiscoveryTime&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
-     */
-    eProsima_user_DllExport DiscoveryTime& operator =(
-            const DiscoveryTime& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
-     */
-    eProsima_user_DllExport DiscoveryTime& operator =(
-            DiscoveryTime&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::DiscoveryTime object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const DiscoveryTime& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::DiscoveryTime object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const DiscoveryTime& x) const;
-
-    /*!
-     * @brief This function copies the value in member local_participant_guid
-     * @param _local_participant_guid New value to be copied in member local_participant_guid
-     */
-    eProsima_user_DllExport void local_participant_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _local_participant_guid);
-
-    /*!
-     * @brief This function moves the value in member local_participant_guid
-     * @param _local_participant_guid New value to be moved in member local_participant_guid
-     */
-    eProsima_user_DllExport void local_participant_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _local_participant_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member local_participant_guid
-     * @return Constant reference to member local_participant_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& local_participant_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member local_participant_guid
-     * @return Reference to member local_participant_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& local_participant_guid();
-
-
-    /*!
-     * @brief This function copies the value in member remote_entity_guid
-     * @param _remote_entity_guid New value to be copied in member remote_entity_guid
-     */
-    eProsima_user_DllExport void remote_entity_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _remote_entity_guid);
-
-    /*!
-     * @brief This function moves the value in member remote_entity_guid
-     * @param _remote_entity_guid New value to be moved in member remote_entity_guid
-     */
-    eProsima_user_DllExport void remote_entity_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _remote_entity_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member remote_entity_guid
-     * @return Constant reference to member remote_entity_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& remote_entity_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member remote_entity_guid
-     * @return Reference to member remote_entity_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& remote_entity_guid();
-
-
-    /*!
-     * @brief This function sets a value in member time
-     * @param _time New value for member time
-     */
-    eProsima_user_DllExport void time(
-            uint64_t _time);
-
-    /*!
-     * @brief This function returns the value of member time
-     * @return Value of member time
-     */
-    eProsima_user_DllExport uint64_t time() const;
-
-    /*!
-     * @brief This function returns a reference to member time
-     * @return Reference to member time
-     */
-    eProsima_user_DllExport uint64_t& time();
-
-
-    /*!
-     * @brief This function copies the value in member host
-     * @param _host New value to be copied in member host
-     */
-    eProsima_user_DllExport void host(
-            const std::string& _host);
-
-    /*!
-     * @brief This function moves the value in member host
-     * @param _host New value to be moved in member host
-     */
-    eProsima_user_DllExport void host(
-            std::string&& _host);
-
-    /*!
-     * @brief This function returns a constant reference to member host
-     * @return Constant reference to member host
-     */
-    eProsima_user_DllExport const std::string& host() const;
-
-    /*!
-     * @brief This function returns a reference to member host
-     * @return Reference to member host
-     */
-    eProsima_user_DllExport std::string& host();
-
-
-    /*!
-     * @brief This function copies the value in member user
-     * @param _user New value to be copied in member user
-     */
-    eProsima_user_DllExport void user(
-            const std::string& _user);
-
-    /*!
-     * @brief This function moves the value in member user
-     * @param _user New value to be moved in member user
-     */
-    eProsima_user_DllExport void user(
-            std::string&& _user);
-
-    /*!
-     * @brief This function returns a constant reference to member user
-     * @return Constant reference to member user
-     */
-    eProsima_user_DllExport const std::string& user() const;
-
-    /*!
-     * @brief This function returns a reference to member user
-     * @return Reference to member user
-     */
-    eProsima_user_DllExport std::string& user();
-
-
-    /*!
-     * @brief This function copies the value in member process
-     * @param _process New value to be copied in member process
-     */
-    eProsima_user_DllExport void process(
-            const std::string& _process);
-
-    /*!
-     * @brief This function moves the value in member process
-     * @param _process New value to be moved in member process
-     */
-    eProsima_user_DllExport void process(
-            std::string&& _process);
-
-    /*!
-     * @brief This function returns a constant reference to member process
-     * @return Constant reference to member process
-     */
-    eProsima_user_DllExport const std::string& process() const;
-
-    /*!
-     * @brief This function returns a reference to member process
-     * @return Reference to member process
-     */
-    eProsima_user_DllExport std::string& process();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::DiscoveryTime& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_local_participant_guid;
-    eprosima::fastdds::statistics::detail::GUID_s m_remote_entity_guid;
-    uint64_t m_time;
-    std::string m_host;
-    std::string m_user;
-    std::string m_process;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure EntityCount defined by the user in the IDL file.
- * @ingroup types
- */
-class EntityCount
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport EntityCount();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~EntityCount();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
-     */
-    eProsima_user_DllExport EntityCount(
-            const EntityCount& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
-     */
-    eProsima_user_DllExport EntityCount(
-            EntityCount&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
-     */
-    eProsima_user_DllExport EntityCount& operator =(
-            const EntityCount& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
-     */
-    eProsima_user_DllExport EntityCount& operator =(
-            EntityCount&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::EntityCount object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const EntityCount& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::EntityCount object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const EntityCount& x) const;
-
-    /*!
-     * @brief This function copies the value in member guid
-     * @param _guid New value to be copied in member guid
-     */
-    eProsima_user_DllExport void guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _guid);
-
-    /*!
-     * @brief This function moves the value in member guid
-     * @param _guid New value to be moved in member guid
-     */
-    eProsima_user_DllExport void guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _guid);
-
-    /*!
-     * @brief This function returns a constant reference to member guid
-     * @return Constant reference to member guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& guid() const;
-
-    /*!
-     * @brief This function returns a reference to member guid
-     * @return Reference to member guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& guid();
-
-
-    /*!
-     * @brief This function sets a value in member count
-     * @param _count New value for member count
-     */
-    eProsima_user_DllExport void count(
-            uint64_t _count);
-
-    /*!
-     * @brief This function returns the value of member count
-     * @return Value of member count
-     */
-    eProsima_user_DllExport uint64_t count() const;
-
-    /*!
-     * @brief This function returns a reference to member count
-     * @return Reference to member count
-     */
-    eProsima_user_DllExport uint64_t& count();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::EntityCount& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_guid;
-    uint64_t m_count;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure SampleIdentityCount defined by the user in the IDL file.
- * @ingroup types
- */
-class SampleIdentityCount
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport SampleIdentityCount();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~SampleIdentityCount();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentityCount(
-            const SampleIdentityCount& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentityCount(
-            SampleIdentityCount&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentityCount& operator =(
-            const SampleIdentityCount& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
-     */
-    eProsima_user_DllExport SampleIdentityCount& operator =(
-            SampleIdentityCount&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::SampleIdentityCount object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const SampleIdentityCount& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::SampleIdentityCount object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const SampleIdentityCount& x) const;
-
-    /*!
-     * @brief This function copies the value in member sample_id
-     * @param _sample_id New value to be copied in member sample_id
-     */
-    eProsima_user_DllExport void sample_id(
-            const eprosima::fastdds::statistics::detail::SampleIdentity_s& _sample_id);
-
-    /*!
-     * @brief This function moves the value in member sample_id
-     * @param _sample_id New value to be moved in member sample_id
-     */
-    eProsima_user_DllExport void sample_id(
-            eprosima::fastdds::statistics::detail::SampleIdentity_s&& _sample_id);
-
-    /*!
-     * @brief This function returns a constant reference to member sample_id
-     * @return Constant reference to member sample_id
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::SampleIdentity_s& sample_id() const;
-
-    /*!
-     * @brief This function returns a reference to member sample_id
-     * @return Reference to member sample_id
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::SampleIdentity_s& sample_id();
-
-
-    /*!
-     * @brief This function sets a value in member count
-     * @param _count New value for member count
-     */
-    eProsima_user_DllExport void count(
-            uint64_t _count);
-
-    /*!
-     * @brief This function returns the value of member count
-     * @return Value of member count
-     */
-    eProsima_user_DllExport uint64_t count() const;
-
-    /*!
-     * @brief This function returns a reference to member count
-     * @return Reference to member count
-     */
-    eProsima_user_DllExport uint64_t& count();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::SampleIdentityCount& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::SampleIdentity_s m_sample_id;
-    uint64_t m_count;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure Entity2LocatorTraffic defined by the user in the IDL file.
- * @ingroup types
- */
-class Entity2LocatorTraffic
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport Entity2LocatorTraffic();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~Entity2LocatorTraffic();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
-     */
-    eProsima_user_DllExport Entity2LocatorTraffic(
-            const Entity2LocatorTraffic& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
-     */
-    eProsima_user_DllExport Entity2LocatorTraffic(
-            Entity2LocatorTraffic&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
-     */
-    eProsima_user_DllExport Entity2LocatorTraffic& operator =(
-            const Entity2LocatorTraffic& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
-     */
-    eProsima_user_DllExport Entity2LocatorTraffic& operator =(
-            Entity2LocatorTraffic&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Entity2LocatorTraffic object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const Entity2LocatorTraffic& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Entity2LocatorTraffic object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const Entity2LocatorTraffic& x) const;
-
-    /*!
-     * @brief This function copies the value in member src_guid
-     * @param _src_guid New value to be copied in member src_guid
-     */
-    eProsima_user_DllExport void src_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _src_guid);
-
-    /*!
-     * @brief This function moves the value in member src_guid
-     * @param _src_guid New value to be moved in member src_guid
-     */
-    eProsima_user_DllExport void src_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _src_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member src_guid
-     * @return Constant reference to member src_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& src_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member src_guid
-     * @return Reference to member src_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& src_guid();
-
-
-    /*!
-     * @brief This function copies the value in member dst_locator
-     * @param _dst_locator New value to be copied in member dst_locator
-     */
-    eProsima_user_DllExport void dst_locator(
-            const eprosima::fastdds::statistics::detail::Locator_s& _dst_locator);
-
-    /*!
-     * @brief This function moves the value in member dst_locator
-     * @param _dst_locator New value to be moved in member dst_locator
-     */
-    eProsima_user_DllExport void dst_locator(
-            eprosima::fastdds::statistics::detail::Locator_s&& _dst_locator);
-
-    /*!
-     * @brief This function returns a constant reference to member dst_locator
-     * @return Constant reference to member dst_locator
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::Locator_s& dst_locator() const;
-
-    /*!
-     * @brief This function returns a reference to member dst_locator
-     * @return Reference to member dst_locator
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::Locator_s& dst_locator();
-
-
-    /*!
-     * @brief This function sets a value in member packet_count
-     * @param _packet_count New value for member packet_count
-     */
-    eProsima_user_DllExport void packet_count(
-            uint64_t _packet_count);
-
-    /*!
-     * @brief This function returns the value of member packet_count
-     * @return Value of member packet_count
-     */
-    eProsima_user_DllExport uint64_t packet_count() const;
-
-    /*!
-     * @brief This function returns a reference to member packet_count
-     * @return Reference to member packet_count
-     */
-    eProsima_user_DllExport uint64_t& packet_count();
-
-
-    /*!
-     * @brief This function sets a value in member byte_count
-     * @param _byte_count New value for member byte_count
-     */
-    eProsima_user_DllExport void byte_count(
-            uint64_t _byte_count);
-
-    /*!
-     * @brief This function returns the value of member byte_count
-     * @return Value of member byte_count
-     */
-    eProsima_user_DllExport uint64_t byte_count() const;
-
-    /*!
-     * @brief This function returns a reference to member byte_count
-     * @return Reference to member byte_count
-     */
-    eProsima_user_DllExport uint64_t& byte_count();
-
-
-    /*!
-     * @brief This function sets a value in member byte_magnitude_order
-     * @param _byte_magnitude_order New value for member byte_magnitude_order
-     */
-    eProsima_user_DllExport void byte_magnitude_order(
-            int16_t _byte_magnitude_order);
-
-    /*!
-     * @brief This function returns the value of member byte_magnitude_order
-     * @return Value of member byte_magnitude_order
-     */
-    eProsima_user_DllExport int16_t byte_magnitude_order() const;
-
-    /*!
-     * @brief This function returns a reference to member byte_magnitude_order
-     * @return Reference to member byte_magnitude_order
-     */
-    eProsima_user_DllExport int16_t& byte_magnitude_order();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::Entity2LocatorTraffic& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_src_guid;
-    eprosima::fastdds::statistics::detail::Locator_s m_dst_locator;
-    uint64_t m_packet_count;
-    uint64_t m_byte_count;
-    int16_t m_byte_magnitude_order;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure WriterReaderData defined by the user in the IDL file.
- * @ingroup types
- */
-class WriterReaderData
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport WriterReaderData();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~WriterReaderData();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
-     */
-    eProsima_user_DllExport WriterReaderData(
-            const WriterReaderData& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
-     */
-    eProsima_user_DllExport WriterReaderData(
-            WriterReaderData&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
-     */
-    eProsima_user_DllExport WriterReaderData& operator =(
-            const WriterReaderData& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
-     */
-    eProsima_user_DllExport WriterReaderData& operator =(
-            WriterReaderData&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::WriterReaderData object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const WriterReaderData& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::WriterReaderData object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const WriterReaderData& x) const;
-
-    /*!
-     * @brief This function copies the value in member writer_guid
-     * @param _writer_guid New value to be copied in member writer_guid
-     */
-    eProsima_user_DllExport void writer_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _writer_guid);
-
-    /*!
-     * @brief This function moves the value in member writer_guid
-     * @param _writer_guid New value to be moved in member writer_guid
-     */
-    eProsima_user_DllExport void writer_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _writer_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member writer_guid
-     * @return Constant reference to member writer_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& writer_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member writer_guid
-     * @return Reference to member writer_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& writer_guid();
-
-
-    /*!
-     * @brief This function copies the value in member reader_guid
-     * @param _reader_guid New value to be copied in member reader_guid
-     */
-    eProsima_user_DllExport void reader_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _reader_guid);
-
-    /*!
-     * @brief This function moves the value in member reader_guid
-     * @param _reader_guid New value to be moved in member reader_guid
-     */
-    eProsima_user_DllExport void reader_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _reader_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member reader_guid
-     * @return Constant reference to member reader_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& reader_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member reader_guid
-     * @return Reference to member reader_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& reader_guid();
-
-
-    /*!
-     * @brief This function sets a value in member data
-     * @param _data New value for member data
-     */
-    eProsima_user_DllExport void data(
-            float _data);
-
-    /*!
-     * @brief This function returns the value of member data
-     * @return Value of member data
-     */
-    eProsima_user_DllExport float data() const;
-
-    /*!
-     * @brief This function returns a reference to member data
-     * @return Reference to member data
-     */
-    eProsima_user_DllExport float& data();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::WriterReaderData& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_writer_guid;
-    eprosima::fastdds::statistics::detail::GUID_s m_reader_guid;
-    float m_data;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure Locator2LocatorData defined by the user in the IDL file.
- * @ingroup types
- */
-class Locator2LocatorData
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport Locator2LocatorData();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~Locator2LocatorData();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
-     */
-    eProsima_user_DllExport Locator2LocatorData(
-            const Locator2LocatorData& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
-     */
-    eProsima_user_DllExport Locator2LocatorData(
-            Locator2LocatorData&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
-     */
-    eProsima_user_DllExport Locator2LocatorData& operator =(
-            const Locator2LocatorData& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
-     */
-    eProsima_user_DllExport Locator2LocatorData& operator =(
-            Locator2LocatorData&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Locator2LocatorData object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const Locator2LocatorData& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Locator2LocatorData object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const Locator2LocatorData& x) const;
-
-    /*!
-     * @brief This function copies the value in member src_locator
-     * @param _src_locator New value to be copied in member src_locator
-     */
-    eProsima_user_DllExport void src_locator(
-            const eprosima::fastdds::statistics::detail::Locator_s& _src_locator);
-
-    /*!
-     * @brief This function moves the value in member src_locator
-     * @param _src_locator New value to be moved in member src_locator
-     */
-    eProsima_user_DllExport void src_locator(
-            eprosima::fastdds::statistics::detail::Locator_s&& _src_locator);
-
-    /*!
-     * @brief This function returns a constant reference to member src_locator
-     * @return Constant reference to member src_locator
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::Locator_s& src_locator() const;
-
-    /*!
-     * @brief This function returns a reference to member src_locator
-     * @return Reference to member src_locator
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::Locator_s& src_locator();
-
-
-    /*!
-     * @brief This function copies the value in member dst_locator
-     * @param _dst_locator New value to be copied in member dst_locator
-     */
-    eProsima_user_DllExport void dst_locator(
-            const eprosima::fastdds::statistics::detail::Locator_s& _dst_locator);
-
-    /*!
-     * @brief This function moves the value in member dst_locator
-     * @param _dst_locator New value to be moved in member dst_locator
-     */
-    eProsima_user_DllExport void dst_locator(
-            eprosima::fastdds::statistics::detail::Locator_s&& _dst_locator);
-
-    /*!
-     * @brief This function returns a constant reference to member dst_locator
-     * @return Constant reference to member dst_locator
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::Locator_s& dst_locator() const;
-
-    /*!
-     * @brief This function returns a reference to member dst_locator
-     * @return Reference to member dst_locator
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::Locator_s& dst_locator();
-
-
-    /*!
-     * @brief This function sets a value in member data
-     * @param _data New value for member data
-     */
-    eProsima_user_DllExport void data(
-            float _data);
-
-    /*!
-     * @brief This function returns the value of member data
-     * @return Value of member data
-     */
-    eProsima_user_DllExport float data() const;
-
-    /*!
-     * @brief This function returns a reference to member data
-     * @return Reference to member data
-     */
-    eProsima_user_DllExport float& data();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::Locator2LocatorData& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::Locator_s m_src_locator;
-    eprosima::fastdds::statistics::detail::Locator_s m_dst_locator;
-    float m_data;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure EntityData defined by the user in the IDL file.
- * @ingroup types
- */
-class EntityData
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport EntityData();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~EntityData();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
-     */
-    eProsima_user_DllExport EntityData(
-            const EntityData& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
-     */
-    eProsima_user_DllExport EntityData(
-            EntityData&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
-     */
-    eProsima_user_DllExport EntityData& operator =(
-            const EntityData& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
-     */
-    eProsima_user_DllExport EntityData& operator =(
-            EntityData&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::EntityData object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const EntityData& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::EntityData object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const EntityData& x) const;
-
-    /*!
-     * @brief This function copies the value in member guid
-     * @param _guid New value to be copied in member guid
-     */
-    eProsima_user_DllExport void guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _guid);
-
-    /*!
-     * @brief This function moves the value in member guid
-     * @param _guid New value to be moved in member guid
-     */
-    eProsima_user_DllExport void guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _guid);
-
-    /*!
-     * @brief This function returns a constant reference to member guid
-     * @return Constant reference to member guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& guid() const;
-
-    /*!
-     * @brief This function returns a reference to member guid
-     * @return Reference to member guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& guid();
-
-
-    /*!
-     * @brief This function sets a value in member data
-     * @param _data New value for member data
-     */
-    eProsima_user_DllExport void data(
-            float _data);
-
-    /*!
-     * @brief This function returns the value of member data
-     * @return Value of member data
-     */
-    eProsima_user_DllExport float data() const;
-
-    /*!
-     * @brief This function returns a reference to member data
-     * @return Reference to member data
-     */
-    eProsima_user_DllExport float& data();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::EntityData& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_guid;
-    float m_data;
-
-};
-
-
-
-/*!
- * @brief This class represents the structure PhysicalData defined by the user in the IDL file.
- * @ingroup types
- */
-class PhysicalData
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport PhysicalData();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~PhysicalData();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
-     */
-    eProsima_user_DllExport PhysicalData(
-            const PhysicalData& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
-     */
-    eProsima_user_DllExport PhysicalData(
-            PhysicalData&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
-     */
-    eProsima_user_DllExport PhysicalData& operator =(
-            const PhysicalData& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
-     */
-    eProsima_user_DllExport PhysicalData& operator =(
-            PhysicalData&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::PhysicalData object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const PhysicalData& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::PhysicalData object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const PhysicalData& x) const;
-
-    /*!
-     * @brief This function copies the value in member participant_guid
-     * @param _participant_guid New value to be copied in member participant_guid
-     */
-    eProsima_user_DllExport void participant_guid(
-            const eprosima::fastdds::statistics::detail::GUID_s& _participant_guid);
-
-    /*!
-     * @brief This function moves the value in member participant_guid
-     * @param _participant_guid New value to be moved in member participant_guid
-     */
-    eProsima_user_DllExport void participant_guid(
-            eprosima::fastdds::statistics::detail::GUID_s&& _participant_guid);
-
-    /*!
-     * @brief This function returns a constant reference to member participant_guid
-     * @return Constant reference to member participant_guid
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& participant_guid() const;
-
-    /*!
-     * @brief This function returns a reference to member participant_guid
-     * @return Reference to member participant_guid
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& participant_guid();
-
-
-    /*!
-     * @brief This function copies the value in member host
-     * @param _host New value to be copied in member host
-     */
-    eProsima_user_DllExport void host(
-            const std::string& _host);
-
-    /*!
-     * @brief This function moves the value in member host
-     * @param _host New value to be moved in member host
-     */
-    eProsima_user_DllExport void host(
-            std::string&& _host);
-
-    /*!
-     * @brief This function returns a constant reference to member host
-     * @return Constant reference to member host
-     */
-    eProsima_user_DllExport const std::string& host() const;
-
-    /*!
-     * @brief This function returns a reference to member host
-     * @return Reference to member host
-     */
-    eProsima_user_DllExport std::string& host();
-
-
-    /*!
-     * @brief This function copies the value in member user
-     * @param _user New value to be copied in member user
-     */
-    eProsima_user_DllExport void user(
-            const std::string& _user);
-
-    /*!
-     * @brief This function moves the value in member user
-     * @param _user New value to be moved in member user
-     */
-    eProsima_user_DllExport void user(
-            std::string&& _user);
-
-    /*!
-     * @brief This function returns a constant reference to member user
-     * @return Constant reference to member user
-     */
-    eProsima_user_DllExport const std::string& user() const;
-
-    /*!
-     * @brief This function returns a reference to member user
-     * @return Reference to member user
-     */
-    eProsima_user_DllExport std::string& user();
-
-
-    /*!
-     * @brief This function copies the value in member process
-     * @param _process New value to be copied in member process
-     */
-    eProsima_user_DllExport void process(
-            const std::string& _process);
-
-    /*!
-     * @brief This function moves the value in member process
-     * @param _process New value to be moved in member process
-     */
-    eProsima_user_DllExport void process(
-            std::string&& _process);
-
-    /*!
-     * @brief This function returns a constant reference to member process
-     * @return Constant reference to member process
-     */
-    eProsima_user_DllExport const std::string& process() const;
-
-    /*!
-     * @brief This function returns a reference to member process
-     * @return Reference to member process
-     */
-    eProsima_user_DllExport std::string& process();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::PhysicalData& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    eprosima::fastdds::statistics::detail::GUID_s m_participant_guid;
-    std::string m_host;
-    std::string m_user;
-    std::string m_process;
-
-};
-
-/*!
- * @brief This class represents the bitmask EventKind defined by the user in the IDL file.
- * @ingroup types
- */
-enum EventKindBits : uint32_t
-{
-    HISTORY2HISTORY_LATENCY = 0x01ull << 0,
-    NETWORK_LATENCY = 0x01ull << 1,
-    PUBLICATION_THROUGHPUT = 0x01ull << 2,
-    SUBSCRIPTION_THROUGHPUT = 0x01ull << 3,
-    RTPS_SENT = 0x01ull << 4,
-    RTPS_LOST = 0x01ull << 5,
-    RESENT_DATAS = 0x01ull << 6,
-    HEARTBEAT_COUNT = 0x01ull << 7,
-    ACKNACK_COUNT = 0x01ull << 8,
-    NACKFRAG_COUNT = 0x01ull << 9,
-    GAP_COUNT = 0x01ull << 10,
-    DATA_COUNT = 0x01ull << 11,
-    PDP_PACKETS = 0x01ull << 12,
-    EDP_PACKETS = 0x01ull << 13,
-    DISCOVERED_ENTITY = 0x01ull << 14,
-    SAMPLE_DATAS = 0x01ull << 15,
-    PHYSICAL_DATA = 0x01ull << 16
-};
-typedef uint32_t EventKind;
-
-
-/*!
- * @brief This class represents the union Data defined by the user in the IDL file.
- * @ingroup types
- */
-class Data
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport Data();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~Data();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
-     */
-    eProsima_user_DllExport Data(
-            const Data& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
-     */
-    eProsima_user_DllExport Data(
-            Data&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
-     */
-    eProsima_user_DllExport Data& operator =(
-            const Data& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
-     */
-    eProsima_user_DllExport Data& operator =(
-            Data&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Data object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const Data& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x eprosima::fastdds::statistics::Data object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const Data& x) const;
-
-    /*!
-     * @brief This function sets the discriminator value.
-     * @param __d New value for the discriminator.
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the new value doesn't correspond to the selected union member.
-     */
-    eProsima_user_DllExport void _d(
-            eprosima::fastdds::statistics::EventKind __d);
-
-    /*!
-     * @brief This function returns the value of the discriminator.
-     * @return Value of the discriminator
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::EventKind _d() const;
-
-    /*!
-     * @brief This function returns a reference to the discriminator.
-     * @return Reference to the discriminator.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::EventKind& _d();
-
-    /*!
-     * @brief This function copies the value in member writer_reader_data
-     * @param _writer_reader_data New value to be copied in member writer_reader_data
-     */
-    eProsima_user_DllExport void writer_reader_data(
-            const eprosima::fastdds::statistics::WriterReaderData& _writer_reader_data);
-
-    /*!
-     * @brief This function moves the value in member writer_reader_data
-     * @param _writer_reader_data New value to be moved in member writer_reader_data
-     */
-    eProsima_user_DllExport void writer_reader_data(
-            eprosima::fastdds::statistics::WriterReaderData&& _writer_reader_data);
-
-    /*!
-     * @brief This function returns a constant reference to member writer_reader_data
-     * @return Constant reference to member writer_reader_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::WriterReaderData& writer_reader_data() const;
-
-    /*!
-     * @brief This function returns a reference to member writer_reader_data
-     * @return Reference to member writer_reader_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::WriterReaderData& writer_reader_data();
-
-
-    /*!
-     * @brief This function copies the value in member locator2locator_data
-     * @param _locator2locator_data New value to be copied in member locator2locator_data
-     */
-    eProsima_user_DllExport void locator2locator_data(
-            const eprosima::fastdds::statistics::Locator2LocatorData& _locator2locator_data);
-
-    /*!
-     * @brief This function moves the value in member locator2locator_data
-     * @param _locator2locator_data New value to be moved in member locator2locator_data
-     */
-    eProsima_user_DllExport void locator2locator_data(
-            eprosima::fastdds::statistics::Locator2LocatorData&& _locator2locator_data);
-
-    /*!
-     * @brief This function returns a constant reference to member locator2locator_data
-     * @return Constant reference to member locator2locator_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::Locator2LocatorData& locator2locator_data() const;
-
-    /*!
-     * @brief This function returns a reference to member locator2locator_data
-     * @return Reference to member locator2locator_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::Locator2LocatorData& locator2locator_data();
-
-
-    /*!
-     * @brief This function copies the value in member entity_data
-     * @param _entity_data New value to be copied in member entity_data
-     */
-    eProsima_user_DllExport void entity_data(
-            const eprosima::fastdds::statistics::EntityData& _entity_data);
-
-    /*!
-     * @brief This function moves the value in member entity_data
-     * @param _entity_data New value to be moved in member entity_data
-     */
-    eProsima_user_DllExport void entity_data(
-            eprosima::fastdds::statistics::EntityData&& _entity_data);
-
-    /*!
-     * @brief This function returns a constant reference to member entity_data
-     * @return Constant reference to member entity_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::EntityData& entity_data() const;
-
-    /*!
-     * @brief This function returns a reference to member entity_data
-     * @return Reference to member entity_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::EntityData& entity_data();
-
-
-    /*!
-     * @brief This function copies the value in member entity2locator_traffic
-     * @param _entity2locator_traffic New value to be copied in member entity2locator_traffic
-     */
-    eProsima_user_DllExport void entity2locator_traffic(
-            const eprosima::fastdds::statistics::Entity2LocatorTraffic& _entity2locator_traffic);
-
-    /*!
-     * @brief This function moves the value in member entity2locator_traffic
-     * @param _entity2locator_traffic New value to be moved in member entity2locator_traffic
-     */
-    eProsima_user_DllExport void entity2locator_traffic(
-            eprosima::fastdds::statistics::Entity2LocatorTraffic&& _entity2locator_traffic);
-
-    /*!
-     * @brief This function returns a constant reference to member entity2locator_traffic
-     * @return Constant reference to member entity2locator_traffic
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::Entity2LocatorTraffic& entity2locator_traffic() const;
-
-    /*!
-     * @brief This function returns a reference to member entity2locator_traffic
-     * @return Reference to member entity2locator_traffic
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::Entity2LocatorTraffic& entity2locator_traffic();
-
-
-    /*!
-     * @brief This function copies the value in member entity_count
-     * @param _entity_count New value to be copied in member entity_count
-     */
-    eProsima_user_DllExport void entity_count(
-            const eprosima::fastdds::statistics::EntityCount& _entity_count);
-
-    /*!
-     * @brief This function moves the value in member entity_count
-     * @param _entity_count New value to be moved in member entity_count
-     */
-    eProsima_user_DllExport void entity_count(
-            eprosima::fastdds::statistics::EntityCount&& _entity_count);
-
-    /*!
-     * @brief This function returns a constant reference to member entity_count
-     * @return Constant reference to member entity_count
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::EntityCount& entity_count() const;
-
-    /*!
-     * @brief This function returns a reference to member entity_count
-     * @return Reference to member entity_count
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::EntityCount& entity_count();
-
-
-    /*!
-     * @brief This function copies the value in member discovery_time
-     * @param _discovery_time New value to be copied in member discovery_time
-     */
-    eProsima_user_DllExport void discovery_time(
-            const eprosima::fastdds::statistics::DiscoveryTime& _discovery_time);
-
-    /*!
-     * @brief This function moves the value in member discovery_time
-     * @param _discovery_time New value to be moved in member discovery_time
-     */
-    eProsima_user_DllExport void discovery_time(
-            eprosima::fastdds::statistics::DiscoveryTime&& _discovery_time);
-
-    /*!
-     * @brief This function returns a constant reference to member discovery_time
-     * @return Constant reference to member discovery_time
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::DiscoveryTime& discovery_time() const;
-
-    /*!
-     * @brief This function returns a reference to member discovery_time
-     * @return Reference to member discovery_time
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::DiscoveryTime& discovery_time();
-
-
-    /*!
-     * @brief This function copies the value in member sample_identity_count
-     * @param _sample_identity_count New value to be copied in member sample_identity_count
-     */
-    eProsima_user_DllExport void sample_identity_count(
-            const eprosima::fastdds::statistics::SampleIdentityCount& _sample_identity_count);
-
-    /*!
-     * @brief This function moves the value in member sample_identity_count
-     * @param _sample_identity_count New value to be moved in member sample_identity_count
-     */
-    eProsima_user_DllExport void sample_identity_count(
-            eprosima::fastdds::statistics::SampleIdentityCount&& _sample_identity_count);
-
-    /*!
-     * @brief This function returns a constant reference to member sample_identity_count
-     * @return Constant reference to member sample_identity_count
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::SampleIdentityCount& sample_identity_count() const;
-
-    /*!
-     * @brief This function returns a reference to member sample_identity_count
-     * @return Reference to member sample_identity_count
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::SampleIdentityCount& sample_identity_count();
-
-
-    /*!
-     * @brief This function copies the value in member physical_data
-     * @param _physical_data New value to be copied in member physical_data
-     */
-    eProsima_user_DllExport void physical_data(
-            const eprosima::fastdds::statistics::PhysicalData& _physical_data);
-
-    /*!
-     * @brief This function moves the value in member physical_data
-     * @param _physical_data New value to be moved in member physical_data
-     */
-    eProsima_user_DllExport void physical_data(
-            eprosima::fastdds::statistics::PhysicalData&& _physical_data);
-
-    /*!
-     * @brief This function returns a constant reference to member physical_data
-     * @return Constant reference to member physical_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport const eprosima::fastdds::statistics::PhysicalData& physical_data() const;
-
-    /*!
-     * @brief This function returns a reference to member physical_data
-     * @return Reference to member physical_data
-     * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
-     */
-    eProsima_user_DllExport eprosima::fastdds::statistics::PhysicalData& physical_data();
-
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const eprosima::fastdds::statistics::Data& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-private:
-
-    eprosima::fastdds::statistics::EventKind m__d;
-
-    eprosima::fastdds::statistics::WriterReaderData m_writer_reader_data;
-    eprosima::fastdds::statistics::Locator2LocatorData m_locator2locator_data;
-    eprosima::fastdds::statistics::EntityData m_entity_data;
-    eprosima::fastdds::statistics::Entity2LocatorTraffic m_entity2locator_traffic;
-    eprosima::fastdds::statistics::EntityCount m_entity_count;
-    eprosima::fastdds::statistics::DiscoveryTime m_discovery_time;
-    eprosima::fastdds::statistics::SampleIdentityCount m_sample_identity_count;
-    eprosima::fastdds::statistics::PhysicalData m_physical_data;
-};
-
-}         // namespace statistics
-}     // namespace fastdds
+    namespace fastdds {
+        namespace statistics {
+            namespace detail {
+
+
+                /*!
+                 * @brief This class represents the structure EntityId_s defined by the user in the IDL file.
+                 * @ingroup types
+                 */
+                class EntityId_s
+                {
+                public:
+
+                    /*!
+                     * @brief Default constructor.
+                     */
+                    eProsima_user_DllExport EntityId_s();
+
+                    /*!
+                     * @brief Default destructor.
+                     */
+                    eProsima_user_DllExport ~EntityId_s();
+
+                    /*!
+                     * @brief Copy constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
+                     */
+                    eProsima_user_DllExport EntityId_s(
+                            const EntityId_s& x);
+
+                    /*!
+                     * @brief Move constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
+                     */
+                    eProsima_user_DllExport EntityId_s(
+                            EntityId_s&& x) noexcept;
+
+                    /*!
+                     * @brief Copy assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
+                     */
+                    eProsima_user_DllExport EntityId_s& operator =(
+                            const EntityId_s& x);
+
+                    /*!
+                     * @brief Move assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::EntityId_s that will be copied.
+                     */
+                    eProsima_user_DllExport EntityId_s& operator =(
+                            EntityId_s&& x) noexcept;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::EntityId_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator ==(
+                            const EntityId_s& x) const;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::EntityId_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator !=(
+                            const EntityId_s& x) const;
+
+                    /*!
+                     * @brief This function copies the value in member value
+                     * @param _value New value to be copied in member value
+                     */
+                    eProsima_user_DllExport void value(
+                            const std::array<uint8_t, 4>& _value);
+
+                    /*!
+                     * @brief This function moves the value in member value
+                     * @param _value New value to be moved in member value
+                     */
+                    eProsima_user_DllExport void value(
+                            std::array<uint8_t, 4>&& _value);
+
+                    /*!
+                     * @brief This function returns a constant reference to member value
+                     * @return Constant reference to member value
+                     */
+                    eProsima_user_DllExport const std::array<uint8_t, 4>& value() const;
+
+                    /*!
+                     * @brief This function returns a reference to member value
+                     * @return Reference to member value
+                     */
+                    eProsima_user_DllExport std::array<uint8_t, 4>& value();
+
+
+                    /*!
+                    * @brief This function returns the maximum serialized size of an object
+                    * depending on the buffer alignment.
+                    * @param current_alignment Buffer alignment.
+                    * @return Maximum serialized size.
+                    */
+                    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                            size_t current_alignment = 0);
+
+                    /*!
+                     * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                     * @param data Data which is calculated its serialized size.
+                     * @param current_alignment Buffer alignment.
+                     * @return Serialized size.
+                     */
+                    eProsima_user_DllExport static size_t getCdrSerializedSize(
+                            const eprosima::fastdds::statistics::detail::EntityId_s& data,
+                            size_t current_alignment = 0);
+
+
+
+                    /*!
+                     * @brief This function serializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void serialize(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+                    /*!
+                     * @brief This function deserializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void deserialize(
+                            eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                    /*!
+                    * @brief This function tells you if the Key has been defined for this type
+                    */
+                    eProsima_user_DllExport static bool isKeyDefined();
+
+                    /*!
+                    * @brief This function serializes the key members of an object using CDR serialization.
+                    * @param cdr CDR serialization object.
+                    */
+                    eProsima_user_DllExport void serializeKey(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+
+                private:
+
+                    std::array<uint8_t, 4> m_value;
+
+                };
+
+
+
+                /*!
+                 * @brief This class represents the structure GuidPrefix_s defined by the user in the IDL file.
+                 * @ingroup types
+                 */
+                class GuidPrefix_s
+                {
+                public:
+
+                    /*!
+                     * @brief Default constructor.
+                     */
+                    eProsima_user_DllExport GuidPrefix_s();
+
+                    /*!
+                     * @brief Default destructor.
+                     */
+                    eProsima_user_DllExport ~GuidPrefix_s();
+
+                    /*!
+                     * @brief Copy constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
+                     */
+                    eProsima_user_DllExport GuidPrefix_s(
+                            const GuidPrefix_s& x);
+
+                    /*!
+                     * @brief Move constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
+                     */
+                    eProsima_user_DllExport GuidPrefix_s(
+                            GuidPrefix_s&& x) noexcept;
+
+                    /*!
+                     * @brief Copy assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
+                     */
+                    eProsima_user_DllExport GuidPrefix_s& operator =(
+                            const GuidPrefix_s& x);
+
+                    /*!
+                     * @brief Move assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GuidPrefix_s that will be copied.
+                     */
+                    eProsima_user_DllExport GuidPrefix_s& operator =(
+                            GuidPrefix_s&& x) noexcept;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::GuidPrefix_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator ==(
+                            const GuidPrefix_s& x) const;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::GuidPrefix_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator !=(
+                            const GuidPrefix_s& x) const;
+
+                    /*!
+                     * @brief This function copies the value in member value
+                     * @param _value New value to be copied in member value
+                     */
+                    eProsima_user_DllExport void value(
+                            const std::array<uint8_t, 12>& _value);
+
+                    /*!
+                     * @brief This function moves the value in member value
+                     * @param _value New value to be moved in member value
+                     */
+                    eProsima_user_DllExport void value(
+                            std::array<uint8_t, 12>&& _value);
+
+                    /*!
+                     * @brief This function returns a constant reference to member value
+                     * @return Constant reference to member value
+                     */
+                    eProsima_user_DllExport const std::array<uint8_t, 12>& value() const;
+
+                    /*!
+                     * @brief This function returns a reference to member value
+                     * @return Reference to member value
+                     */
+                    eProsima_user_DllExport std::array<uint8_t, 12>& value();
+
+
+                    /*!
+                    * @brief This function returns the maximum serialized size of an object
+                    * depending on the buffer alignment.
+                    * @param current_alignment Buffer alignment.
+                    * @return Maximum serialized size.
+                    */
+                    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                            size_t current_alignment = 0);
+
+                    /*!
+                     * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                     * @param data Data which is calculated its serialized size.
+                     * @param current_alignment Buffer alignment.
+                     * @return Serialized size.
+                     */
+                    eProsima_user_DllExport static size_t getCdrSerializedSize(
+                            const eprosima::fastdds::statistics::detail::GuidPrefix_s& data,
+                            size_t current_alignment = 0);
+
+
+
+                    /*!
+                     * @brief This function serializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void serialize(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+                    /*!
+                     * @brief This function deserializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void deserialize(
+                            eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                    /*!
+                    * @brief This function tells you if the Key has been defined for this type
+                    */
+                    eProsima_user_DllExport static bool isKeyDefined();
+
+                    /*!
+                    * @brief This function serializes the key members of an object using CDR serialization.
+                    * @param cdr CDR serialization object.
+                    */
+                    eProsima_user_DllExport void serializeKey(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+
+                private:
+
+                    std::array<uint8_t, 12> m_value;
+
+                };
+
+
+
+                /*!
+                 * @brief This class represents the structure GUID_s defined by the user in the IDL file.
+                 * @ingroup types
+                 */
+                class GUID_s
+                {
+                public:
+
+                    /*!
+                     * @brief Default constructor.
+                     */
+                    eProsima_user_DllExport GUID_s();
+
+                    /*!
+                     * @brief Default destructor.
+                     */
+                    eProsima_user_DllExport ~GUID_s();
+
+                    /*!
+                     * @brief Copy constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
+                     */
+                    eProsima_user_DllExport GUID_s(
+                            const GUID_s& x);
+
+                    /*!
+                     * @brief Move constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
+                     */
+                    eProsima_user_DllExport GUID_s(
+                            GUID_s&& x) noexcept;
+
+                    /*!
+                     * @brief Copy assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
+                     */
+                    eProsima_user_DllExport GUID_s& operator =(
+                            const GUID_s& x);
+
+                    /*!
+                     * @brief Move assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::GUID_s that will be copied.
+                     */
+                    eProsima_user_DllExport GUID_s& operator =(
+                            GUID_s&& x) noexcept;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::GUID_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator ==(
+                            const GUID_s& x) const;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::GUID_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator !=(
+                            const GUID_s& x) const;
+
+                    /*!
+                     * @brief This function copies the value in member guidPrefix
+                     * @param _guidPrefix New value to be copied in member guidPrefix
+                     */
+                    eProsima_user_DllExport void guidPrefix(
+                            const eprosima::fastdds::statistics::detail::GuidPrefix_s& _guidPrefix);
+
+                    /*!
+                     * @brief This function moves the value in member guidPrefix
+                     * @param _guidPrefix New value to be moved in member guidPrefix
+                     */
+                    eProsima_user_DllExport void guidPrefix(
+                            eprosima::fastdds::statistics::detail::GuidPrefix_s&& _guidPrefix);
+
+                    /*!
+                     * @brief This function returns a constant reference to member guidPrefix
+                     * @return Constant reference to member guidPrefix
+                     */
+                    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GuidPrefix_s& guidPrefix() const;
+
+                    /*!
+                     * @brief This function returns a reference to member guidPrefix
+                     * @return Reference to member guidPrefix
+                     */
+                    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GuidPrefix_s& guidPrefix();
+
+
+                    /*!
+                     * @brief This function copies the value in member entityId
+                     * @param _entityId New value to be copied in member entityId
+                     */
+                    eProsima_user_DllExport void entityId(
+                            const eprosima::fastdds::statistics::detail::EntityId_s& _entityId);
+
+                    /*!
+                     * @brief This function moves the value in member entityId
+                     * @param _entityId New value to be moved in member entityId
+                     */
+                    eProsima_user_DllExport void entityId(
+                            eprosima::fastdds::statistics::detail::EntityId_s&& _entityId);
+
+                    /*!
+                     * @brief This function returns a constant reference to member entityId
+                     * @return Constant reference to member entityId
+                     */
+                    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::EntityId_s& entityId() const;
+
+                    /*!
+                     * @brief This function returns a reference to member entityId
+                     * @return Reference to member entityId
+                     */
+                    eProsima_user_DllExport eprosima::fastdds::statistics::detail::EntityId_s& entityId();
+
+
+                    /*!
+                    * @brief This function returns the maximum serialized size of an object
+                    * depending on the buffer alignment.
+                    * @param current_alignment Buffer alignment.
+                    * @return Maximum serialized size.
+                    */
+                    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                            size_t current_alignment = 0);
+
+                    /*!
+                     * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                     * @param data Data which is calculated its serialized size.
+                     * @param current_alignment Buffer alignment.
+                     * @return Serialized size.
+                     */
+                    eProsima_user_DllExport static size_t getCdrSerializedSize(
+                            const eprosima::fastdds::statistics::detail::GUID_s& data,
+                            size_t current_alignment = 0);
+
+
+
+                    /*!
+                     * @brief This function serializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void serialize(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+                    /*!
+                     * @brief This function deserializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void deserialize(
+                            eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                    /*!
+                    * @brief This function tells you if the Key has been defined for this type
+                    */
+                    eProsima_user_DllExport static bool isKeyDefined();
+
+                    /*!
+                    * @brief This function serializes the key members of an object using CDR serialization.
+                    * @param cdr CDR serialization object.
+                    */
+                    eProsima_user_DllExport void serializeKey(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+
+                private:
+
+                    eprosima::fastdds::statistics::detail::GuidPrefix_s m_guidPrefix;
+                    eprosima::fastdds::statistics::detail::EntityId_s m_entityId;
+
+                };
+
+
+
+                /*!
+                 * @brief This class represents the structure SequenceNumber_s defined by the user in the IDL file.
+                 * @ingroup types
+                 */
+                class SequenceNumber_s
+                {
+                public:
+
+                    /*!
+                     * @brief Default constructor.
+                     */
+                    eProsima_user_DllExport SequenceNumber_s();
+
+                    /*!
+                     * @brief Default destructor.
+                     */
+                    eProsima_user_DllExport ~SequenceNumber_s();
+
+                    /*!
+                     * @brief Copy constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
+                     */
+                    eProsima_user_DllExport SequenceNumber_s(
+                            const SequenceNumber_s& x);
+
+                    /*!
+                     * @brief Move constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
+                     */
+                    eProsima_user_DllExport SequenceNumber_s(
+                            SequenceNumber_s&& x) noexcept;
+
+                    /*!
+                     * @brief Copy assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
+                     */
+                    eProsima_user_DllExport SequenceNumber_s& operator =(
+                            const SequenceNumber_s& x);
+
+                    /*!
+                     * @brief Move assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SequenceNumber_s that will be copied.
+                     */
+                    eProsima_user_DllExport SequenceNumber_s& operator =(
+                            SequenceNumber_s&& x) noexcept;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::SequenceNumber_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator ==(
+                            const SequenceNumber_s& x) const;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::SequenceNumber_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator !=(
+                            const SequenceNumber_s& x) const;
+
+                    /*!
+                     * @brief This function sets a value in member high
+                     * @param _high New value for member high
+                     */
+                    eProsima_user_DllExport void high(
+                            int32_t _high);
+
+                    /*!
+                     * @brief This function returns the value of member high
+                     * @return Value of member high
+                     */
+                    eProsima_user_DllExport int32_t high() const;
+
+                    /*!
+                     * @brief This function returns a reference to member high
+                     * @return Reference to member high
+                     */
+                    eProsima_user_DllExport int32_t& high();
+
+
+                    /*!
+                     * @brief This function sets a value in member low
+                     * @param _low New value for member low
+                     */
+                    eProsima_user_DllExport void low(
+                            uint32_t _low);
+
+                    /*!
+                     * @brief This function returns the value of member low
+                     * @return Value of member low
+                     */
+                    eProsima_user_DllExport uint32_t low() const;
+
+                    /*!
+                     * @brief This function returns a reference to member low
+                     * @return Reference to member low
+                     */
+                    eProsima_user_DllExport uint32_t& low();
+
+
+                    /*!
+                    * @brief This function returns the maximum serialized size of an object
+                    * depending on the buffer alignment.
+                    * @param current_alignment Buffer alignment.
+                    * @return Maximum serialized size.
+                    */
+                    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                            size_t current_alignment = 0);
+
+                    /*!
+                     * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                     * @param data Data which is calculated its serialized size.
+                     * @param current_alignment Buffer alignment.
+                     * @return Serialized size.
+                     */
+                    eProsima_user_DllExport static size_t getCdrSerializedSize(
+                            const eprosima::fastdds::statistics::detail::SequenceNumber_s& data,
+                            size_t current_alignment = 0);
+
+
+
+                    /*!
+                     * @brief This function serializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void serialize(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+                    /*!
+                     * @brief This function deserializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void deserialize(
+                            eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                    /*!
+                    * @brief This function tells you if the Key has been defined for this type
+                    */
+                    eProsima_user_DllExport static bool isKeyDefined();
+
+                    /*!
+                    * @brief This function serializes the key members of an object using CDR serialization.
+                    * @param cdr CDR serialization object.
+                    */
+                    eProsima_user_DllExport void serializeKey(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+
+                private:
+
+                    int32_t m_high;
+                    uint32_t m_low;
+
+                };
+
+
+
+                /*!
+                 * @brief This class represents the structure SampleIdentity_s defined by the user in the IDL file.
+                 * @ingroup types
+                 */
+                class SampleIdentity_s
+                {
+                public:
+
+                    /*!
+                     * @brief Default constructor.
+                     */
+                    eProsima_user_DllExport SampleIdentity_s();
+
+                    /*!
+                     * @brief Default destructor.
+                     */
+                    eProsima_user_DllExport ~SampleIdentity_s();
+
+                    /*!
+                     * @brief Copy constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
+                     */
+                    eProsima_user_DllExport SampleIdentity_s(
+                            const SampleIdentity_s& x);
+
+                    /*!
+                     * @brief Move constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
+                     */
+                    eProsima_user_DllExport SampleIdentity_s(
+                            SampleIdentity_s&& x) noexcept;
+
+                    /*!
+                     * @brief Copy assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
+                     */
+                    eProsima_user_DllExport SampleIdentity_s& operator =(
+                            const SampleIdentity_s& x);
+
+                    /*!
+                     * @brief Move assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::SampleIdentity_s that will be copied.
+                     */
+                    eProsima_user_DllExport SampleIdentity_s& operator =(
+                            SampleIdentity_s&& x) noexcept;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::SampleIdentity_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator ==(
+                            const SampleIdentity_s& x) const;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::SampleIdentity_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator !=(
+                            const SampleIdentity_s& x) const;
+
+                    /*!
+                     * @brief This function copies the value in member writer_guid
+                     * @param _writer_guid New value to be copied in member writer_guid
+                     */
+                    eProsima_user_DllExport void writer_guid(
+                            const eprosima::fastdds::statistics::detail::GUID_s& _writer_guid);
+
+                    /*!
+                     * @brief This function moves the value in member writer_guid
+                     * @param _writer_guid New value to be moved in member writer_guid
+                     */
+                    eProsima_user_DllExport void writer_guid(
+                            eprosima::fastdds::statistics::detail::GUID_s&& _writer_guid);
+
+                    /*!
+                     * @brief This function returns a constant reference to member writer_guid
+                     * @return Constant reference to member writer_guid
+                     */
+                    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& writer_guid() const;
+
+                    /*!
+                     * @brief This function returns a reference to member writer_guid
+                     * @return Reference to member writer_guid
+                     */
+                    eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& writer_guid();
+
+
+                    /*!
+                     * @brief This function copies the value in member sequence_number
+                     * @param _sequence_number New value to be copied in member sequence_number
+                     */
+                    eProsima_user_DllExport void sequence_number(
+                            const eprosima::fastdds::statistics::detail::SequenceNumber_s& _sequence_number);
+
+                    /*!
+                     * @brief This function moves the value in member sequence_number
+                     * @param _sequence_number New value to be moved in member sequence_number
+                     */
+                    eProsima_user_DllExport void sequence_number(
+                            eprosima::fastdds::statistics::detail::SequenceNumber_s&& _sequence_number);
+
+                    /*!
+                     * @brief This function returns a constant reference to member sequence_number
+                     * @return Constant reference to member sequence_number
+                     */
+                    eProsima_user_DllExport const eprosima::fastdds::statistics::detail::SequenceNumber_s& sequence_number() const;
+
+                    /*!
+                     * @brief This function returns a reference to member sequence_number
+                     * @return Reference to member sequence_number
+                     */
+                    eProsima_user_DllExport eprosima::fastdds::statistics::detail::SequenceNumber_s& sequence_number();
+
+
+                    /*!
+                    * @brief This function returns the maximum serialized size of an object
+                    * depending on the buffer alignment.
+                    * @param current_alignment Buffer alignment.
+                    * @return Maximum serialized size.
+                    */
+                    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                            size_t current_alignment = 0);
+
+                    /*!
+                     * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                     * @param data Data which is calculated its serialized size.
+                     * @param current_alignment Buffer alignment.
+                     * @return Serialized size.
+                     */
+                    eProsima_user_DllExport static size_t getCdrSerializedSize(
+                            const eprosima::fastdds::statistics::detail::SampleIdentity_s& data,
+                            size_t current_alignment = 0);
+
+
+
+                    /*!
+                     * @brief This function serializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void serialize(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+                    /*!
+                     * @brief This function deserializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void deserialize(
+                            eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                    /*!
+                    * @brief This function tells you if the Key has been defined for this type
+                    */
+                    eProsima_user_DllExport static bool isKeyDefined();
+
+                    /*!
+                    * @brief This function serializes the key members of an object using CDR serialization.
+                    * @param cdr CDR serialization object.
+                    */
+                    eProsima_user_DllExport void serializeKey(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+
+                private:
+
+                    eprosima::fastdds::statistics::detail::GUID_s m_writer_guid;
+                    eprosima::fastdds::statistics::detail::SequenceNumber_s m_sequence_number;
+
+                };
+
+
+
+                /*!
+                 * @brief This class represents the structure Locator_s defined by the user in the IDL file.
+                 * @ingroup types
+                 */
+                class Locator_s
+                {
+                public:
+
+                    /*!
+                     * @brief Default constructor.
+                     */
+                    eProsima_user_DllExport Locator_s();
+
+                    /*!
+                     * @brief Default destructor.
+                     */
+                    eProsima_user_DllExport ~Locator_s();
+
+                    /*!
+                     * @brief Copy constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
+                     */
+                    eProsima_user_DllExport Locator_s(
+                            const Locator_s& x);
+
+                    /*!
+                     * @brief Move constructor.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
+                     */
+                    eProsima_user_DllExport Locator_s(
+                            Locator_s&& x) noexcept;
+
+                    /*!
+                     * @brief Copy assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
+                     */
+                    eProsima_user_DllExport Locator_s& operator =(
+                            const Locator_s& x);
+
+                    /*!
+                     * @brief Move assignment.
+                     * @param x Reference to the object eprosima::fastdds::statistics::detail::Locator_s that will be copied.
+                     */
+                    eProsima_user_DllExport Locator_s& operator =(
+                            Locator_s&& x) noexcept;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::Locator_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator ==(
+                            const Locator_s& x) const;
+
+                    /*!
+                     * @brief Comparison operator.
+                     * @param x eprosima::fastdds::statistics::detail::Locator_s object to compare.
+                     */
+                    eProsima_user_DllExport bool operator !=(
+                            const Locator_s& x) const;
+
+                    /*!
+                     * @brief This function sets a value in member kind
+                     * @param _kind New value for member kind
+                     */
+                    eProsima_user_DllExport void kind(
+                            int32_t _kind);
+
+                    /*!
+                     * @brief This function returns the value of member kind
+                     * @return Value of member kind
+                     */
+                    eProsima_user_DllExport int32_t kind() const;
+
+                    /*!
+                     * @brief This function returns a reference to member kind
+                     * @return Reference to member kind
+                     */
+                    eProsima_user_DllExport int32_t& kind();
+
+
+                    /*!
+                     * @brief This function sets a value in member port
+                     * @param _port New value for member port
+                     */
+                    eProsima_user_DllExport void port(
+                            uint32_t _port);
+
+                    /*!
+                     * @brief This function returns the value of member port
+                     * @return Value of member port
+                     */
+                    eProsima_user_DllExport uint32_t port() const;
+
+                    /*!
+                     * @brief This function returns a reference to member port
+                     * @return Reference to member port
+                     */
+                    eProsima_user_DllExport uint32_t& port();
+
+
+                    /*!
+                     * @brief This function copies the value in member address
+                     * @param _address New value to be copied in member address
+                     */
+                    eProsima_user_DllExport void address(
+                            const std::array<uint8_t, 16>& _address);
+
+                    /*!
+                     * @brief This function moves the value in member address
+                     * @param _address New value to be moved in member address
+                     */
+                    eProsima_user_DllExport void address(
+                            std::array<uint8_t, 16>&& _address);
+
+                    /*!
+                     * @brief This function returns a constant reference to member address
+                     * @return Constant reference to member address
+                     */
+                    eProsima_user_DllExport const std::array<uint8_t, 16>& address() const;
+
+                    /*!
+                     * @brief This function returns a reference to member address
+                     * @return Reference to member address
+                     */
+                    eProsima_user_DllExport std::array<uint8_t, 16>& address();
+
+
+                    /*!
+                    * @brief This function returns the maximum serialized size of an object
+                    * depending on the buffer alignment.
+                    * @param current_alignment Buffer alignment.
+                    * @return Maximum serialized size.
+                    */
+                    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                            size_t current_alignment = 0);
+
+                    /*!
+                     * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                     * @param data Data which is calculated its serialized size.
+                     * @param current_alignment Buffer alignment.
+                     * @return Serialized size.
+                     */
+                    eProsima_user_DllExport static size_t getCdrSerializedSize(
+                            const eprosima::fastdds::statistics::detail::Locator_s& data,
+                            size_t current_alignment = 0);
+
+
+
+                    /*!
+                     * @brief This function serializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void serialize(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+                    /*!
+                     * @brief This function deserializes an object using CDR serialization.
+                     * @param cdr CDR serialization object.
+                     */
+                    eProsima_user_DllExport void deserialize(
+                            eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                    /*!
+                    * @brief This function tells you if the Key has been defined for this type
+                    */
+                    eProsima_user_DllExport static bool isKeyDefined();
+
+                    /*!
+                    * @brief This function serializes the key members of an object using CDR serialization.
+                    * @param cdr CDR serialization object.
+                    */
+                    eProsima_user_DllExport void serializeKey(
+                            eprosima::fastcdr::Cdr& cdr) const;
+
+
+                private:
+
+                    int32_t m_kind;
+                    uint32_t m_port;
+                    std::array<uint8_t, 16> m_address;
+
+                };
+
+            } // namespace detail
+
+
+            /*!
+             * @brief This class represents the structure DiscoveryTime defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class DiscoveryTime
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport DiscoveryTime();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~DiscoveryTime();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
+                 */
+                eProsima_user_DllExport DiscoveryTime(
+                        const DiscoveryTime& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
+                 */
+                eProsima_user_DllExport DiscoveryTime(
+                        DiscoveryTime&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
+                 */
+                eProsima_user_DllExport DiscoveryTime& operator =(
+                        const DiscoveryTime& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::DiscoveryTime that will be copied.
+                 */
+                eProsima_user_DllExport DiscoveryTime& operator =(
+                        DiscoveryTime&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::DiscoveryTime object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const DiscoveryTime& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::DiscoveryTime object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const DiscoveryTime& x) const;
+
+                /*!
+                 * @brief This function copies the value in member local_participant_guid
+                 * @param _local_participant_guid New value to be copied in member local_participant_guid
+                 */
+                eProsima_user_DllExport void local_participant_guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _local_participant_guid);
+
+                /*!
+                 * @brief This function moves the value in member local_participant_guid
+                 * @param _local_participant_guid New value to be moved in member local_participant_guid
+                 */
+                eProsima_user_DllExport void local_participant_guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _local_participant_guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member local_participant_guid
+                 * @return Constant reference to member local_participant_guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& local_participant_guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member local_participant_guid
+                 * @return Reference to member local_participant_guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& local_participant_guid();
+
+
+                /*!
+                 * @brief This function copies the value in member remote_entity_guid
+                 * @param _remote_entity_guid New value to be copied in member remote_entity_guid
+                 */
+                eProsima_user_DllExport void remote_entity_guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _remote_entity_guid);
+
+                /*!
+                 * @brief This function moves the value in member remote_entity_guid
+                 * @param _remote_entity_guid New value to be moved in member remote_entity_guid
+                 */
+                eProsima_user_DllExport void remote_entity_guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _remote_entity_guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member remote_entity_guid
+                 * @return Constant reference to member remote_entity_guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& remote_entity_guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member remote_entity_guid
+                 * @return Reference to member remote_entity_guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& remote_entity_guid();
+
+
+                /*!
+                 * @brief This function sets a value in member time
+                 * @param _time New value for member time
+                 */
+                eProsima_user_DllExport void time(
+                        uint64_t _time);
+
+                /*!
+                 * @brief This function returns the value of member time
+                 * @return Value of member time
+                 */
+                eProsima_user_DllExport uint64_t time() const;
+
+                /*!
+                 * @brief This function returns a reference to member time
+                 * @return Reference to member time
+                 */
+                eProsima_user_DllExport uint64_t& time();
+
+
+                /*!
+                 * @brief This function copies the value in member host
+                 * @param _host New value to be copied in member host
+                 */
+                eProsima_user_DllExport void host(
+                        const std::string& _host);
+
+                /*!
+                 * @brief This function moves the value in member host
+                 * @param _host New value to be moved in member host
+                 */
+                eProsima_user_DllExport void host(
+                        std::string&& _host);
+
+                /*!
+                 * @brief This function returns a constant reference to member host
+                 * @return Constant reference to member host
+                 */
+                eProsima_user_DllExport const std::string& host() const;
+
+                /*!
+                 * @brief This function returns a reference to member host
+                 * @return Reference to member host
+                 */
+                eProsima_user_DllExport std::string& host();
+
+
+                /*!
+                 * @brief This function copies the value in member user
+                 * @param _user New value to be copied in member user
+                 */
+                eProsima_user_DllExport void user(
+                        const std::string& _user);
+
+                /*!
+                 * @brief This function moves the value in member user
+                 * @param _user New value to be moved in member user
+                 */
+                eProsima_user_DllExport void user(
+                        std::string&& _user);
+
+                /*!
+                 * @brief This function returns a constant reference to member user
+                 * @return Constant reference to member user
+                 */
+                eProsima_user_DllExport const std::string& user() const;
+
+                /*!
+                 * @brief This function returns a reference to member user
+                 * @return Reference to member user
+                 */
+                eProsima_user_DllExport std::string& user();
+
+
+                /*!
+                 * @brief This function copies the value in member process
+                 * @param _process New value to be copied in member process
+                 */
+                eProsima_user_DllExport void process(
+                        const std::string& _process);
+
+                /*!
+                 * @brief This function moves the value in member process
+                 * @param _process New value to be moved in member process
+                 */
+                eProsima_user_DllExport void process(
+                        std::string&& _process);
+
+                /*!
+                 * @brief This function returns a constant reference to member process
+                 * @return Constant reference to member process
+                 */
+                eProsima_user_DllExport const std::string& process() const;
+
+                /*!
+                 * @brief This function returns a reference to member process
+                 * @return Reference to member process
+                 */
+                eProsima_user_DllExport std::string& process();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::DiscoveryTime& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::GUID_s m_local_participant_guid;
+                eprosima::fastdds::statistics::detail::GUID_s m_remote_entity_guid;
+                uint64_t m_time;
+                std::string m_host;
+                std::string m_user;
+                std::string m_process;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure EntityCount defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class EntityCount
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport EntityCount();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~EntityCount();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
+                 */
+                eProsima_user_DllExport EntityCount(
+                        const EntityCount& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
+                 */
+                eProsima_user_DllExport EntityCount(
+                        EntityCount&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
+                 */
+                eProsima_user_DllExport EntityCount& operator =(
+                        const EntityCount& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityCount that will be copied.
+                 */
+                eProsima_user_DllExport EntityCount& operator =(
+                        EntityCount&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::EntityCount object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const EntityCount& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::EntityCount object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const EntityCount& x) const;
+
+                /*!
+                 * @brief This function copies the value in member guid
+                 * @param _guid New value to be copied in member guid
+                 */
+                eProsima_user_DllExport void guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _guid);
+
+                /*!
+                 * @brief This function moves the value in member guid
+                 * @param _guid New value to be moved in member guid
+                 */
+                eProsima_user_DllExport void guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member guid
+                 * @return Constant reference to member guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member guid
+                 * @return Reference to member guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& guid();
+
+
+                /*!
+                 * @brief This function sets a value in member count
+                 * @param _count New value for member count
+                 */
+                eProsima_user_DllExport void count(
+                        uint64_t _count);
+
+                /*!
+                 * @brief This function returns the value of member count
+                 * @return Value of member count
+                 */
+                eProsima_user_DllExport uint64_t count() const;
+
+                /*!
+                 * @brief This function returns a reference to member count
+                 * @return Reference to member count
+                 */
+                eProsima_user_DllExport uint64_t& count();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::EntityCount& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::GUID_s m_guid;
+                uint64_t m_count;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure SampleIdentityCount defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class SampleIdentityCount
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport SampleIdentityCount();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~SampleIdentityCount();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
+                 */
+                eProsima_user_DllExport SampleIdentityCount(
+                        const SampleIdentityCount& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
+                 */
+                eProsima_user_DllExport SampleIdentityCount(
+                        SampleIdentityCount&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
+                 */
+                eProsima_user_DllExport SampleIdentityCount& operator =(
+                        const SampleIdentityCount& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::SampleIdentityCount that will be copied.
+                 */
+                eProsima_user_DllExport SampleIdentityCount& operator =(
+                        SampleIdentityCount&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::SampleIdentityCount object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const SampleIdentityCount& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::SampleIdentityCount object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const SampleIdentityCount& x) const;
+
+                /*!
+                 * @brief This function copies the value in member sample_id
+                 * @param _sample_id New value to be copied in member sample_id
+                 */
+                eProsima_user_DllExport void sample_id(
+                        const eprosima::fastdds::statistics::detail::SampleIdentity_s& _sample_id);
+
+                /*!
+                 * @brief This function moves the value in member sample_id
+                 * @param _sample_id New value to be moved in member sample_id
+                 */
+                eProsima_user_DllExport void sample_id(
+                        eprosima::fastdds::statistics::detail::SampleIdentity_s&& _sample_id);
+
+                /*!
+                 * @brief This function returns a constant reference to member sample_id
+                 * @return Constant reference to member sample_id
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::SampleIdentity_s& sample_id() const;
+
+                /*!
+                 * @brief This function returns a reference to member sample_id
+                 * @return Reference to member sample_id
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::SampleIdentity_s& sample_id();
+
+
+                /*!
+                 * @brief This function sets a value in member count
+                 * @param _count New value for member count
+                 */
+                eProsima_user_DllExport void count(
+                        uint64_t _count);
+
+                /*!
+                 * @brief This function returns the value of member count
+                 * @return Value of member count
+                 */
+                eProsima_user_DllExport uint64_t count() const;
+
+                /*!
+                 * @brief This function returns a reference to member count
+                 * @return Reference to member count
+                 */
+                eProsima_user_DllExport uint64_t& count();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::SampleIdentityCount& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::SampleIdentity_s m_sample_id;
+                uint64_t m_count;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure Entity2LocatorTraffic defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class Entity2LocatorTraffic
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport Entity2LocatorTraffic();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~Entity2LocatorTraffic();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
+                 */
+                eProsima_user_DllExport Entity2LocatorTraffic(
+                        const Entity2LocatorTraffic& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
+                 */
+                eProsima_user_DllExport Entity2LocatorTraffic(
+                        Entity2LocatorTraffic&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
+                 */
+                eProsima_user_DllExport Entity2LocatorTraffic& operator =(
+                        const Entity2LocatorTraffic& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Entity2LocatorTraffic that will be copied.
+                 */
+                eProsima_user_DllExport Entity2LocatorTraffic& operator =(
+                        Entity2LocatorTraffic&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Entity2LocatorTraffic object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const Entity2LocatorTraffic& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Entity2LocatorTraffic object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const Entity2LocatorTraffic& x) const;
+
+                /*!
+                 * @brief This function copies the value in member src_guid
+                 * @param _src_guid New value to be copied in member src_guid
+                 */
+                eProsima_user_DllExport void src_guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _src_guid);
+
+                /*!
+                 * @brief This function moves the value in member src_guid
+                 * @param _src_guid New value to be moved in member src_guid
+                 */
+                eProsima_user_DllExport void src_guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _src_guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member src_guid
+                 * @return Constant reference to member src_guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& src_guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member src_guid
+                 * @return Reference to member src_guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& src_guid();
+
+
+                /*!
+                 * @brief This function copies the value in member dst_locator
+                 * @param _dst_locator New value to be copied in member dst_locator
+                 */
+                eProsima_user_DllExport void dst_locator(
+                        const eprosima::fastdds::statistics::detail::Locator_s& _dst_locator);
+
+                /*!
+                 * @brief This function moves the value in member dst_locator
+                 * @param _dst_locator New value to be moved in member dst_locator
+                 */
+                eProsima_user_DllExport void dst_locator(
+                        eprosima::fastdds::statistics::detail::Locator_s&& _dst_locator);
+
+                /*!
+                 * @brief This function returns a constant reference to member dst_locator
+                 * @return Constant reference to member dst_locator
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::Locator_s& dst_locator() const;
+
+                /*!
+                 * @brief This function returns a reference to member dst_locator
+                 * @return Reference to member dst_locator
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::Locator_s& dst_locator();
+
+
+                /*!
+                 * @brief This function sets a value in member packet_count
+                 * @param _packet_count New value for member packet_count
+                 */
+                eProsima_user_DllExport void packet_count(
+                        uint64_t _packet_count);
+
+                /*!
+                 * @brief This function returns the value of member packet_count
+                 * @return Value of member packet_count
+                 */
+                eProsima_user_DllExport uint64_t packet_count() const;
+
+                /*!
+                 * @brief This function returns a reference to member packet_count
+                 * @return Reference to member packet_count
+                 */
+                eProsima_user_DllExport uint64_t& packet_count();
+
+
+                /*!
+                 * @brief This function sets a value in member byte_count
+                 * @param _byte_count New value for member byte_count
+                 */
+                eProsima_user_DllExport void byte_count(
+                        uint64_t _byte_count);
+
+                /*!
+                 * @brief This function returns the value of member byte_count
+                 * @return Value of member byte_count
+                 */
+                eProsima_user_DllExport uint64_t byte_count() const;
+
+                /*!
+                 * @brief This function returns a reference to member byte_count
+                 * @return Reference to member byte_count
+                 */
+                eProsima_user_DllExport uint64_t& byte_count();
+
+
+                /*!
+                 * @brief This function sets a value in member byte_magnitude_order
+                 * @param _byte_magnitude_order New value for member byte_magnitude_order
+                 */
+                eProsima_user_DllExport void byte_magnitude_order(
+                        int16_t _byte_magnitude_order);
+
+                /*!
+                 * @brief This function returns the value of member byte_magnitude_order
+                 * @return Value of member byte_magnitude_order
+                 */
+                eProsima_user_DllExport int16_t byte_magnitude_order() const;
+
+                /*!
+                 * @brief This function returns a reference to member byte_magnitude_order
+                 * @return Reference to member byte_magnitude_order
+                 */
+                eProsima_user_DllExport int16_t& byte_magnitude_order();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::Entity2LocatorTraffic& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::GUID_s m_src_guid;
+                eprosima::fastdds::statistics::detail::Locator_s m_dst_locator;
+                uint64_t m_packet_count;
+                uint64_t m_byte_count;
+                int16_t m_byte_magnitude_order;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure WriterReaderData defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class WriterReaderData
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport WriterReaderData();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~WriterReaderData();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
+                 */
+                eProsima_user_DllExport WriterReaderData(
+                        const WriterReaderData& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
+                 */
+                eProsima_user_DllExport WriterReaderData(
+                        WriterReaderData&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
+                 */
+                eProsima_user_DllExport WriterReaderData& operator =(
+                        const WriterReaderData& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::WriterReaderData that will be copied.
+                 */
+                eProsima_user_DllExport WriterReaderData& operator =(
+                        WriterReaderData&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::WriterReaderData object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const WriterReaderData& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::WriterReaderData object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const WriterReaderData& x) const;
+
+                /*!
+                 * @brief This function copies the value in member writer_guid
+                 * @param _writer_guid New value to be copied in member writer_guid
+                 */
+                eProsima_user_DllExport void writer_guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _writer_guid);
+
+                /*!
+                 * @brief This function moves the value in member writer_guid
+                 * @param _writer_guid New value to be moved in member writer_guid
+                 */
+                eProsima_user_DllExport void writer_guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _writer_guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member writer_guid
+                 * @return Constant reference to member writer_guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& writer_guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member writer_guid
+                 * @return Reference to member writer_guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& writer_guid();
+
+
+                /*!
+                 * @brief This function copies the value in member reader_guid
+                 * @param _reader_guid New value to be copied in member reader_guid
+                 */
+                eProsima_user_DllExport void reader_guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _reader_guid);
+
+                /*!
+                 * @brief This function moves the value in member reader_guid
+                 * @param _reader_guid New value to be moved in member reader_guid
+                 */
+                eProsima_user_DllExport void reader_guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _reader_guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member reader_guid
+                 * @return Constant reference to member reader_guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& reader_guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member reader_guid
+                 * @return Reference to member reader_guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& reader_guid();
+
+
+                /*!
+                 * @brief This function sets a value in member data
+                 * @param _data New value for member data
+                 */
+                eProsima_user_DllExport void data(
+                        float _data);
+
+                /*!
+                 * @brief This function returns the value of member data
+                 * @return Value of member data
+                 */
+                eProsima_user_DllExport float data() const;
+
+                /*!
+                 * @brief This function returns a reference to member data
+                 * @return Reference to member data
+                 */
+                eProsima_user_DllExport float& data();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::WriterReaderData& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::GUID_s m_writer_guid;
+                eprosima::fastdds::statistics::detail::GUID_s m_reader_guid;
+                float m_data;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure Locator2LocatorData defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class Locator2LocatorData
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport Locator2LocatorData();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~Locator2LocatorData();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
+                 */
+                eProsima_user_DllExport Locator2LocatorData(
+                        const Locator2LocatorData& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
+                 */
+                eProsima_user_DllExport Locator2LocatorData(
+                        Locator2LocatorData&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
+                 */
+                eProsima_user_DllExport Locator2LocatorData& operator =(
+                        const Locator2LocatorData& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Locator2LocatorData that will be copied.
+                 */
+                eProsima_user_DllExport Locator2LocatorData& operator =(
+                        Locator2LocatorData&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Locator2LocatorData object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const Locator2LocatorData& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Locator2LocatorData object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const Locator2LocatorData& x) const;
+
+                /*!
+                 * @brief This function copies the value in member src_locator
+                 * @param _src_locator New value to be copied in member src_locator
+                 */
+                eProsima_user_DllExport void src_locator(
+                        const eprosima::fastdds::statistics::detail::Locator_s& _src_locator);
+
+                /*!
+                 * @brief This function moves the value in member src_locator
+                 * @param _src_locator New value to be moved in member src_locator
+                 */
+                eProsima_user_DllExport void src_locator(
+                        eprosima::fastdds::statistics::detail::Locator_s&& _src_locator);
+
+                /*!
+                 * @brief This function returns a constant reference to member src_locator
+                 * @return Constant reference to member src_locator
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::Locator_s& src_locator() const;
+
+                /*!
+                 * @brief This function returns a reference to member src_locator
+                 * @return Reference to member src_locator
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::Locator_s& src_locator();
+
+
+                /*!
+                 * @brief This function copies the value in member dst_locator
+                 * @param _dst_locator New value to be copied in member dst_locator
+                 */
+                eProsima_user_DllExport void dst_locator(
+                        const eprosima::fastdds::statistics::detail::Locator_s& _dst_locator);
+
+                /*!
+                 * @brief This function moves the value in member dst_locator
+                 * @param _dst_locator New value to be moved in member dst_locator
+                 */
+                eProsima_user_DllExport void dst_locator(
+                        eprosima::fastdds::statistics::detail::Locator_s&& _dst_locator);
+
+                /*!
+                 * @brief This function returns a constant reference to member dst_locator
+                 * @return Constant reference to member dst_locator
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::Locator_s& dst_locator() const;
+
+                /*!
+                 * @brief This function returns a reference to member dst_locator
+                 * @return Reference to member dst_locator
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::Locator_s& dst_locator();
+
+
+                /*!
+                 * @brief This function sets a value in member data
+                 * @param _data New value for member data
+                 */
+                eProsima_user_DllExport void data(
+                        float _data);
+
+                /*!
+                 * @brief This function returns the value of member data
+                 * @return Value of member data
+                 */
+                eProsima_user_DllExport float data() const;
+
+                /*!
+                 * @brief This function returns a reference to member data
+                 * @return Reference to member data
+                 */
+                eProsima_user_DllExport float& data();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::Locator2LocatorData& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::Locator_s m_src_locator;
+                eprosima::fastdds::statistics::detail::Locator_s m_dst_locator;
+                float m_data;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure EntityData defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class EntityData
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport EntityData();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~EntityData();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
+                 */
+                eProsima_user_DllExport EntityData(
+                        const EntityData& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
+                 */
+                eProsima_user_DllExport EntityData(
+                        EntityData&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
+                 */
+                eProsima_user_DllExport EntityData& operator =(
+                        const EntityData& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::EntityData that will be copied.
+                 */
+                eProsima_user_DllExport EntityData& operator =(
+                        EntityData&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::EntityData object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const EntityData& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::EntityData object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const EntityData& x) const;
+
+                /*!
+                 * @brief This function copies the value in member guid
+                 * @param _guid New value to be copied in member guid
+                 */
+                eProsima_user_DllExport void guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _guid);
+
+                /*!
+                 * @brief This function moves the value in member guid
+                 * @param _guid New value to be moved in member guid
+                 */
+                eProsima_user_DllExport void guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member guid
+                 * @return Constant reference to member guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member guid
+                 * @return Reference to member guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& guid();
+
+
+                /*!
+                 * @brief This function sets a value in member data
+                 * @param _data New value for member data
+                 */
+                eProsima_user_DllExport void data(
+                        float _data);
+
+                /*!
+                 * @brief This function returns the value of member data
+                 * @return Value of member data
+                 */
+                eProsima_user_DllExport float data() const;
+
+                /*!
+                 * @brief This function returns a reference to member data
+                 * @return Reference to member data
+                 */
+                eProsima_user_DllExport float& data();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::EntityData& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::GUID_s m_guid;
+                float m_data;
+
+            };
+
+
+
+            /*!
+             * @brief This class represents the structure PhysicalData defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class PhysicalData
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport PhysicalData();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~PhysicalData();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
+                 */
+                eProsima_user_DllExport PhysicalData(
+                        const PhysicalData& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
+                 */
+                eProsima_user_DllExport PhysicalData(
+                        PhysicalData&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
+                 */
+                eProsima_user_DllExport PhysicalData& operator =(
+                        const PhysicalData& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::PhysicalData that will be copied.
+                 */
+                eProsima_user_DllExport PhysicalData& operator =(
+                        PhysicalData&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::PhysicalData object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const PhysicalData& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::PhysicalData object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const PhysicalData& x) const;
+
+                /*!
+                 * @brief This function copies the value in member participant_guid
+                 * @param _participant_guid New value to be copied in member participant_guid
+                 */
+                eProsima_user_DllExport void participant_guid(
+                        const eprosima::fastdds::statistics::detail::GUID_s& _participant_guid);
+
+                /*!
+                 * @brief This function moves the value in member participant_guid
+                 * @param _participant_guid New value to be moved in member participant_guid
+                 */
+                eProsima_user_DllExport void participant_guid(
+                        eprosima::fastdds::statistics::detail::GUID_s&& _participant_guid);
+
+                /*!
+                 * @brief This function returns a constant reference to member participant_guid
+                 * @return Constant reference to member participant_guid
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::detail::GUID_s& participant_guid() const;
+
+                /*!
+                 * @brief This function returns a reference to member participant_guid
+                 * @return Reference to member participant_guid
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::detail::GUID_s& participant_guid();
+
+
+                /*!
+                 * @brief This function copies the value in member host
+                 * @param _host New value to be copied in member host
+                 */
+                eProsima_user_DllExport void host(
+                        const std::string& _host);
+
+                /*!
+                 * @brief This function moves the value in member host
+                 * @param _host New value to be moved in member host
+                 */
+                eProsima_user_DllExport void host(
+                        std::string&& _host);
+
+                /*!
+                 * @brief This function returns a constant reference to member host
+                 * @return Constant reference to member host
+                 */
+                eProsima_user_DllExport const std::string& host() const;
+
+                /*!
+                 * @brief This function returns a reference to member host
+                 * @return Reference to member host
+                 */
+                eProsima_user_DllExport std::string& host();
+
+
+                /*!
+                 * @brief This function copies the value in member user
+                 * @param _user New value to be copied in member user
+                 */
+                eProsima_user_DllExport void user(
+                        const std::string& _user);
+
+                /*!
+                 * @brief This function moves the value in member user
+                 * @param _user New value to be moved in member user
+                 */
+                eProsima_user_DllExport void user(
+                        std::string&& _user);
+
+                /*!
+                 * @brief This function returns a constant reference to member user
+                 * @return Constant reference to member user
+                 */
+                eProsima_user_DllExport const std::string& user() const;
+
+                /*!
+                 * @brief This function returns a reference to member user
+                 * @return Reference to member user
+                 */
+                eProsima_user_DllExport std::string& user();
+
+
+                /*!
+                 * @brief This function copies the value in member process
+                 * @param _process New value to be copied in member process
+                 */
+                eProsima_user_DllExport void process(
+                        const std::string& _process);
+
+                /*!
+                 * @brief This function moves the value in member process
+                 * @param _process New value to be moved in member process
+                 */
+                eProsima_user_DllExport void process(
+                        std::string&& _process);
+
+                /*!
+                 * @brief This function returns a constant reference to member process
+                 * @return Constant reference to member process
+                 */
+                eProsima_user_DllExport const std::string& process() const;
+
+                /*!
+                 * @brief This function returns a reference to member process
+                 * @return Reference to member process
+                 */
+                eProsima_user_DllExport std::string& process();
+
+
+                /*!
+                * @brief This function returns the maximum serialized size of an object
+                * depending on the buffer alignment.
+                * @param current_alignment Buffer alignment.
+                * @return Maximum serialized size.
+                */
+                eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                        size_t current_alignment = 0);
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::PhysicalData& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+                /*!
+                * @brief This function tells you if the Key has been defined for this type
+                */
+                eProsima_user_DllExport static bool isKeyDefined();
+
+                /*!
+                * @brief This function serializes the key members of an object using CDR serialization.
+                * @param cdr CDR serialization object.
+                */
+                eProsima_user_DllExport void serializeKey(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+
+            private:
+
+                eprosima::fastdds::statistics::detail::GUID_s m_participant_guid;
+                std::string m_host;
+                std::string m_user;
+                std::string m_process;
+
+            };
+
+            /*!
+             * @brief This class represents the bitmask EventKind defined by the user in the IDL file.
+             * @ingroup types
+             */
+            enum EventKindBits : uint32_t
+            {
+                HISTORY2HISTORY_LATENCY = 0x01ull << 0,
+                NETWORK_LATENCY = 0x01ull << 1,
+                PUBLICATION_THROUGHPUT = 0x01ull << 2,
+                SUBSCRIPTION_THROUGHPUT = 0x01ull << 3,
+                RTPS_SENT = 0x01ull << 4,
+                RTPS_LOST = 0x01ull << 5,
+                RESENT_DATAS = 0x01ull << 6,
+                HEARTBEAT_COUNT = 0x01ull << 7,
+                ACKNACK_COUNT = 0x01ull << 8,
+                NACKFRAG_COUNT = 0x01ull << 9,
+                GAP_COUNT = 0x01ull << 10,
+                DATA_COUNT = 0x01ull << 11,
+                PDP_PACKETS = 0x01ull << 12,
+                EDP_PACKETS = 0x01ull << 13,
+                DISCOVERED_ENTITY = 0x01ull << 14,
+                SAMPLE_DATAS = 0x01ull << 15,
+                PHYSICAL_DATA = 0x01ull << 16
+            };
+            typedef uint32_t EventKind;
+
+
+            /*!
+             * @brief This class represents the union Data defined by the user in the IDL file.
+             * @ingroup types
+             */
+            class Data
+            {
+            public:
+
+                /*!
+                 * @brief Default constructor.
+                 */
+                eProsima_user_DllExport Data();
+
+                /*!
+                 * @brief Default destructor.
+                 */
+                eProsima_user_DllExport ~Data();
+
+                /*!
+                 * @brief Copy constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
+                 */
+                eProsima_user_DllExport Data(
+                        const Data& x);
+
+                /*!
+                 * @brief Move constructor.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
+                 */
+                eProsima_user_DllExport Data(
+                        Data&& x) noexcept;
+
+                /*!
+                 * @brief Copy assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
+                 */
+                eProsima_user_DllExport Data& operator =(
+                        const Data& x);
+
+                /*!
+                 * @brief Move assignment.
+                 * @param x Reference to the object eprosima::fastdds::statistics::Data that will be copied.
+                 */
+                eProsima_user_DllExport Data& operator =(
+                        Data&& x) noexcept;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Data object to compare.
+                 */
+                eProsima_user_DllExport bool operator ==(
+                        const Data& x) const;
+
+                /*!
+                 * @brief Comparison operator.
+                 * @param x eprosima::fastdds::statistics::Data object to compare.
+                 */
+                eProsima_user_DllExport bool operator !=(
+                        const Data& x) const;
+
+                /*!
+                 * @brief This function sets the discriminator value.
+                 * @param __d New value for the discriminator.
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the new value doesn't correspond to the selected union member.
+                 */
+                eProsima_user_DllExport void _d(
+                        eprosima::fastdds::statistics::EventKind __d);
+
+                /*!
+                 * @brief This function returns the value of the discriminator.
+                 * @return Value of the discriminator
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::EventKind _d() const;
+
+                /*!
+                 * @brief This function returns a reference to the discriminator.
+                 * @return Reference to the discriminator.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::EventKind& _d();
+
+                /*!
+                 * @brief This function copies the value in member writer_reader_data
+                 * @param _writer_reader_data New value to be copied in member writer_reader_data
+                 */
+                eProsima_user_DllExport void writer_reader_data(
+                        const eprosima::fastdds::statistics::WriterReaderData& _writer_reader_data);
+
+                /*!
+                 * @brief This function moves the value in member writer_reader_data
+                 * @param _writer_reader_data New value to be moved in member writer_reader_data
+                 */
+                eProsima_user_DllExport void writer_reader_data(
+                        eprosima::fastdds::statistics::WriterReaderData&& _writer_reader_data);
+
+                /*!
+                 * @brief This function returns a constant reference to member writer_reader_data
+                 * @return Constant reference to member writer_reader_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::WriterReaderData& writer_reader_data() const;
+
+                /*!
+                 * @brief This function returns a reference to member writer_reader_data
+                 * @return Reference to member writer_reader_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::WriterReaderData& writer_reader_data();
+
+
+                /*!
+                 * @brief This function copies the value in member locator2locator_data
+                 * @param _locator2locator_data New value to be copied in member locator2locator_data
+                 */
+                eProsima_user_DllExport void locator2locator_data(
+                        const eprosima::fastdds::statistics::Locator2LocatorData& _locator2locator_data);
+
+                /*!
+                 * @brief This function moves the value in member locator2locator_data
+                 * @param _locator2locator_data New value to be moved in member locator2locator_data
+                 */
+                eProsima_user_DllExport void locator2locator_data(
+                        eprosima::fastdds::statistics::Locator2LocatorData&& _locator2locator_data);
+
+                /*!
+                 * @brief This function returns a constant reference to member locator2locator_data
+                 * @return Constant reference to member locator2locator_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::Locator2LocatorData& locator2locator_data() const;
+
+                /*!
+                 * @brief This function returns a reference to member locator2locator_data
+                 * @return Reference to member locator2locator_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::Locator2LocatorData& locator2locator_data();
+
+
+                /*!
+                 * @brief This function copies the value in member entity_data
+                 * @param _entity_data New value to be copied in member entity_data
+                 */
+                eProsima_user_DllExport void entity_data(
+                        const eprosima::fastdds::statistics::EntityData& _entity_data);
+
+                /*!
+                 * @brief This function moves the value in member entity_data
+                 * @param _entity_data New value to be moved in member entity_data
+                 */
+                eProsima_user_DllExport void entity_data(
+                        eprosima::fastdds::statistics::EntityData&& _entity_data);
+
+                /*!
+                 * @brief This function returns a constant reference to member entity_data
+                 * @return Constant reference to member entity_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::EntityData& entity_data() const;
+
+                /*!
+                 * @brief This function returns a reference to member entity_data
+                 * @return Reference to member entity_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::EntityData& entity_data();
+
+
+                /*!
+                 * @brief This function copies the value in member entity2locator_traffic
+                 * @param _entity2locator_traffic New value to be copied in member entity2locator_traffic
+                 */
+                eProsima_user_DllExport void entity2locator_traffic(
+                        const eprosima::fastdds::statistics::Entity2LocatorTraffic& _entity2locator_traffic);
+
+                /*!
+                 * @brief This function moves the value in member entity2locator_traffic
+                 * @param _entity2locator_traffic New value to be moved in member entity2locator_traffic
+                 */
+                eProsima_user_DllExport void entity2locator_traffic(
+                        eprosima::fastdds::statistics::Entity2LocatorTraffic&& _entity2locator_traffic);
+
+                /*!
+                 * @brief This function returns a constant reference to member entity2locator_traffic
+                 * @return Constant reference to member entity2locator_traffic
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::Entity2LocatorTraffic& entity2locator_traffic() const;
+
+                /*!
+                 * @brief This function returns a reference to member entity2locator_traffic
+                 * @return Reference to member entity2locator_traffic
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::Entity2LocatorTraffic& entity2locator_traffic();
+
+
+                /*!
+                 * @brief This function copies the value in member entity_count
+                 * @param _entity_count New value to be copied in member entity_count
+                 */
+                eProsima_user_DllExport void entity_count(
+                        const eprosima::fastdds::statistics::EntityCount& _entity_count);
+
+                /*!
+                 * @brief This function moves the value in member entity_count
+                 * @param _entity_count New value to be moved in member entity_count
+                 */
+                eProsima_user_DllExport void entity_count(
+                        eprosima::fastdds::statistics::EntityCount&& _entity_count);
+
+                /*!
+                 * @brief This function returns a constant reference to member entity_count
+                 * @return Constant reference to member entity_count
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::EntityCount& entity_count() const;
+
+                /*!
+                 * @brief This function returns a reference to member entity_count
+                 * @return Reference to member entity_count
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::EntityCount& entity_count();
+
+
+                /*!
+                 * @brief This function copies the value in member discovery_time
+                 * @param _discovery_time New value to be copied in member discovery_time
+                 */
+                eProsima_user_DllExport void discovery_time(
+                        const eprosima::fastdds::statistics::DiscoveryTime& _discovery_time);
+
+                /*!
+                 * @brief This function moves the value in member discovery_time
+                 * @param _discovery_time New value to be moved in member discovery_time
+                 */
+                eProsima_user_DllExport void discovery_time(
+                        eprosima::fastdds::statistics::DiscoveryTime&& _discovery_time);
+
+                /*!
+                 * @brief This function returns a constant reference to member discovery_time
+                 * @return Constant reference to member discovery_time
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::DiscoveryTime& discovery_time() const;
+
+                /*!
+                 * @brief This function returns a reference to member discovery_time
+                 * @return Reference to member discovery_time
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::DiscoveryTime& discovery_time();
+
+
+                /*!
+                 * @brief This function copies the value in member sample_identity_count
+                 * @param _sample_identity_count New value to be copied in member sample_identity_count
+                 */
+                eProsima_user_DllExport void sample_identity_count(
+                        const eprosima::fastdds::statistics::SampleIdentityCount& _sample_identity_count);
+
+                /*!
+                 * @brief This function moves the value in member sample_identity_count
+                 * @param _sample_identity_count New value to be moved in member sample_identity_count
+                 */
+                eProsima_user_DllExport void sample_identity_count(
+                        eprosima::fastdds::statistics::SampleIdentityCount&& _sample_identity_count);
+
+                /*!
+                 * @brief This function returns a constant reference to member sample_identity_count
+                 * @return Constant reference to member sample_identity_count
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::SampleIdentityCount& sample_identity_count() const;
+
+                /*!
+                 * @brief This function returns a reference to member sample_identity_count
+                 * @return Reference to member sample_identity_count
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::SampleIdentityCount& sample_identity_count();
+
+
+                /*!
+                 * @brief This function copies the value in member physical_data
+                 * @param _physical_data New value to be copied in member physical_data
+                 */
+                eProsima_user_DllExport void physical_data(
+                        const eprosima::fastdds::statistics::PhysicalData& _physical_data);
+
+                /*!
+                 * @brief This function moves the value in member physical_data
+                 * @param _physical_data New value to be moved in member physical_data
+                 */
+                eProsima_user_DllExport void physical_data(
+                        eprosima::fastdds::statistics::PhysicalData&& _physical_data);
+
+                /*!
+                 * @brief This function returns a constant reference to member physical_data
+                 * @return Constant reference to member physical_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport const eprosima::fastdds::statistics::PhysicalData& physical_data() const;
+
+                /*!
+                 * @brief This function returns a reference to member physical_data
+                 * @return Reference to member physical_data
+                 * @exception eprosima::fastcdr::BadParamException This exception is thrown if the requested union member is not the current selection.
+                 */
+                eProsima_user_DllExport eprosima::fastdds::statistics::PhysicalData& physical_data();
+
+
+                /*!
+                 * @brief This function returns the serialized size of a data depending on the buffer alignment.
+                 * @param data Data which is calculated its serialized size.
+                 * @param current_alignment Buffer alignment.
+                 * @return Serialized size.
+                 */
+                eProsima_user_DllExport static size_t getCdrSerializedSize(
+                        const eprosima::fastdds::statistics::Data& data,
+                        size_t current_alignment = 0);
+
+
+
+                /*!
+                 * @brief This function serializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void serialize(
+                        eprosima::fastcdr::Cdr& cdr) const;
+
+                /*!
+                 * @brief This function deserializes an object using CDR serialization.
+                 * @param cdr CDR serialization object.
+                 */
+                eProsima_user_DllExport void deserialize(
+                        eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+
+            private:
+
+                eprosima::fastdds::statistics::EventKind m__d;
+
+                eprosima::fastdds::statistics::WriterReaderData m_writer_reader_data;
+                eprosima::fastdds::statistics::Locator2LocatorData m_locator2locator_data;
+                eprosima::fastdds::statistics::EntityData m_entity_data;
+                eprosima::fastdds::statistics::Entity2LocatorTraffic m_entity2locator_traffic;
+                eprosima::fastdds::statistics::EntityCount m_entity_count;
+                eprosima::fastdds::statistics::DiscoveryTime m_discovery_time;
+                eprosima::fastdds::statistics::SampleIdentityCount m_sample_identity_count;
+                eprosima::fastdds::statistics::PhysicalData m_physical_data;
+            };
+
+        } // namespace statistics
+    } // namespace fastdds
 } // namespace eprosima
 
 #endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_H_
diff --git a/test/dds/discovery/ParticipantModule.cpp b/test/dds/discovery/ParticipantModule.cpp
index 17f38dfdf19..f6224a85af3 100644
--- a/test/dds/discovery/ParticipantModule.cpp
+++ b/test/dds/discovery/ParticipantModule.cpp
@@ -28,7 +28,7 @@
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
 #include <fastdds/rtps/common/Locator.h>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp b/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp
index bea0040319b..1945b3b9310 100644
--- a/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp
+++ b/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp
@@ -31,6 +31,7 @@
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/Types.h>
@@ -38,7 +39,6 @@
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
 #include <fastdds/rtps/RTPSDomain.h>
-#include <fastrtps/attributes/TopicAttributes.h>
 #include <fastrtps/types/TypesBase.h>
 #include <gmock/gmock.h>
 
diff --git a/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp b/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp
index 2dcaf1d265a..77520c9290e 100644
--- a/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp
+++ b/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp
@@ -26,7 +26,7 @@
 #include <fastdds/dds/core/policy/ParameterTypes.hpp>
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/common/Types.h>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 namespace eprosima {
 
diff --git a/test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.h b/test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.h
index d18ad45e52f..457a0692d71 100644
--- a/test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.h
+++ b/test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.h
@@ -19,7 +19,7 @@
 #ifndef _FASTDDS_RTPS_ENDPOINT_H_
 #define _FASTDDS_RTPS_ENDPOINT_H_
 
-#include <fastrtps/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
 #include <fastdds/rtps/attributes/EndpointAttributes.h>
 
 namespace eprosima {
diff --git a/test/mock/rtps/PublisherHistory/fastdds/publisher/DataWriterHistory.hpp b/test/mock/rtps/PublisherHistory/fastdds/publisher/DataWriterHistory.hpp
index 1a0613dbfb3..89f6bd01f8d 100644
--- a/test/mock/rtps/PublisherHistory/fastdds/publisher/DataWriterHistory.hpp
+++ b/test/mock/rtps/PublisherHistory/fastdds/publisher/DataWriterHistory.hpp
@@ -21,6 +21,7 @@
 #include <gmock/gmock.h>
 
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/common/ChangeKind_t.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
@@ -29,8 +30,7 @@
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/resources/ResourceManagement.h>
-#include <fastrtps/attributes/TopicAttributes.h>
-#include <fastrtps/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
 
 #include <fastdds/publisher/history/DataWriterInstance.hpp>
 
diff --git a/test/mock/rtps/PublisherHistory/fastrtps/publisher/PublisherHistory.h b/test/mock/rtps/PublisherHistory/fastrtps/publisher/PublisherHistory.h
index dec5df5ed8d..be24a3f123c 100644
--- a/test/mock/rtps/PublisherHistory/fastrtps/publisher/PublisherHistory.h
+++ b/test/mock/rtps/PublisherHistory/fastrtps/publisher/PublisherHistory.h
@@ -21,6 +21,7 @@
 #include <gmock/gmock.h>
 
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/common/ChangeKind_t.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
@@ -29,9 +30,8 @@
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/resources/ResourceManagement.h>
-#include <fastrtps/attributes/TopicAttributes.h>
+#include <fastdds/utils/TimedMutex.hpp>
 #include <fastrtps/common/KeyedChanges.h>
-#include <fastrtps/utils/TimedMutex.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h b/test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h
index ff0d864c195..005c7447f61 100644
--- a/test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h
+++ b/test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h
@@ -26,7 +26,7 @@
 #include <fastdds/dds/core/status/SampleRejectedStatus.hpp>
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
 #include <fastdds/rtps/common/CacheChange.h>
-#include <fastrtps/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.h b/test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.h
index 4bd113b7f90..a592db24949 100644
--- a/test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.h
+++ b/test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.h
@@ -26,7 +26,7 @@
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.h>
 #include <fastdds/rtps/common/CacheChange.h>
-#include <fastrtps/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/test/performance/video/VideoTestTypes.hpp b/test/performance/video/VideoTestTypes.hpp
index 77e6f4f0fbe..3ff566578f0 100644
--- a/test/performance/video/VideoTestTypes.hpp
+++ b/test/performance/video/VideoTestTypes.hpp
@@ -41,7 +41,7 @@
 #include <fastdds/rtps/attributes/PropertyPolicy.h>
 #include <fastdds/rtps/common/all_common.h>
 
-#include <fastrtps/utils/IPFinder.h>
+#include <fastdds/utils/IPFinder.h>
 #include <fastrtps/utils/TimeConversion.h>
 
 
diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.h b/test/profiling/allocations/AllocTestTypePubSubTypes.h
index 80298136ea2..57fb84c3f72 100644
--- a/test/profiling/allocations/AllocTestTypePubSubTypes.h
+++ b/test/profiling/allocations/AllocTestTypePubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "AllocTestType.h"
 
diff --git a/test/profiling/allocations/AllocTestTypev1.h b/test/profiling/allocations/AllocTestTypev1.h
index d517429948e..4872df98e5d 100644
--- a/test/profiling/allocations/AllocTestTypev1.h
+++ b/test/profiling/allocations/AllocTestTypev1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_ALLOCTESTTYPE_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -152,11 +152,11 @@ class AllocTestType
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -190,17 +190,18 @@ class AllocTestType
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_index;
diff --git a/test/realtime/TimedConditionVariableUnitTest.cpp b/test/realtime/TimedConditionVariableUnitTest.cpp
index 1ac044b262f..01807363387 100644
--- a/test/realtime/TimedConditionVariableUnitTest.cpp
+++ b/test/realtime/TimedConditionVariableUnitTest.cpp
@@ -1,4 +1,4 @@
-#include <fastrtps/utils/TimedConditionVariable.hpp>
+#include <fastdds/utils/TimedConditionVariable.hpp>
 
 #include <chrono>
 
diff --git a/test/unittest/dds/participant/ParticipantTests.cpp b/test/unittest/dds/participant/ParticipantTests.cpp
index b143d5b8ad1..2912c82aaa4 100644
--- a/test/unittest/dds/participant/ParticipantTests.cpp
+++ b/test/unittest/dds/participant/ParticipantTests.cpp
@@ -48,6 +48,7 @@
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/attributes/PublisherAttributes.h>
 #include <fastrtps/attributes/SubscriberAttributes.h>
 #include <fastrtps/types/DynamicDataFactory.h>
@@ -57,7 +58,6 @@
 #include <fastrtps/types/DynamicTypePtr.h>
 #include <fastrtps/types/TypeDescriptor.h>
 #include <fastrtps/types/TypeObjectFactory.h>
-#include <fastrtps/utils/IPLocator.h>
 
 #include <fastdds/domain/DomainParticipantImpl.hpp>
 #include <utils/SystemInfo.hpp>
diff --git a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
index 5efd99bf2b6..3fd9fc0c827 100644
--- a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
+++ b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
@@ -2,7 +2,7 @@
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
-#include <fastrtps/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
 #include <fastdds/rtps/reader/StatelessReader.h>
 
 
diff --git a/test/unittest/dds/subscriber/DataReaderTests.cpp b/test/unittest/dds/subscriber/DataReaderTests.cpp
index 1b9e7a02b5b..8b73ec43b0c 100644
--- a/test/unittest/dds/subscriber/DataReaderTests.cpp
+++ b/test/unittest/dds/subscriber/DataReaderTests.cpp
@@ -56,7 +56,7 @@
 #include <fastdds/LibrarySettings.hpp>
 #include <fastdds/rtps/common/Locator.h>
 #include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include "../../common/CustomPayloadPool.hpp"
 #include "../../logging/mock/MockConsumer.h"
diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.h b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.h
index 776f184b73e..eac07d7efbf 100644
--- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.h
+++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "ContentFilterTestType.h"
 
diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeTypeObject.cxx b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeTypeObject.cxx
index c9ec87ccb80..3017213a7b3 100644
--- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeTypeObject.cxx
+++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeTypeObject.cxx
@@ -26,12 +26,14 @@ namespace { char dummy; }
 
 #include "ContentFilterTestType.h"
 #include "ContentFilterTestTypeTypeObject.h"
+
 #include <mutex>
 #include <utility>
 #include <sstream>
+
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastrtps/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypeObjectFactory.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/AnnotationParameterValue.h>
diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypev1.h b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypev1.h
index 70a4fab9c71..d8dc91a5d34 100644
--- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypev1.h
+++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypev1.h
@@ -26,6 +26,7 @@
 #ifndef _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPE_H_
 #define _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPE_H_
 
+
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -462,11 +463,11 @@ class StructType
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -500,17 +501,18 @@ class StructType
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     char m_char_field;
@@ -2230,11 +2232,11 @@ class ContentFilterTestType
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2268,17 +2270,18 @@ class ContentFilterTestType
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     char m_char_field;
diff --git a/test/unittest/dds/topic/TopicTests.cpp b/test/unittest/dds/topic/TopicTests.cpp
index 015d132389a..29924bcf4a5 100644
--- a/test/unittest/dds/topic/TopicTests.cpp
+++ b/test/unittest/dds/topic/TopicTests.cpp
@@ -22,6 +22,7 @@
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TopicListener.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/unittest/dynamic_types/idl/BasicPubSubTypes.h b/test/unittest/dynamic_types/idl/BasicPubSubTypes.h
index 467e624b19b..0909c8b1dc5 100644
--- a/test/unittest/dynamic_types/idl/BasicPubSubTypes.h
+++ b/test/unittest/dynamic_types/idl/BasicPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "Basic.h"
 
diff --git a/test/unittest/dynamic_types/idl/BasicTypeObject.cxx b/test/unittest/dynamic_types/idl/BasicTypeObject.cxx
index 282c8898fe4..057847d6286 100644
--- a/test/unittest/dynamic_types/idl/BasicTypeObject.cxx
+++ b/test/unittest/dynamic_types/idl/BasicTypeObject.cxx
@@ -26,12 +26,14 @@ namespace { char dummy; }
 
 #include "Basic.h"
 #include "BasicTypeObject.h"
+
 #include <mutex>
 #include <utility>
 #include <sstream>
+
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastrtps/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypeObjectFactory.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/AnnotationParameterValue.h>
diff --git a/test/unittest/dynamic_types/idl/Basicv1.h b/test/unittest/dynamic_types/idl/Basicv1.h
index d2424253d89..b5788b726ab 100644
--- a/test/unittest/dynamic_types/idl/Basicv1.h
+++ b/test/unittest/dynamic_types/idl/Basicv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_BASIC_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -166,11 +166,11 @@ class EnumStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -204,17 +204,18 @@ class EnumStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     MyEnum m_my_enum;
@@ -304,11 +305,11 @@ class AliasStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -342,17 +343,18 @@ class AliasStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     MyAliasEnum m_my_alias;
@@ -442,11 +444,11 @@ class AliasAliasStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -480,17 +482,18 @@ class AliasAliasStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     MyAliasAliasEnum m_my_alias_alias;
@@ -580,11 +583,11 @@ class BoolStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -618,17 +621,18 @@ class BoolStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     bool m_my_bool;
@@ -718,11 +722,11 @@ class OctetStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -756,17 +760,18 @@ class OctetStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint8_t m_my_octet;
@@ -856,11 +861,11 @@ class ShortStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -894,17 +899,18 @@ class ShortStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     int16_t m_my_int16;
@@ -994,11 +1000,11 @@ class LongStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1032,17 +1038,18 @@ class LongStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     int32_t m_my_int32;
@@ -1132,11 +1139,11 @@ class LongLongStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1170,17 +1177,18 @@ class LongLongStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     int64_t m_my_int64;
@@ -1270,11 +1278,11 @@ class UShortStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1308,17 +1316,18 @@ class UShortStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint16_t m_my_uint16;
@@ -1408,11 +1417,11 @@ class ULongStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1446,17 +1455,18 @@ class ULongStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint32_t m_my_uint32;
@@ -1546,11 +1556,11 @@ class ULongLongStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1584,17 +1594,18 @@ class ULongLongStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint64_t m_my_uint64;
@@ -1684,11 +1695,11 @@ class FloatStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1722,17 +1733,18 @@ class FloatStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     float m_my_float32;
@@ -1822,11 +1834,11 @@ class DoubleStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1860,17 +1872,18 @@ class DoubleStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     double m_my_float64;
@@ -1960,11 +1973,11 @@ class LongDoubleStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1998,17 +2011,18 @@ class LongDoubleStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     long double m_my_float128;
@@ -2098,11 +2112,11 @@ class CharStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2136,17 +2150,18 @@ class CharStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     char m_my_char;
@@ -2236,11 +2251,11 @@ class WCharStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2274,17 +2289,18 @@ class WCharStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     wchar_t m_my_wchar;
@@ -2381,11 +2397,11 @@ class StringStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2419,17 +2435,18 @@ class StringStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::string m_my_string;
@@ -2526,11 +2543,11 @@ class WStringStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2564,17 +2581,18 @@ class WStringStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::wstring m_my_wstring;
@@ -2671,11 +2689,11 @@ class LargeStringStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2709,17 +2727,18 @@ class LargeStringStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     eprosima::fastcdr::fixed_string<41925> m_my_large_string;
@@ -2816,11 +2835,11 @@ class LargeWStringStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2854,17 +2873,18 @@ class LargeWStringStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::wstring m_my_large_wstring;
@@ -2961,11 +2981,11 @@ class ArraytStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2999,17 +3019,18 @@ class ArraytStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::array<std::array<std::array<int32_t, 2>, 2>, 2> m_my_array;
@@ -3108,11 +3129,11 @@ class ArrayArrayStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3146,17 +3167,18 @@ class ArrayArrayStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::array<std::array<MyArray, 2>, 2> m_my_array_array;
@@ -3255,11 +3277,11 @@ class SequenceStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3293,17 +3315,18 @@ class SequenceStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<int32_t> m_my_sequence;
@@ -3404,11 +3427,11 @@ class SequenceSequenceStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3442,17 +3465,18 @@ class SequenceSequenceStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<std::vector<int32_t>> m_my_sequence_sequence;
@@ -3551,11 +3575,11 @@ class MapStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3589,17 +3613,18 @@ class MapStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, int32_t> m_my_map;
@@ -3700,11 +3725,11 @@ class MapMapStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3738,17 +3763,18 @@ class MapMapStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, std::map<int32_t, int32_t>> m_my_map_map;
@@ -3875,6 +3901,10 @@ class MyBitset
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     std::bitset<30> m_bitset;
@@ -3969,11 +3999,11 @@ class BitsetStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4007,17 +4037,18 @@ class BitsetStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     MyBitset m_a;
@@ -4127,11 +4158,11 @@ class StructStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4165,17 +4196,18 @@ class StructStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     int32_t m_a;
@@ -4293,11 +4325,11 @@ class StructStructStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4331,17 +4363,18 @@ class StructStructStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     StructStruct m_child_struct;
@@ -4501,6 +4534,10 @@ class SimpleUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     int32_t m__d;
@@ -4668,6 +4705,10 @@ class UnionUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     int32_t m__d;
@@ -4828,6 +4869,10 @@ class WCharUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     wchar_t m__d;
@@ -4926,11 +4971,11 @@ class SimpleUnionStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4964,17 +5009,18 @@ class SimpleUnionStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleUnion m_my_union;
@@ -5071,11 +5117,11 @@ class UnionUnionUnionStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -5109,17 +5155,18 @@ class UnionUnionUnionStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     UnionUnion m_my_union;
@@ -5216,11 +5263,11 @@ class WCharUnionStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -5254,17 +5301,18 @@ class WCharUnionStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     WCharUnion m_my_union;
diff --git a/test/unittest/dynamic_types/idl/TestPubSubTypes.h b/test/unittest/dynamic_types/idl/TestPubSubTypes.h
index d74f7ae2664..76cb98f8657 100644
--- a/test/unittest/dynamic_types/idl/TestPubSubTypes.h
+++ b/test/unittest/dynamic_types/idl/TestPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "Test.h"
 
diff --git a/test/unittest/dynamic_types/idl/TestTypeObject.cxx b/test/unittest/dynamic_types/idl/TestTypeObject.cxx
index 60d8dba0b18..0a501f79814 100644
--- a/test/unittest/dynamic_types/idl/TestTypeObject.cxx
+++ b/test/unittest/dynamic_types/idl/TestTypeObject.cxx
@@ -26,12 +26,14 @@ namespace { char dummy; }
 
 #include "Test.h"
 #include "TestTypeObject.h"
+
 #include <mutex>
 #include <utility>
 #include <sstream>
+
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastrtps/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypeObjectFactory.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/AnnotationParameterValue.h>
diff --git a/test/unittest/dynamic_types/idl/Testv1.h b/test/unittest/dynamic_types/idl/Testv1.h
index e24d16dd53d..e004ae3ec55 100644
--- a/test/unittest/dynamic_types/idl/Testv1.h
+++ b/test/unittest/dynamic_types/idl/Testv1.h
@@ -26,6 +26,7 @@
 #ifndef _FAST_DDS_GENERATED_TEST_H_
 #define _FAST_DDS_GENERATED_TEST_H_
 
+
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -414,11 +415,11 @@ class BasicStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -452,17 +453,18 @@ class BasicStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     bool m_my_bool;
@@ -984,8 +986,7 @@ class ComplexStruct
      * @brief This function returns a constant reference to member my_array_string
      * @return Constant reference to member my_array_string
      */
-    eProsima_user_DllExport const std::array<std::array<eprosima::fastcdr::fixed_string<75>, 5>,
-            5>& my_array_string() const;
+    eProsima_user_DllExport const std::array<std::array<eprosima::fastcdr::fixed_string<75>, 5>, 5>& my_array_string() const;
 
     /*!
      * @brief This function returns a reference to member my_array_string
@@ -1076,11 +1077,11 @@ class ComplexStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1114,17 +1115,18 @@ class ComplexStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint8_t m_my_octet;
@@ -1316,6 +1318,10 @@ class MyUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     MyEnum m__d;
@@ -1505,6 +1511,10 @@ class MyUnion2
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     uint8_t m__d;
@@ -1631,11 +1641,11 @@ class CompleteStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1669,17 +1679,18 @@ class CompleteStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     MyUnion m_my_union;
@@ -1797,11 +1808,11 @@ class KeyedStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1835,17 +1846,18 @@ class KeyedStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint8_t m_key;
diff --git a/test/unittest/dynamic_types/idl/new_features_4_2.h b/test/unittest/dynamic_types/idl/new_features_4_2.h
index f5af91be20d..46b31433105 100644
--- a/test/unittest/dynamic_types/idl/new_features_4_2.h
+++ b/test/unittest/dynamic_types/idl/new_features_4_2.h
@@ -810,6 +810,8 @@ class ParentBitset
     eProsima_user_DllExport void bitset(
             const std::bitset<17>&);
 
+
+
 private:
 
     std::bitset<17> m_bitset;
@@ -964,6 +966,8 @@ class MyBitset : public bitmodule::ParentBitset
     eProsima_user_DllExport void bitset(
             const std::bitset<50>&);
 
+
+
 private:
 
     std::bitset<33> m_bitset;
diff --git a/test/unittest/dynamic_types/idl/new_features_4_2PubSubTypes.h b/test/unittest/dynamic_types/idl/new_features_4_2PubSubTypes.h
index 03f413ae74f..34885efb64b 100644
--- a/test/unittest/dynamic_types/idl/new_features_4_2PubSubTypes.h
+++ b/test/unittest/dynamic_types/idl/new_features_4_2PubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "new_features_4_2.h"
 
diff --git a/test/unittest/dynamic_types/idl/new_features_4_2TypeObject.cxx b/test/unittest/dynamic_types/idl/new_features_4_2TypeObject.cxx
index 32f204ac131..cbd1a28099a 100644
--- a/test/unittest/dynamic_types/idl/new_features_4_2TypeObject.cxx
+++ b/test/unittest/dynamic_types/idl/new_features_4_2TypeObject.cxx
@@ -26,12 +26,14 @@ namespace { char dummy; }
 
 #include "new_features_4_2.h"
 #include "new_features_4_2TypeObject.h"
+
 #include <mutex>
 #include <utility>
 #include <sstream>
+
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastrtps/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypeObjectFactory.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/AnnotationParameterValue.h>
diff --git a/test/unittest/dynamic_types/idl/new_features_4_2v1.h b/test/unittest/dynamic_types/idl/new_features_4_2v1.h
index 3acfbb6fbbc..2a746213598 100644
--- a/test/unittest/dynamic_types/idl/new_features_4_2v1.h
+++ b/test/unittest/dynamic_types/idl/new_features_4_2v1.h
@@ -26,6 +26,7 @@
 #ifndef _FAST_DDS_GENERATED_NEW_FEATURES_4_2_H_
 #define _FAST_DDS_GENERATED_NEW_FEATURES_4_2_H_
 
+
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -34,6 +35,7 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
 
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
@@ -317,11 +319,11 @@ class NewAliases
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -355,17 +357,18 @@ class NewAliases
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     int8_t m_int8_;
@@ -532,6 +535,10 @@ class WCharUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     wchar_t m__d;
@@ -692,6 +699,10 @@ class OctetUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     uint8_t m__d;
@@ -852,655 +863,669 @@ class Int8Union
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
-private:
-
-    int8_t m__d;
-
-    int32_t m_case_three;
-    int32_t m_case_six;
-};
-
-namespace bitmodule {
-/*!
- * @brief This class represents the structure ParentBitset defined by the user in the IDL file.
- * @ingroup new_features_4_2
- */
-class ParentBitset
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport ParentBitset();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~ParentBitset();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object bitmodule::ParentBitset that will be copied.
-     */
-    eProsima_user_DllExport ParentBitset(
-            const ParentBitset& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object bitmodule::ParentBitset that will be copied.
-     */
-    eProsima_user_DllExport ParentBitset(
-            ParentBitset&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object bitmodule::ParentBitset that will be copied.
-     */
-    eProsima_user_DllExport ParentBitset& operator =(
-            const ParentBitset& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object bitmodule::ParentBitset that will be copied.
-     */
-    eProsima_user_DllExport ParentBitset& operator =(
-            ParentBitset&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x bitmodule::ParentBitset object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const ParentBitset& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x bitmodule::ParentBitset object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const ParentBitset& x) const;
-
-    /*!
-     * @brief This function sets a value in member parent_bitfield
-     * @param _parent_bitfield New value for member parent_bitfield
-     */
-    eProsima_user_DllExport void parent_bitfield(
-            uint32_t _parent_bitfield);
-
-    /*!
-     * @brief This function returns the value of member parent_bitfield
-     * @return Value of member parent_bitfield
-     */
-    eProsima_user_DllExport uint32_t parent_bitfield() const;
-
-
-    eProsima_user_DllExport std::bitset<17> bitset() const;
-
-    eProsima_user_DllExport void bitset(
-            const std::bitset<17>&);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const bitmodule::ParentBitset& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-private:
-
-    std::bitset<17> m_bitset;
-};
-/*!
- * @brief This class represents the structure MyBitset defined by the user in the IDL file.
- * @ingroup new_features_4_2
- */
-class MyBitset : public bitmodule::ParentBitset
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport MyBitset();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~MyBitset();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object bitmodule::MyBitset that will be copied.
-     */
-    eProsima_user_DllExport MyBitset(
-            const MyBitset& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object bitmodule::MyBitset that will be copied.
-     */
-    eProsima_user_DllExport MyBitset(
-            MyBitset&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object bitmodule::MyBitset that will be copied.
-     */
-    eProsima_user_DllExport MyBitset& operator =(
-            const MyBitset& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object bitmodule::MyBitset that will be copied.
-     */
-    eProsima_user_DllExport MyBitset& operator =(
-            MyBitset&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x bitmodule::MyBitset object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const MyBitset& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x bitmodule::MyBitset object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const MyBitset& x) const;
-
-    /*!
-     * @brief This function sets a value in member a
-     * @param _a New value for member a
-     */
-    eProsima_user_DllExport void a(
-            char _a);
-
-    /*!
-     * @brief This function returns the value of member a
-     * @return Value of member a
-     */
-    eProsima_user_DllExport char a() const;
-
-
-    /*!
-     * @brief This function sets a value in member b
-     * @param _b New value for member b
-     */
-    eProsima_user_DllExport void b(
-            bool _b);
-
-    /*!
-     * @brief This function returns the value of member b
-     * @return Value of member b
-     */
-    eProsima_user_DllExport bool b() const;
-
-
-
-    /*!
-     * @brief This function sets a value in member c
-     * @param _c New value for member c
-     */
-    eProsima_user_DllExport void c(
-            uint16_t _c);
-
-    /*!
-     * @brief This function returns the value of member c
-     * @return Value of member c
-     */
-    eProsima_user_DllExport uint16_t c() const;
-
-
-    /*!
-     * @brief This function sets a value in member d
-     * @param _d New value for member d
-     */
-    eProsima_user_DllExport void d(
-            int16_t _d);
-
-    /*!
-     * @brief This function returns the value of member d
-     * @return Value of member d
-     */
-    eProsima_user_DllExport int16_t d() const;
-
-
-    /*!
-     * @brief This function sets a value in member e
-     * @param _e New value for member e
-     */
-    eProsima_user_DllExport void e(
-            int16_t _e);
-
-    /*!
-     * @brief This function returns the value of member e
-     * @return Value of member e
-     */
-    eProsima_user_DllExport int16_t e() const;
-
-
-    /*!
-     * @brief This function sets a value in member f
-     * @param _f New value for member f
-     */
-    eProsima_user_DllExport void f(
-            int16_t _f);
-
-    /*!
-     * @brief This function returns the value of member f
-     * @return Value of member f
-     */
-    eProsima_user_DllExport int16_t f() const;
-
-
-    eProsima_user_DllExport std::bitset<50> bitset() const;
-
-    eProsima_user_DllExport void bitset(
-            const std::bitset<50>&);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const bitmodule::MyBitset& data,
-            size_t current_alignment = 0);
-
 
 
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
 
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
 
 private:
 
-    std::bitset<33> m_bitset;
-};
-/*!
- * @brief This class represents the bitmask MyBitMask defined by the user in the IDL file.
- * @ingroup new_features_4_2
- */
-enum MyBitMaskBits : uint8_t
-{
-    flag0 = 0x01ull << 0,
-    flag1 = 0x01ull << 1,
-    flag4 = 0x01ull << 4,
-    flag6 = 0x01ull << 6,
-    flag7 = 0x01ull << 7
-};
-typedef uint8_t MyBitMask;
-
-
-/*!
- * @brief This class represents the structure BitsetBitmask defined by the user in the IDL file.
- * @ingroup new_features_4_2
- */
-class BitsetBitmask
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport BitsetBitmask();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~BitsetBitmask();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object bitmodule::BitsetBitmask that will be copied.
-     */
-    eProsima_user_DllExport BitsetBitmask(
-            const BitsetBitmask& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object bitmodule::BitsetBitmask that will be copied.
-     */
-    eProsima_user_DllExport BitsetBitmask(
-            BitsetBitmask&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object bitmodule::BitsetBitmask that will be copied.
-     */
-    eProsima_user_DllExport BitsetBitmask& operator =(
-            const BitsetBitmask& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object bitmodule::BitsetBitmask that will be copied.
-     */
-    eProsima_user_DllExport BitsetBitmask& operator =(
-            BitsetBitmask&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x bitmodule::BitsetBitmask object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const BitsetBitmask& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x bitmodule::BitsetBitmask object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const BitsetBitmask& x) const;
-
-    /*!
-     * @brief This function copies the value in member mybitset
-     * @param _mybitset New value to be copied in member mybitset
-     */
-    eProsima_user_DllExport void mybitset(
-            const bitmodule::MyBitset& _mybitset);
-
-    /*!
-     * @brief This function moves the value in member mybitset
-     * @param _mybitset New value to be moved in member mybitset
-     */
-    eProsima_user_DllExport void mybitset(
-            bitmodule::MyBitset&& _mybitset);
-
-    /*!
-     * @brief This function returns a constant reference to member mybitset
-     * @return Constant reference to member mybitset
-     */
-    eProsima_user_DllExport const bitmodule::MyBitset& mybitset() const;
-
-    /*!
-     * @brief This function returns a reference to member mybitset
-     * @return Reference to member mybitset
-     */
-    eProsima_user_DllExport bitmodule::MyBitset& mybitset();
-
-
-    /*!
-     * @brief This function copies the value in member mybitmask
-     * @param _mybitmask New value to be copied in member mybitmask
-     */
-    eProsima_user_DllExport void mybitmask(
-            const bitmodule::MyBitMask& _mybitmask);
-
-    /*!
-     * @brief This function moves the value in member mybitmask
-     * @param _mybitmask New value to be moved in member mybitmask
-     */
-    eProsima_user_DllExport void mybitmask(
-            bitmodule::MyBitMask&& _mybitmask);
-
-    /*!
-     * @brief This function returns a constant reference to member mybitmask
-     * @return Constant reference to member mybitmask
-     */
-    eProsima_user_DllExport const bitmodule::MyBitMask& mybitmask() const;
-
-    /*!
-     * @brief This function returns a reference to member mybitmask
-     * @return Reference to member mybitmask
-     */
-    eProsima_user_DllExport bitmodule::MyBitMask& mybitmask();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const bitmodule::BitsetBitmask& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
-    /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
-
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-private:
-
-    bitmodule::MyBitset m_mybitset;
-    bitmodule::MyBitMask m_mybitmask;
+    int8_t m__d;
 
+    int32_t m_case_three;
+    int32_t m_case_six;
 };
 
-
-
-/*!
- * @brief This class represents the structure BM2 defined by the user in the IDL file.
- * @ingroup new_features_4_2
- */
-class BM2 : public bitmodule::BitsetBitmask
-{
-public:
-
-    /*!
-     * @brief Default constructor.
-     */
-    eProsima_user_DllExport BM2();
-
-    /*!
-     * @brief Default destructor.
-     */
-    eProsima_user_DllExport ~BM2();
-
-    /*!
-     * @brief Copy constructor.
-     * @param x Reference to the object bitmodule::BM2 that will be copied.
-     */
-    eProsima_user_DllExport BM2(
-            const BM2& x);
-
-    /*!
-     * @brief Move constructor.
-     * @param x Reference to the object bitmodule::BM2 that will be copied.
-     */
-    eProsima_user_DllExport BM2(
-            BM2&& x) noexcept;
-
-    /*!
-     * @brief Copy assignment.
-     * @param x Reference to the object bitmodule::BM2 that will be copied.
-     */
-    eProsima_user_DllExport BM2& operator =(
-            const BM2& x);
-
-    /*!
-     * @brief Move assignment.
-     * @param x Reference to the object bitmodule::BM2 that will be copied.
-     */
-    eProsima_user_DllExport BM2& operator =(
-            BM2&& x) noexcept;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x bitmodule::BM2 object to compare.
-     */
-    eProsima_user_DllExport bool operator ==(
-            const BM2& x) const;
-
-    /*!
-     * @brief Comparison operator.
-     * @param x bitmodule::BM2 object to compare.
-     */
-    eProsima_user_DllExport bool operator !=(
-            const BM2& x) const;
-
-    /*!
-     * @brief This function copies the value in member two
-     * @param _two New value to be copied in member two
-     */
-    eProsima_user_DllExport void two(
-            const bitmodule::MyBitMask& _two);
-
-    /*!
-     * @brief This function moves the value in member two
-     * @param _two New value to be moved in member two
-     */
-    eProsima_user_DllExport void two(
-            bitmodule::MyBitMask&& _two);
-
-    /*!
-     * @brief This function returns a constant reference to member two
-     * @return Constant reference to member two
-     */
-    eProsima_user_DllExport const bitmodule::MyBitMask& two() const;
-
-    /*!
-     * @brief This function returns a reference to member two
-     * @return Reference to member two
-     */
-    eProsima_user_DllExport bitmodule::MyBitMask& two();
-
-
-    /*!
-     * @brief This function sets a value in member mylong
-     * @param _mylong New value for member mylong
-     */
-    eProsima_user_DllExport void mylong(
-            int32_t _mylong);
-
-    /*!
-     * @brief This function returns the value of member mylong
-     * @return Value of member mylong
-     */
-    eProsima_user_DllExport int32_t mylong() const;
-
-    /*!
-     * @brief This function returns a reference to member mylong
-     * @return Reference to member mylong
-     */
-    eProsima_user_DllExport int32_t& mylong();
-
-
-    /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
-    eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
-            size_t current_alignment = 0);
-
-    /*!
-     * @brief This function returns the serialized size of a data depending on the buffer alignment.
-     * @param data Data which is calculated its serialized size.
-     * @param current_alignment Buffer alignment.
-     * @return Serialized size.
-     */
-    eProsima_user_DllExport static size_t getCdrSerializedSize(
-            const bitmodule::BM2& data,
-            size_t current_alignment = 0);
-
-
-
-    /*!
-     * @brief This function serializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serialize(
-            eprosima::fastcdr::Cdr& cdr) const;
-
-    /*!
-     * @brief This function deserializes an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void deserialize(
-            eprosima::fastcdr::Cdr& cdr);
-
-
-
-
+namespace bitmodule {
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
-    eProsima_user_DllExport static bool isKeyDefined();
+     * @brief This class represents the structure ParentBitset defined by the user in the IDL file.
+     * @ingroup new_features_4_2
+     */
+    class ParentBitset
+    {
+    public:
+
+        /*!
+         * @brief Default constructor.
+         */
+        eProsima_user_DllExport ParentBitset();
+
+        /*!
+         * @brief Default destructor.
+         */
+        eProsima_user_DllExport ~ParentBitset();
+
+        /*!
+         * @brief Copy constructor.
+         * @param x Reference to the object bitmodule::ParentBitset that will be copied.
+         */
+        eProsima_user_DllExport ParentBitset(
+                const ParentBitset& x);
+
+        /*!
+         * @brief Move constructor.
+         * @param x Reference to the object bitmodule::ParentBitset that will be copied.
+         */
+        eProsima_user_DllExport ParentBitset(
+                ParentBitset&& x) noexcept;
+
+        /*!
+         * @brief Copy assignment.
+         * @param x Reference to the object bitmodule::ParentBitset that will be copied.
+         */
+        eProsima_user_DllExport ParentBitset& operator =(
+                const ParentBitset& x);
+
+        /*!
+         * @brief Move assignment.
+         * @param x Reference to the object bitmodule::ParentBitset that will be copied.
+         */
+        eProsima_user_DllExport ParentBitset& operator =(
+                ParentBitset&& x) noexcept;
+
+        /*!
+         * @brief Comparison operator.
+         * @param x bitmodule::ParentBitset object to compare.
+         */
+        eProsima_user_DllExport bool operator ==(
+                const ParentBitset& x) const;
+
+        /*!
+         * @brief Comparison operator.
+         * @param x bitmodule::ParentBitset object to compare.
+         */
+        eProsima_user_DllExport bool operator !=(
+                const ParentBitset& x) const;
+
+        /*!
+         * @brief This function sets a value in member parent_bitfield
+         * @param _parent_bitfield New value for member parent_bitfield
+         */
+        eProsima_user_DllExport void parent_bitfield(
+                uint32_t _parent_bitfield);
+
+        /*!
+         * @brief This function returns the value of member parent_bitfield
+         * @return Value of member parent_bitfield
+         */
+        eProsima_user_DllExport uint32_t parent_bitfield() const;
+
+
+        eProsima_user_DllExport std::bitset<17> bitset() const;
+
+        eProsima_user_DllExport void bitset(
+                const std::bitset<17>&);
+
+        /*!
+         * @brief This function returns the serialized size of a data depending on the buffer alignment.
+         * @param data Data which is calculated its serialized size.
+         * @param current_alignment Buffer alignment.
+         * @return Serialized size.
+         */
+        eProsima_user_DllExport static size_t getCdrSerializedSize(
+                const bitmodule::ParentBitset& data,
+                size_t current_alignment = 0);
+
+
+
+        /*!
+         * @brief This function serializes an object using CDR serialization.
+         * @param cdr CDR serialization object.
+         */
+        eProsima_user_DllExport void serialize(
+                eprosima::fastcdr::Cdr& cdr) const;
+
+        /*!
+         * @brief This function deserializes an object using CDR serialization.
+         * @param cdr CDR serialization object.
+         */
+        eProsima_user_DllExport void deserialize(
+                eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+
+    private:
+
+        std::bitset<17> m_bitset;
+    };
+    /*!
+     * @brief This class represents the structure MyBitset defined by the user in the IDL file.
+     * @ingroup new_features_4_2
+     */
+    class MyBitset : public bitmodule::ParentBitset
+    {
+    public:
+
+        /*!
+         * @brief Default constructor.
+         */
+        eProsima_user_DllExport MyBitset();
+
+        /*!
+         * @brief Default destructor.
+         */
+        eProsima_user_DllExport ~MyBitset();
+
+        /*!
+         * @brief Copy constructor.
+         * @param x Reference to the object bitmodule::MyBitset that will be copied.
+         */
+        eProsima_user_DllExport MyBitset(
+                const MyBitset& x);
+
+        /*!
+         * @brief Move constructor.
+         * @param x Reference to the object bitmodule::MyBitset that will be copied.
+         */
+        eProsima_user_DllExport MyBitset(
+                MyBitset&& x) noexcept;
+
+        /*!
+         * @brief Copy assignment.
+         * @param x Reference to the object bitmodule::MyBitset that will be copied.
+         */
+        eProsima_user_DllExport MyBitset& operator =(
+                const MyBitset& x);
+
+        /*!
+         * @brief Move assignment.
+         * @param x Reference to the object bitmodule::MyBitset that will be copied.
+         */
+        eProsima_user_DllExport MyBitset& operator =(
+                MyBitset&& x) noexcept;
+
+        /*!
+         * @brief Comparison operator.
+         * @param x bitmodule::MyBitset object to compare.
+         */
+        eProsima_user_DllExport bool operator ==(
+                const MyBitset& x) const;
+
+        /*!
+         * @brief Comparison operator.
+         * @param x bitmodule::MyBitset object to compare.
+         */
+        eProsima_user_DllExport bool operator !=(
+                const MyBitset& x) const;
+
+        /*!
+         * @brief This function sets a value in member a
+         * @param _a New value for member a
+         */
+        eProsima_user_DllExport void a(
+                char _a);
+
+        /*!
+         * @brief This function returns the value of member a
+         * @return Value of member a
+         */
+        eProsima_user_DllExport char a() const;
+
+
+        /*!
+         * @brief This function sets a value in member b
+         * @param _b New value for member b
+         */
+        eProsima_user_DllExport void b(
+                bool _b);
+
+        /*!
+         * @brief This function returns the value of member b
+         * @return Value of member b
+         */
+        eProsima_user_DllExport bool b() const;
+
 
-    /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
-    eProsima_user_DllExport void serializeKey(
-            eprosima::fastcdr::Cdr& cdr) const;
 
-private:
-
-    bitmodule::MyBitMask m_two;
-    int32_t m_mylong;
-
-};
+        /*!
+         * @brief This function sets a value in member c
+         * @param _c New value for member c
+         */
+        eProsima_user_DllExport void c(
+                uint16_t _c);
+
+        /*!
+         * @brief This function returns the value of member c
+         * @return Value of member c
+         */
+        eProsima_user_DllExport uint16_t c() const;
+
+
+        /*!
+         * @brief This function sets a value in member d
+         * @param _d New value for member d
+         */
+        eProsima_user_DllExport void d(
+                int16_t _d);
+
+        /*!
+         * @brief This function returns the value of member d
+         * @return Value of member d
+         */
+        eProsima_user_DllExport int16_t d() const;
+
+
+        /*!
+         * @brief This function sets a value in member e
+         * @param _e New value for member e
+         */
+        eProsima_user_DllExport void e(
+                int16_t _e);
+
+        /*!
+         * @brief This function returns the value of member e
+         * @return Value of member e
+         */
+        eProsima_user_DllExport int16_t e() const;
+
+
+        /*!
+         * @brief This function sets a value in member f
+         * @param _f New value for member f
+         */
+        eProsima_user_DllExport void f(
+                int16_t _f);
+
+        /*!
+         * @brief This function returns the value of member f
+         * @return Value of member f
+         */
+        eProsima_user_DllExport int16_t f() const;
+
+
+        eProsima_user_DllExport std::bitset<50> bitset() const;
+
+        eProsima_user_DllExport void bitset(
+                const std::bitset<50>&);
+
+        /*!
+         * @brief This function returns the serialized size of a data depending on the buffer alignment.
+         * @param data Data which is calculated its serialized size.
+         * @param current_alignment Buffer alignment.
+         * @return Serialized size.
+         */
+        eProsima_user_DllExport static size_t getCdrSerializedSize(
+                const bitmodule::MyBitset& data,
+                size_t current_alignment = 0);
+
+
+
+        /*!
+         * @brief This function serializes an object using CDR serialization.
+         * @param cdr CDR serialization object.
+         */
+        eProsima_user_DllExport void serialize(
+                eprosima::fastcdr::Cdr& cdr) const;
+
+        /*!
+         * @brief This function deserializes an object using CDR serialization.
+         * @param cdr CDR serialization object.
+         */
+        eProsima_user_DllExport void deserialize(
+                eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+
+    private:
+
+        std::bitset<33> m_bitset;
+    };
+    /*!
+     * @brief This class represents the bitmask MyBitMask defined by the user in the IDL file.
+     * @ingroup new_features_4_2
+     */
+    enum MyBitMaskBits : uint8_t
+    {
+        flag0 = 0x01ull << 0,
+        flag1 = 0x01ull << 1,
+        flag4 = 0x01ull << 4,
+        flag6 = 0x01ull << 6,
+        flag7 = 0x01ull << 7
+    };
+    typedef uint8_t MyBitMask;
+
+
+    /*!
+     * @brief This class represents the structure BitsetBitmask defined by the user in the IDL file.
+     * @ingroup new_features_4_2
+     */
+    class BitsetBitmask
+    {
+    public:
+
+        /*!
+         * @brief Default constructor.
+         */
+        eProsima_user_DllExport BitsetBitmask();
+
+        /*!
+         * @brief Default destructor.
+         */
+        eProsima_user_DllExport ~BitsetBitmask();
+
+        /*!
+         * @brief Copy constructor.
+         * @param x Reference to the object bitmodule::BitsetBitmask that will be copied.
+         */
+        eProsima_user_DllExport BitsetBitmask(
+                const BitsetBitmask& x);
+
+        /*!
+         * @brief Move constructor.
+         * @param x Reference to the object bitmodule::BitsetBitmask that will be copied.
+         */
+        eProsima_user_DllExport BitsetBitmask(
+                BitsetBitmask&& x) noexcept;
+
+        /*!
+         * @brief Copy assignment.
+         * @param x Reference to the object bitmodule::BitsetBitmask that will be copied.
+         */
+        eProsima_user_DllExport BitsetBitmask& operator =(
+                const BitsetBitmask& x);
+
+        /*!
+         * @brief Move assignment.
+         * @param x Reference to the object bitmodule::BitsetBitmask that will be copied.
+         */
+        eProsima_user_DllExport BitsetBitmask& operator =(
+                BitsetBitmask&& x) noexcept;
+
+        /*!
+         * @brief Comparison operator.
+         * @param x bitmodule::BitsetBitmask object to compare.
+         */
+        eProsima_user_DllExport bool operator ==(
+                const BitsetBitmask& x) const;
+
+        /*!
+         * @brief Comparison operator.
+         * @param x bitmodule::BitsetBitmask object to compare.
+         */
+        eProsima_user_DllExport bool operator !=(
+                const BitsetBitmask& x) const;
+
+        /*!
+         * @brief This function copies the value in member mybitset
+         * @param _mybitset New value to be copied in member mybitset
+         */
+        eProsima_user_DllExport void mybitset(
+                const bitmodule::MyBitset& _mybitset);
+
+        /*!
+         * @brief This function moves the value in member mybitset
+         * @param _mybitset New value to be moved in member mybitset
+         */
+        eProsima_user_DllExport void mybitset(
+                bitmodule::MyBitset&& _mybitset);
+
+        /*!
+         * @brief This function returns a constant reference to member mybitset
+         * @return Constant reference to member mybitset
+         */
+        eProsima_user_DllExport const bitmodule::MyBitset& mybitset() const;
+
+        /*!
+         * @brief This function returns a reference to member mybitset
+         * @return Reference to member mybitset
+         */
+        eProsima_user_DllExport bitmodule::MyBitset& mybitset();
+
+
+        /*!
+         * @brief This function copies the value in member mybitmask
+         * @param _mybitmask New value to be copied in member mybitmask
+         */
+        eProsima_user_DllExport void mybitmask(
+                const bitmodule::MyBitMask& _mybitmask);
+
+        /*!
+         * @brief This function moves the value in member mybitmask
+         * @param _mybitmask New value to be moved in member mybitmask
+         */
+        eProsima_user_DllExport void mybitmask(
+                bitmodule::MyBitMask&& _mybitmask);
+
+        /*!
+         * @brief This function returns a constant reference to member mybitmask
+         * @return Constant reference to member mybitmask
+         */
+        eProsima_user_DllExport const bitmodule::MyBitMask& mybitmask() const;
+
+        /*!
+         * @brief This function returns a reference to member mybitmask
+         * @return Reference to member mybitmask
+         */
+        eProsima_user_DllExport bitmodule::MyBitMask& mybitmask();
+
+
+        /*!
+        * @brief This function returns the maximum serialized size of an object
+        * depending on the buffer alignment.
+        * @param current_alignment Buffer alignment.
+        * @return Maximum serialized size.
+        */
+        eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                size_t current_alignment = 0);
+
+        /*!
+         * @brief This function returns the serialized size of a data depending on the buffer alignment.
+         * @param data Data which is calculated its serialized size.
+         * @param current_alignment Buffer alignment.
+         * @return Serialized size.
+         */
+        eProsima_user_DllExport static size_t getCdrSerializedSize(
+                const bitmodule::BitsetBitmask& data,
+                size_t current_alignment = 0);
+
+
+
+        /*!
+         * @brief This function serializes an object using CDR serialization.
+         * @param cdr CDR serialization object.
+         */
+        eProsima_user_DllExport void serialize(
+                eprosima::fastcdr::Cdr& cdr) const;
+
+        /*!
+         * @brief This function deserializes an object using CDR serialization.
+         * @param cdr CDR serialization object.
+         */
+        eProsima_user_DllExport void deserialize(
+                eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+        /*!
+        * @brief This function tells you if the Key has been defined for this type
+        */
+        eProsima_user_DllExport static bool isKeyDefined();
+
+        /*!
+        * @brief This function serializes the key members of an object using CDR serialization.
+        * @param cdr CDR serialization object.
+        */
+        eProsima_user_DllExport void serializeKey(
+                eprosima::fastcdr::Cdr& cdr) const;
+
+
+    private:
+
+        bitmodule::MyBitset m_mybitset;
+        bitmodule::MyBitMask m_mybitmask;
+
+    };
+
+
+
+    /*!
+     * @brief This class represents the structure BM2 defined by the user in the IDL file.
+     * @ingroup new_features_4_2
+     */
+    class BM2 : public bitmodule::BitsetBitmask
+    {
+    public:
+
+        /*!
+         * @brief Default constructor.
+         */
+        eProsima_user_DllExport BM2();
+
+        /*!
+         * @brief Default destructor.
+         */
+        eProsima_user_DllExport ~BM2();
+
+        /*!
+         * @brief Copy constructor.
+         * @param x Reference to the object bitmodule::BM2 that will be copied.
+         */
+        eProsima_user_DllExport BM2(
+                const BM2& x);
+
+        /*!
+         * @brief Move constructor.
+         * @param x Reference to the object bitmodule::BM2 that will be copied.
+         */
+        eProsima_user_DllExport BM2(
+                BM2&& x) noexcept;
+
+        /*!
+         * @brief Copy assignment.
+         * @param x Reference to the object bitmodule::BM2 that will be copied.
+         */
+        eProsima_user_DllExport BM2& operator =(
+                const BM2& x);
+
+        /*!
+         * @brief Move assignment.
+         * @param x Reference to the object bitmodule::BM2 that will be copied.
+         */
+        eProsima_user_DllExport BM2& operator =(
+                BM2&& x) noexcept;
+
+        /*!
+         * @brief Comparison operator.
+         * @param x bitmodule::BM2 object to compare.
+         */
+        eProsima_user_DllExport bool operator ==(
+                const BM2& x) const;
+
+        /*!
+         * @brief Comparison operator.
+         * @param x bitmodule::BM2 object to compare.
+         */
+        eProsima_user_DllExport bool operator !=(
+                const BM2& x) const;
+
+        /*!
+         * @brief This function copies the value in member two
+         * @param _two New value to be copied in member two
+         */
+        eProsima_user_DllExport void two(
+                const bitmodule::MyBitMask& _two);
+
+        /*!
+         * @brief This function moves the value in member two
+         * @param _two New value to be moved in member two
+         */
+        eProsima_user_DllExport void two(
+                bitmodule::MyBitMask&& _two);
+
+        /*!
+         * @brief This function returns a constant reference to member two
+         * @return Constant reference to member two
+         */
+        eProsima_user_DllExport const bitmodule::MyBitMask& two() const;
+
+        /*!
+         * @brief This function returns a reference to member two
+         * @return Reference to member two
+         */
+        eProsima_user_DllExport bitmodule::MyBitMask& two();
+
+
+        /*!
+         * @brief This function sets a value in member mylong
+         * @param _mylong New value for member mylong
+         */
+        eProsima_user_DllExport void mylong(
+                int32_t _mylong);
+
+        /*!
+         * @brief This function returns the value of member mylong
+         * @return Value of member mylong
+         */
+        eProsima_user_DllExport int32_t mylong() const;
+
+        /*!
+         * @brief This function returns a reference to member mylong
+         * @return Reference to member mylong
+         */
+        eProsima_user_DllExport int32_t& mylong();
+
+
+        /*!
+        * @brief This function returns the maximum serialized size of an object
+        * depending on the buffer alignment.
+        * @param current_alignment Buffer alignment.
+        * @return Maximum serialized size.
+        */
+        eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
+                size_t current_alignment = 0);
+
+        /*!
+         * @brief This function returns the serialized size of a data depending on the buffer alignment.
+         * @param data Data which is calculated its serialized size.
+         * @param current_alignment Buffer alignment.
+         * @return Serialized size.
+         */
+        eProsima_user_DllExport static size_t getCdrSerializedSize(
+                const bitmodule::BM2& data,
+                size_t current_alignment = 0);
+
+
+
+        /*!
+         * @brief This function serializes an object using CDR serialization.
+         * @param cdr CDR serialization object.
+         */
+        eProsima_user_DllExport void serialize(
+                eprosima::fastcdr::Cdr& cdr) const;
+
+        /*!
+         * @brief This function deserializes an object using CDR serialization.
+         * @param cdr CDR serialization object.
+         */
+        eProsima_user_DllExport void deserialize(
+                eprosima::fastcdr::Cdr& cdr);
+
+
+
+
+        /*!
+        * @brief This function tells you if the Key has been defined for this type
+        */
+        eProsima_user_DllExport static bool isKeyDefined();
+
+        /*!
+        * @brief This function serializes the key members of an object using CDR serialization.
+        * @param cdr CDR serialization object.
+        */
+        eProsima_user_DllExport void serializeKey(
+                eprosima::fastcdr::Cdr& cdr) const;
+
+
+    private:
+
+        bitmodule::MyBitMask m_two;
+        int32_t m_mylong;
+
+    };
 
 } // namespace bitmodule
 
@@ -1647,11 +1672,11 @@ class StructTest : public NewAliases
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1685,17 +1710,18 @@ class StructTest : public NewAliases
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     OctetUnion m_octetUnion;
diff --git a/test/unittest/rtps/history/ReaderHistoryTests.cpp b/test/unittest/rtps/history/ReaderHistoryTests.cpp
index 40d2eb6a0e2..4f82977b609 100644
--- a/test/unittest/rtps/history/ReaderHistoryTests.cpp
+++ b/test/unittest/rtps/history/ReaderHistoryTests.cpp
@@ -21,7 +21,7 @@
 
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
-#include <fastrtps/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
 
 #include <rtps/common/ChangeComparison.hpp>
 
diff --git a/test/unittest/rtps/network/ExternalLocatorsTests.cpp b/test/unittest/rtps/network/ExternalLocatorsTests.cpp
index cf643b0f1a5..a81467bab89 100644
--- a/test/unittest/rtps/network/ExternalLocatorsTests.cpp
+++ b/test/unittest/rtps/network/ExternalLocatorsTests.cpp
@@ -15,7 +15,7 @@
 #include <gtest/gtest.h>
 
 #include <fastdds/rtps/common/LocatorWithMask.hpp>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include <rtps/network/utils/external_locators.hpp>
 
diff --git a/test/unittest/rtps/network/NetworkFactoryTests.cpp b/test/unittest/rtps/network/NetworkFactoryTests.cpp
index ab33018a921..557c237e1e1 100644
--- a/test/unittest/rtps/network/NetworkFactoryTests.cpp
+++ b/test/unittest/rtps/network/NetworkFactoryTests.cpp
@@ -21,8 +21,8 @@
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/IPLocator.h>
 
 #include <MockTransport.h>
 #include <rtps/network/NetworkFactory.h>
diff --git a/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp b/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp
index 126cf587f3a..6c4e06e3dbb 100644
--- a/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp
+++ b/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp
@@ -31,6 +31,7 @@
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/attributes/WriterAttributes.h>
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
@@ -42,7 +43,6 @@
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/statistics/IListeners.hpp>
 #include <fastdds/statistics/rtps/monitor_service/Interfaces.hpp>
-#include <fastrtps/attributes/TopicAttributes.h>
 
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/transport/test_UDPv4Transport.h>
diff --git a/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp b/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp
index f1859167b1f..ef28c734513 100644
--- a/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp
+++ b/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp
@@ -23,7 +23,7 @@
 
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/resources/ResourceManagement.h>
-#include <fastrtps/utils/TimedMutex.hpp>
+#include <fastdds/utils/TimedMutex.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/test/unittest/transport/SharedMemTests.cpp b/test/unittest/transport/SharedMemTests.cpp
index 59b65f4ceb9..5135fdcbe81 100644
--- a/test/unittest/transport/SharedMemTests.cpp
+++ b/test/unittest/transport/SharedMemTests.cpp
@@ -22,7 +22,7 @@
 #include <gtest/gtest.h>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/utils/Semaphore.h>
 
 #include "../../../src/cpp/rtps/transport/shared_mem/MultiProducerConsumerRingBuffer.hpp"
diff --git a/test/unittest/transport/TCPv4Tests.cpp b/test/unittest/transport/TCPv4Tests.cpp
index 7061bdb605f..0e3a8176032 100644
--- a/test/unittest/transport/TCPv4Tests.cpp
+++ b/test/unittest/transport/TCPv4Tests.cpp
@@ -21,8 +21,8 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastrtps/utils/IPFinder.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPFinder.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/utils/Semaphore.h>
 
 #include "mock/MockTCPChannelResource.h"
diff --git a/test/unittest/transport/TCPv6Tests.cpp b/test/unittest/transport/TCPv6Tests.cpp
index a5ad6d48d16..f7219d84645 100644
--- a/test/unittest/transport/TCPv6Tests.cpp
+++ b/test/unittest/transport/TCPv6Tests.cpp
@@ -22,7 +22,7 @@
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/utils/Semaphore.h>
 
 #include <MockReceiverResource.h>
diff --git a/test/unittest/transport/UDPv4Tests.cpp b/test/unittest/transport/UDPv4Tests.cpp
index 5af38d684ed..ab1fe348056 100644
--- a/test/unittest/transport/UDPv4Tests.cpp
+++ b/test/unittest/transport/UDPv4Tests.cpp
@@ -19,8 +19,8 @@
 #include <gtest/gtest.h>
 
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastrtps/utils/IPFinder.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPFinder.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/utils/Semaphore.h>
 
 #include <MockReceiverResource.h>
diff --git a/test/unittest/transport/UDPv6Tests.cpp b/test/unittest/transport/UDPv6Tests.cpp
index 9a8eb1939e2..a9234bd81e5 100644
--- a/test/unittest/transport/UDPv6Tests.cpp
+++ b/test/unittest/transport/UDPv6Tests.cpp
@@ -20,7 +20,7 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/utils/Semaphore.h>
 
 #include <MockReceiverResource.h>
diff --git a/test/unittest/utils/BitmapRangeTests.cpp b/test/unittest/utils/BitmapRangeTests.cpp
index fe0cadd436e..2c649a339f8 100644
--- a/test/unittest/utils/BitmapRangeTests.cpp
+++ b/test/unittest/utils/BitmapRangeTests.cpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include <cstdint>
-#include <fastrtps/utils/fixed_size_bitmap.hpp>
+#include <fastdds/utils/fixed_size_bitmap.hpp>
 #include <gtest/gtest.h>
 
 #include <algorithm>
diff --git a/test/unittest/utils/LocatorTests.cpp b/test/unittest/utils/LocatorTests.cpp
index 3f581a17f28..08d126628d0 100644
--- a/test/unittest/utils/LocatorTests.cpp
+++ b/test/unittest/utils/LocatorTests.cpp
@@ -20,8 +20,8 @@
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/LocatorListComparisons.hpp>
 #include <fastdds/rtps/common/RemoteLocators.hpp>
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/IPLocator.h>
 
 using namespace eprosima::fastrtps::rtps;
 
diff --git a/test/unittest/utils/ResourceLimitedVectorTests.cpp b/test/unittest/utils/ResourceLimitedVectorTests.cpp
index 98c2a581bad..5772fdc4f2a 100644
--- a/test/unittest/utils/ResourceLimitedVectorTests.cpp
+++ b/test/unittest/utils/ResourceLimitedVectorTests.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <fastrtps/utils/collections/ResourceLimitedVector.hpp>
+#include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 #include <gtest/gtest.h>
 
 using namespace eprosima::fastrtps;
diff --git a/test/unittest/xmlparser/XMLElementParserTests.cpp b/test/unittest/xmlparser/XMLElementParserTests.cpp
index 7524604a42f..f1325cd6f3d 100644
--- a/test/unittest/xmlparser/XMLElementParserTests.cpp
+++ b/test/unittest/xmlparser/XMLElementParserTests.cpp
@@ -27,7 +27,7 @@
 
 #include <fastdds/LibrarySettings.hpp>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include <xmlparser/XMLParser.h>
 #include <xmlparser/XMLProfileManager.h>
diff --git a/test/unittest/xmlparser/XMLParserTests.cpp b/test/unittest/xmlparser/XMLParserTests.cpp
index 6ce8b425158..99b27a7cd04 100644
--- a/test/unittest/xmlparser/XMLParserTests.cpp
+++ b/test/unittest/xmlparser/XMLParserTests.cpp
@@ -35,7 +35,7 @@
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include <xmlparser/XMLParser.h>
 #include <xmlparser/XMLProfileManager.h>
diff --git a/test/unittest/xmlparser/XMLProfileParserTests.cpp b/test/unittest/xmlparser/XMLProfileParserTests.cpp
index 9195048628c..cce6ba7e003 100644
--- a/test/unittest/xmlparser/XMLProfileParserTests.cpp
+++ b/test/unittest/xmlparser/XMLProfileParserTests.cpp
@@ -35,7 +35,7 @@
 #include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
 #include <fastdds/rtps/transport/TCPTransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPTransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 #include <xmlparser/XMLProfileManager.h>
 
diff --git a/test/unittest/xtypes/idl/TypesPubSubTypes.h b/test/unittest/xtypes/idl/TypesPubSubTypes.h
index 6a934f82843..e579289b6e5 100644
--- a/test/unittest/xtypes/idl/TypesPubSubTypes.h
+++ b/test/unittest/xtypes/idl/TypesPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "Types.h"
 
diff --git a/test/unittest/xtypes/idl/TypesTypeObject.cxx b/test/unittest/xtypes/idl/TypesTypeObject.cxx
index bcefed47249..8082634f979 100644
--- a/test/unittest/xtypes/idl/TypesTypeObject.cxx
+++ b/test/unittest/xtypes/idl/TypesTypeObject.cxx
@@ -26,12 +26,14 @@ namespace { char dummy; }
 
 #include "Types.h"
 #include "TypesTypeObject.h"
+
 #include <mutex>
 #include <utility>
 #include <sstream>
+
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastrtps/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypeObjectFactory.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/AnnotationParameterValue.h>
diff --git a/test/unittest/xtypes/idl/Typesv1.h b/test/unittest/xtypes/idl/Typesv1.h
index 347a0fba76c..9b6aae6ee62 100644
--- a/test/unittest/xtypes/idl/Typesv1.h
+++ b/test/unittest/xtypes/idl/Typesv1.h
@@ -26,6 +26,7 @@
 #ifndef _FAST_DDS_GENERATED_TYPES_H_
 #define _FAST_DDS_GENERATED_TYPES_H_
 
+
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -171,11 +172,11 @@ class MyEnumStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -209,17 +210,18 @@ class MyEnumStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     MyEnum m_my_enum;
@@ -309,11 +311,11 @@ class MyBadEnumStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -347,17 +349,18 @@ class MyBadEnumStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     MyBadEnum m_my_enum;
@@ -449,11 +452,11 @@ class MyAliasEnumStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -487,17 +490,18 @@ class MyAliasEnumStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     MyAliasEnum m_my_enum;
@@ -634,11 +638,11 @@ class BasicStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -672,17 +676,18 @@ class BasicStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     bool m_my_bool;
@@ -821,11 +826,11 @@ class BasicNamesStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -859,17 +864,18 @@ class BasicNamesStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     bool m_my_bool_name;
@@ -1008,11 +1014,11 @@ class BasicBadStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1046,17 +1052,18 @@ class BasicBadStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint8_t m_my_bool;
@@ -1242,11 +1249,11 @@ class BasicWideStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1280,17 +1287,18 @@ class BasicWideStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     bool m_my_bool;
@@ -1478,11 +1486,11 @@ class BadBasicWideStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1516,17 +1524,18 @@ class BadBasicWideStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     int32_t m_new_int32;
@@ -1627,11 +1636,11 @@ class StringStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1665,17 +1674,18 @@ class StringStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::string m_my_string;
@@ -1772,11 +1782,11 @@ class LargeStringStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1810,17 +1820,18 @@ class LargeStringStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     eprosima::fastcdr::fixed_string<41925> m_my_large_string;
@@ -1917,11 +1928,11 @@ class WStringStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1955,17 +1966,18 @@ class WStringStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::wstring m_my_wstring;
@@ -2062,11 +2074,11 @@ class LargeWStringStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2100,17 +2112,18 @@ class LargeWStringStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::wstring m_my_large_wstring;
@@ -2207,11 +2220,11 @@ class ArrayStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2245,17 +2258,18 @@ class ArrayStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::array<int32_t, 2> m_my_array;
@@ -2352,11 +2366,11 @@ class ArrayStructEqual
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2390,17 +2404,18 @@ class ArrayStructEqual
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::array<int32_t, 2> m_my_array_equal;
@@ -2497,11 +2512,11 @@ class ArrayBadStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2535,17 +2550,18 @@ class ArrayBadStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::array<uint8_t, 2> m_my_array;
@@ -2642,11 +2658,11 @@ class ArrayDimensionsStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2680,17 +2696,18 @@ class ArrayDimensionsStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::array<std::array<int32_t, 2>, 2> m_my_array;
@@ -2787,11 +2804,11 @@ class ArraySizeStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2825,17 +2842,18 @@ class ArraySizeStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::array<int32_t, 5> m_my_array;
@@ -2934,11 +2952,11 @@ class SequenceStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2972,17 +2990,18 @@ class SequenceStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<int32_t> m_my_sequence;
@@ -3081,11 +3100,11 @@ class SequenceStructEqual
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3119,17 +3138,18 @@ class SequenceStructEqual
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<int32_t> m_my_sequence_equal;
@@ -3228,11 +3248,11 @@ class SequenceBadStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3266,17 +3286,18 @@ class SequenceBadStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<uint8_t> m_my_sequence;
@@ -3375,11 +3396,11 @@ class SequenceBoundsStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3413,17 +3434,18 @@ class SequenceBoundsStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<int32_t> m_my_sequence;
@@ -3524,11 +3546,11 @@ class SequenceSequenceStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3562,17 +3584,18 @@ class SequenceSequenceStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<std::vector<int32_t>> m_my_sequence_sequence;
@@ -3673,11 +3696,11 @@ class SequenceSequenceBoundsStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3711,17 +3734,18 @@ class SequenceSequenceBoundsStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<std::vector<int32_t>> m_my_sequence_sequence;
@@ -3820,11 +3844,11 @@ class MapStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3858,17 +3882,18 @@ class MapStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, int32_t> m_my_map;
@@ -3967,11 +3992,11 @@ class MapStructEqual
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4005,17 +4030,18 @@ class MapStructEqual
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, int32_t> m_my_map_equal;
@@ -4114,11 +4140,11 @@ class MapBadKeyStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4152,17 +4178,18 @@ class MapBadKeyStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<uint8_t, int32_t> m_my_map;
@@ -4261,11 +4288,11 @@ class MapBadElemStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4299,17 +4326,18 @@ class MapBadElemStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, int64_t> m_my_map;
@@ -4408,11 +4436,11 @@ class MapBoundsStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4446,17 +4474,18 @@ class MapBoundsStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, int32_t> m_my_map;
@@ -4557,11 +4586,11 @@ class MapMapStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4595,17 +4624,18 @@ class MapMapStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, std::map<int32_t, int32_t>> m_my_map_map;
@@ -4706,11 +4736,11 @@ class MapMapBoundsStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4744,17 +4774,18 @@ class MapMapBoundsStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, std::map<int32_t, int32_t>> m_my_map_map;
@@ -4913,6 +4944,10 @@ class SimpleUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     int32_t m__d;
@@ -5073,6 +5108,10 @@ class SimpleUnionNames
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     int32_t m__d;
@@ -5233,6 +5272,10 @@ class SimpleTypeUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     int32_t m__d;
@@ -5393,6 +5436,10 @@ class SimpleBadUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     int32_t m__d;
@@ -5553,6 +5600,10 @@ class SimpleBadDiscUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     uint8_t m__d;
@@ -5651,11 +5702,11 @@ class SimpleUnionStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -5689,17 +5740,18 @@ class SimpleUnionStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleUnion m_my_union;
@@ -5796,11 +5848,11 @@ class SimpleUnionStructEqual
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -5834,17 +5886,18 @@ class SimpleUnionStructEqual
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleUnion m_my_union_equal;
@@ -5941,11 +5994,11 @@ class SimpleUnionNamesStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -5979,17 +6032,18 @@ class SimpleUnionNamesStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleUnionNames m_my_union;
@@ -6086,11 +6140,11 @@ class SimpleTypeUnionStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -6124,17 +6178,18 @@ class SimpleTypeUnionStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleTypeUnion m_my_union;
@@ -6231,11 +6286,11 @@ class SimpleBadUnionStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -6269,17 +6324,18 @@ class SimpleBadUnionStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleBadUnion m_my_union;
@@ -6376,11 +6432,11 @@ class SimplBadDiscUnionStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -6414,17 +6470,18 @@ class SimplBadDiscUnionStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleBadDiscUnion m_my_union;
diff --git a/test/unittest/xtypes/idl/WideEnum.h b/test/unittest/xtypes/idl/WideEnum.h
index 6ec2c5b51ba..fca5658734d 100644
--- a/test/unittest/xtypes/idl/WideEnum.h
+++ b/test/unittest/xtypes/idl/WideEnum.h
@@ -37,6 +37,7 @@
 #include <fastcdr/xcdr/external.hpp>
 #include <fastcdr/xcdr/optional.hpp>
 
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
diff --git a/test/unittest/xtypes/idl/WideEnumPubSubTypes.h b/test/unittest/xtypes/idl/WideEnumPubSubTypes.h
index 8119ba12ac2..2769b1414f3 100644
--- a/test/unittest/xtypes/idl/WideEnumPubSubTypes.h
+++ b/test/unittest/xtypes/idl/WideEnumPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "WideEnum.h"
 
diff --git a/test/unittest/xtypes/idl/WideEnumTypeObject.cxx b/test/unittest/xtypes/idl/WideEnumTypeObject.cxx
index 0ae2ba7138b..ad42489b38d 100644
--- a/test/unittest/xtypes/idl/WideEnumTypeObject.cxx
+++ b/test/unittest/xtypes/idl/WideEnumTypeObject.cxx
@@ -26,12 +26,14 @@ namespace { char dummy; }
 
 #include "WideEnum.h"
 #include "WideEnumTypeObject.h"
+
 #include <mutex>
 #include <utility>
 #include <sstream>
+
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastrtps/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypeObjectFactory.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/AnnotationParameterValue.h>
diff --git a/test/unittest/xtypes/idl/WideEnumv1.h b/test/unittest/xtypes/idl/WideEnumv1.h
index 4b9c16c495c..9624f24e48f 100644
--- a/test/unittest/xtypes/idl/WideEnumv1.h
+++ b/test/unittest/xtypes/idl/WideEnumv1.h
@@ -27,8 +27,6 @@
 #define _FAST_DDS_GENERATED_WIDEENUM_H_
 
 
-#include <fastcdr/cdr/fixed_size_string.hpp>
-
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -37,6 +35,8 @@
 #include <string>
 #include <vector>
 
+#include <fastcdr/cdr/fixed_size_string.hpp>
+
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
 #define eProsima_user_DllExport __declspec( dllexport )
@@ -163,11 +163,11 @@ class MyEnumWideStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -201,17 +201,18 @@ class MyEnumWideStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     MyEnumWide m_my_enum_wide;
@@ -392,6 +393,10 @@ class SimpleWideUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     int32_t m__d;
@@ -491,11 +496,11 @@ class SimpleWideUnionStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -529,17 +534,18 @@ class SimpleWideUnionStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleWideUnion m_my_union;
diff --git a/test/xtypes/TestPublisher.cpp b/test/xtypes/TestPublisher.cpp
index 7b591722303..ce6530b15b6 100644
--- a/test/xtypes/TestPublisher.cpp
+++ b/test/xtypes/TestPublisher.cpp
@@ -34,9 +34,10 @@
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/types/DynamicType.h>
 #include <fastrtps/types/DynamicTypePtr.h>
-#include <fastrtps/utils/IPLocator.h>
+
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::dds::xtypes;
diff --git a/test/xtypes/TestSubscriber.cpp b/test/xtypes/TestSubscriber.cpp
index 9d9cbc823cd..8c670d5c04a 100644
--- a/test/xtypes/TestSubscriber.cpp
+++ b/test/xtypes/TestSubscriber.cpp
@@ -32,9 +32,9 @@
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/types/DynamicType.h>
 #include <fastrtps/types/DynamicTypePtr.h>
-#include <fastrtps/utils/IPLocator.h>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastrtps;
diff --git a/test/xtypes/idl/TypesPubSubTypes.h b/test/xtypes/idl/TypesPubSubTypes.h
index 6a934f82843..e579289b6e5 100644
--- a/test/xtypes/idl/TypesPubSubTypes.h
+++ b/test/xtypes/idl/TypesPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "Types.h"
 
diff --git a/test/xtypes/idl/TypesTypeObject.cxx b/test/xtypes/idl/TypesTypeObject.cxx
index bcefed47249..8082634f979 100644
--- a/test/xtypes/idl/TypesTypeObject.cxx
+++ b/test/xtypes/idl/TypesTypeObject.cxx
@@ -26,12 +26,14 @@ namespace { char dummy; }
 
 #include "Types.h"
 #include "TypesTypeObject.h"
+
 #include <mutex>
 #include <utility>
 #include <sstream>
+
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastrtps/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/utils/md5.h>
 #include <fastrtps/types/TypeObjectFactory.h>
 #include <fastrtps/types/TypeNamesGenerator.h>
 #include <fastrtps/types/AnnotationParameterValue.h>
diff --git a/test/xtypes/idl/Typesv1.h b/test/xtypes/idl/Typesv1.h
index 347a0fba76c..9b6aae6ee62 100644
--- a/test/xtypes/idl/Typesv1.h
+++ b/test/xtypes/idl/Typesv1.h
@@ -26,6 +26,7 @@
 #ifndef _FAST_DDS_GENERATED_TYPES_H_
 #define _FAST_DDS_GENERATED_TYPES_H_
 
+
 #include <array>
 #include <bitset>
 #include <cstdint>
@@ -171,11 +172,11 @@ class MyEnumStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -209,17 +210,18 @@ class MyEnumStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     MyEnum m_my_enum;
@@ -309,11 +311,11 @@ class MyBadEnumStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -347,17 +349,18 @@ class MyBadEnumStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     MyBadEnum m_my_enum;
@@ -449,11 +452,11 @@ class MyAliasEnumStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -487,17 +490,18 @@ class MyAliasEnumStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     MyAliasEnum m_my_enum;
@@ -634,11 +638,11 @@ class BasicStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -672,17 +676,18 @@ class BasicStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     bool m_my_bool;
@@ -821,11 +826,11 @@ class BasicNamesStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -859,17 +864,18 @@ class BasicNamesStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     bool m_my_bool_name;
@@ -1008,11 +1014,11 @@ class BasicBadStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1046,17 +1052,18 @@ class BasicBadStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     uint8_t m_my_bool;
@@ -1242,11 +1249,11 @@ class BasicWideStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1280,17 +1287,18 @@ class BasicWideStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     bool m_my_bool;
@@ -1478,11 +1486,11 @@ class BadBasicWideStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1516,17 +1524,18 @@ class BadBasicWideStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     int32_t m_new_int32;
@@ -1627,11 +1636,11 @@ class StringStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1665,17 +1674,18 @@ class StringStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::string m_my_string;
@@ -1772,11 +1782,11 @@ class LargeStringStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1810,17 +1820,18 @@ class LargeStringStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     eprosima::fastcdr::fixed_string<41925> m_my_large_string;
@@ -1917,11 +1928,11 @@ class WStringStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -1955,17 +1966,18 @@ class WStringStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::wstring m_my_wstring;
@@ -2062,11 +2074,11 @@ class LargeWStringStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2100,17 +2112,18 @@ class LargeWStringStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::wstring m_my_large_wstring;
@@ -2207,11 +2220,11 @@ class ArrayStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2245,17 +2258,18 @@ class ArrayStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::array<int32_t, 2> m_my_array;
@@ -2352,11 +2366,11 @@ class ArrayStructEqual
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2390,17 +2404,18 @@ class ArrayStructEqual
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::array<int32_t, 2> m_my_array_equal;
@@ -2497,11 +2512,11 @@ class ArrayBadStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2535,17 +2550,18 @@ class ArrayBadStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::array<uint8_t, 2> m_my_array;
@@ -2642,11 +2658,11 @@ class ArrayDimensionsStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2680,17 +2696,18 @@ class ArrayDimensionsStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::array<std::array<int32_t, 2>, 2> m_my_array;
@@ -2787,11 +2804,11 @@ class ArraySizeStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2825,17 +2842,18 @@ class ArraySizeStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::array<int32_t, 5> m_my_array;
@@ -2934,11 +2952,11 @@ class SequenceStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -2972,17 +2990,18 @@ class SequenceStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<int32_t> m_my_sequence;
@@ -3081,11 +3100,11 @@ class SequenceStructEqual
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3119,17 +3138,18 @@ class SequenceStructEqual
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<int32_t> m_my_sequence_equal;
@@ -3228,11 +3248,11 @@ class SequenceBadStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3266,17 +3286,18 @@ class SequenceBadStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<uint8_t> m_my_sequence;
@@ -3375,11 +3396,11 @@ class SequenceBoundsStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3413,17 +3434,18 @@ class SequenceBoundsStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<int32_t> m_my_sequence;
@@ -3524,11 +3546,11 @@ class SequenceSequenceStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3562,17 +3584,18 @@ class SequenceSequenceStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<std::vector<int32_t>> m_my_sequence_sequence;
@@ -3673,11 +3696,11 @@ class SequenceSequenceBoundsStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3711,17 +3734,18 @@ class SequenceSequenceBoundsStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::vector<std::vector<int32_t>> m_my_sequence_sequence;
@@ -3820,11 +3844,11 @@ class MapStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -3858,17 +3882,18 @@ class MapStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, int32_t> m_my_map;
@@ -3967,11 +3992,11 @@ class MapStructEqual
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4005,17 +4030,18 @@ class MapStructEqual
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, int32_t> m_my_map_equal;
@@ -4114,11 +4140,11 @@ class MapBadKeyStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4152,17 +4178,18 @@ class MapBadKeyStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<uint8_t, int32_t> m_my_map;
@@ -4261,11 +4288,11 @@ class MapBadElemStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4299,17 +4326,18 @@ class MapBadElemStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, int64_t> m_my_map;
@@ -4408,11 +4436,11 @@ class MapBoundsStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4446,17 +4474,18 @@ class MapBoundsStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, int32_t> m_my_map;
@@ -4557,11 +4586,11 @@ class MapMapStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4595,17 +4624,18 @@ class MapMapStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, std::map<int32_t, int32_t>> m_my_map_map;
@@ -4706,11 +4736,11 @@ class MapMapBoundsStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -4744,17 +4774,18 @@ class MapMapBoundsStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     std::map<int32_t, std::map<int32_t, int32_t>> m_my_map_map;
@@ -4913,6 +4944,10 @@ class SimpleUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     int32_t m__d;
@@ -5073,6 +5108,10 @@ class SimpleUnionNames
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     int32_t m__d;
@@ -5233,6 +5272,10 @@ class SimpleTypeUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     int32_t m__d;
@@ -5393,6 +5436,10 @@ class SimpleBadUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     int32_t m__d;
@@ -5553,6 +5600,10 @@ class SimpleBadDiscUnion
     eProsima_user_DllExport void deserialize(
             eprosima::fastcdr::Cdr& cdr);
 
+
+
+
+
 private:
 
     uint8_t m__d;
@@ -5651,11 +5702,11 @@ class SimpleUnionStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -5689,17 +5740,18 @@ class SimpleUnionStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleUnion m_my_union;
@@ -5796,11 +5848,11 @@ class SimpleUnionStructEqual
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -5834,17 +5886,18 @@ class SimpleUnionStructEqual
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleUnion m_my_union_equal;
@@ -5941,11 +5994,11 @@ class SimpleUnionNamesStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -5979,17 +6032,18 @@ class SimpleUnionNamesStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleUnionNames m_my_union;
@@ -6086,11 +6140,11 @@ class SimpleTypeUnionStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -6124,17 +6178,18 @@ class SimpleTypeUnionStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleTypeUnion m_my_union;
@@ -6231,11 +6286,11 @@ class SimpleBadUnionStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -6269,17 +6324,18 @@ class SimpleBadUnionStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleBadUnion m_my_union;
@@ -6376,11 +6432,11 @@ class SimplBadDiscUnionStruct
 
 
     /*!
-     * @brief This function returns the maximum serialized size of an object
-     * depending on the buffer alignment.
-     * @param current_alignment Buffer alignment.
-     * @return Maximum serialized size.
-     */
+    * @brief This function returns the maximum serialized size of an object
+    * depending on the buffer alignment.
+    * @param current_alignment Buffer alignment.
+    * @return Maximum serialized size.
+    */
     eProsima_user_DllExport static size_t getMaxCdrSerializedSize(
             size_t current_alignment = 0);
 
@@ -6414,17 +6470,18 @@ class SimplBadDiscUnionStruct
 
 
     /*!
-     * @brief This function tells you if the Key has been defined for this type
-     */
+    * @brief This function tells you if the Key has been defined for this type
+    */
     eProsima_user_DllExport static bool isKeyDefined();
 
     /*!
-     * @brief This function serializes the key members of an object using CDR serialization.
-     * @param cdr CDR serialization object.
-     */
+    * @brief This function serializes the key members of an object using CDR serialization.
+    * @param cdr CDR serialization object.
+    */
     eProsima_user_DllExport void serializeKey(
             eprosima::fastcdr::Cdr& cdr) const;
 
+
 private:
 
     SimpleBadDiscUnion m_my_union;
diff --git a/tools/fds/server.cpp b/tools/fds/server.cpp
index dab314d8861..a877f0e3b03 100644
--- a/tools/fds/server.cpp
+++ b/tools/fds/server.cpp
@@ -33,7 +33,7 @@
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastrtps/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.h>
 
 volatile sig_atomic_t g_signal_status = 0;
 std::mutex g_signal_mutex;