diff --git a/examples/cpp/configuration/Configuration.hpp b/examples/cpp/configuration/Configuration.hpp
index 14df6770491..058da2a71a9 100644
--- a/examples/cpp/configuration/Configuration.hpp
+++ b/examples/cpp/configuration/Configuration.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CONFIGURATION_HPP_
-#define _FAST_DDS_GENERATED_CONFIGURATION_HPP_
+#ifndef FAST_DDS_GENERATED__CONFIGURATION_HPP
+#define FAST_DDS_GENERATED__CONFIGURATION_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/examples/cpp/configuration/ConfigurationCdrAux.hpp b/examples/cpp/configuration/ConfigurationCdrAux.hpp
index c496adce2fe..74faadd58eb 100644
--- a/examples/cpp/configuration/ConfigurationCdrAux.hpp
+++ b/examples/cpp/configuration/ConfigurationCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CONFIGURATIONCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_CONFIGURATIONCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__CONFIGURATIONCDRAUX_HPP
+#define FAST_DDS_GENERATED__CONFIGURATIONCDRAUX_HPP
 
 #include "Configuration.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_CONFIGURATIONCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__CONFIGURATIONCDRAUX_HPP
 
diff --git a/examples/cpp/configuration/ConfigurationCdrAux.ipp b/examples/cpp/configuration/ConfigurationCdrAux.ipp
index 15e6a23f897..b52fc41c105 100644
--- a/examples/cpp/configuration/ConfigurationCdrAux.ipp
+++ b/examples/cpp/configuration/ConfigurationCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CONFIGURATIONCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_CONFIGURATIONCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__CONFIGURATIONCDRAUX_IPP
+#define FAST_DDS_GENERATED__CONFIGURATIONCDRAUX_IPP
 
 #include "ConfigurationCdrAux.hpp"
 
@@ -130,5 +130,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_CONFIGURATIONCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__CONFIGURATIONCDRAUX_IPP
 
diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.cxx b/examples/cpp/configuration/ConfigurationPubSubTypes.cxx
index fbdbb9bf3ba..2c0854fb8bd 100644
--- a/examples/cpp/configuration/ConfigurationPubSubTypes.cxx
+++ b/examples/cpp/configuration/ConfigurationPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "ConfigurationPubSubTypes.h"
+#include "ConfigurationPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/configuration/ConfigurationPubSubTypes.h b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp
similarity index 89%
rename from examples/cpp/configuration/ConfigurationPubSubTypes.h
rename to examples/cpp/configuration/ConfigurationPubSubTypes.hpp
index a2a5c95ace2..f5e4f1ca1f0 100644
--- a/examples/cpp/configuration/ConfigurationPubSubTypes.h
+++ b/examples/cpp/configuration/ConfigurationPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file ConfigurationPubSubTypes.h
+ * @file ConfigurationPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_CONFIGURATION_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_CONFIGURATION_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__CONFIGURATION_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__CONFIGURATION_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "Configuration.hpp"
 
@@ -106,7 +106,7 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class ConfigurationPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_CONFIGURATION_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__CONFIGURATION_PUBSUBTYPES_HPP
 
diff --git a/examples/cpp/configuration/ConfigurationTypeObjectSupport.hpp b/examples/cpp/configuration/ConfigurationTypeObjectSupport.hpp
index c59a741720f..c6c00a5014c 100644
--- a/examples/cpp/configuration/ConfigurationTypeObjectSupport.hpp
+++ b/examples/cpp/configuration/ConfigurationTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CONFIGURATION_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_CONFIGURATION_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__CONFIGURATION_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__CONFIGURATION_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_Configuration_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_CONFIGURATION_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__CONFIGURATION_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/configuration/PublisherApp.cpp b/examples/cpp/configuration/PublisherApp.cpp
index a2957ddfeb6..12aa3bd9053 100644
--- a/examples/cpp/configuration/PublisherApp.cpp
+++ b/examples/cpp/configuration/PublisherApp.cpp
@@ -31,9 +31,9 @@
 #include <fastdds/dds/publisher/Publisher.hpp>
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/publisher/qos/PublisherQos.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/configuration/PublisherApp.hpp b/examples/cpp/configuration/PublisherApp.hpp
index e8f051d0da6..f7ab086e59f 100644
--- a/examples/cpp/configuration/PublisherApp.hpp
+++ b/examples/cpp/configuration/PublisherApp.hpp
@@ -29,7 +29,7 @@
 
 #include "Application.hpp"
 #include "CLIParser.hpp"
-#include "ConfigurationPubSubTypes.h"
+#include "ConfigurationPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
 
diff --git a/examples/cpp/configuration/SubscriberApp.cpp b/examples/cpp/configuration/SubscriberApp.cpp
index 44a8f7b9b51..efadff36b30 100644
--- a/examples/cpp/configuration/SubscriberApp.cpp
+++ b/examples/cpp/configuration/SubscriberApp.cpp
@@ -29,13 +29,13 @@
 #include <fastdds/dds/subscriber/qos/SubscriberQos.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
 
 #include "Application.hpp"
 #include "CLIParser.hpp"
-#include "ConfigurationPubSubTypes.h"
+#include "ConfigurationPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/configuration/SubscriberApp.hpp b/examples/cpp/configuration/SubscriberApp.hpp
index e61614399c8..e2bbfd049ca 100644
--- a/examples/cpp/configuration/SubscriberApp.hpp
+++ b/examples/cpp/configuration/SubscriberApp.hpp
@@ -32,7 +32,7 @@
 
 #include "Application.hpp"
 #include "CLIParser.hpp"
-#include "ConfigurationPubSubTypes.h"
+#include "ConfigurationPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
 
diff --git a/examples/cpp/content_filter/HelloWorld.hpp b/examples/cpp/content_filter/HelloWorld.hpp
index 971fea8d920..46d0d7b5814 100644
--- a/examples/cpp/content_filter/HelloWorld.hpp
+++ b/examples/cpp/content_filter/HelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/examples/cpp/content_filter/HelloWorldCdrAux.hpp b/examples/cpp/content_filter/HelloWorldCdrAux.hpp
index 6feb8a9da15..1164cd5cce1 100644
--- a/examples/cpp/content_filter/HelloWorldCdrAux.hpp
+++ b/examples/cpp/content_filter/HelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
 #include "HelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
diff --git a/examples/cpp/content_filter/HelloWorldCdrAux.ipp b/examples/cpp/content_filter/HelloWorldCdrAux.ipp
index 97df3fe9d9e..19316df7d3c 100644
--- a/examples/cpp/content_filter/HelloWorldCdrAux.ipp
+++ b/examples/cpp/content_filter/HelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
 #include "HelloWorldCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx b/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx
index 41da39407fa..38393dbf8c9 100644
--- a/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx
+++ b/examples/cpp/content_filter/HelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.h b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp
similarity index 89%
rename from examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.h
rename to examples/cpp/content_filter/HelloWorldPubSubTypes.hpp
index 3db9ca96458..556d4c05ecf 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.h
+++ b/examples/cpp/content_filter/HelloWorldPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file HelloWorldPubSubTypes.h
+ * @file HelloWorldPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "HelloWorld.hpp"
 
@@ -106,7 +106,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
diff --git a/examples/cpp/content_filter/HelloWorldTypeObjectSupport.hpp b/examples/cpp/content_filter/HelloWorldTypeObjectSupport.hpp
index 2eba797b07f..ec922163d11 100644
--- a/examples/cpp/content_filter/HelloWorldTypeObjectSupport.hpp
+++ b/examples/cpp/content_filter/HelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_HelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/content_filter/PublisherApp.cpp b/examples/cpp/content_filter/PublisherApp.cpp
index 6ec5608ca0e..f0f563c669b 100644
--- a/examples/cpp/content_filter/PublisherApp.cpp
+++ b/examples/cpp/content_filter/PublisherApp.cpp
@@ -28,8 +28,8 @@
 #include <fastdds/dds/publisher/Publisher.hpp>
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/publisher/qos/PublisherQos.hpp>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
 #include "HelloWorldTypeObjectSupport.hpp"
 
diff --git a/examples/cpp/content_filter/PublisherApp.hpp b/examples/cpp/content_filter/PublisherApp.hpp
index 94188951228..614c978f26e 100644
--- a/examples/cpp/content_filter/PublisherApp.hpp
+++ b/examples/cpp/content_filter/PublisherApp.hpp
@@ -28,7 +28,7 @@
 
 #include "Application.hpp"
 #include "CLIParser.hpp"
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
 
diff --git a/examples/cpp/content_filter/SubscriberApp.cpp b/examples/cpp/content_filter/SubscriberApp.cpp
index 48f769659e5..d61b43c3e63 100644
--- a/examples/cpp/content_filter/SubscriberApp.cpp
+++ b/examples/cpp/content_filter/SubscriberApp.cpp
@@ -28,8 +28,8 @@
 #include <fastdds/dds/subscriber/DataReader.hpp>
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
 #include "HelloWorldTypeObjectSupport.hpp"
 
diff --git a/examples/cpp/content_filter/SubscriberApp.hpp b/examples/cpp/content_filter/SubscriberApp.hpp
index b90d5fc26fa..b2a240700f6 100644
--- a/examples/cpp/content_filter/SubscriberApp.hpp
+++ b/examples/cpp/content_filter/SubscriberApp.hpp
@@ -35,7 +35,7 @@
 
 #include "Application.hpp"
 #include "CLIParser.hpp"
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 #include "CustomContentFilterFactory.hpp"
 
 using namespace eprosima::fastdds::dds;
diff --git a/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp b/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp
index d54c1bc03b1..221c0eb4b00 100644
--- a/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp
+++ b/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp
@@ -23,8 +23,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <fastdds/rtps/history/IPayloadPool.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 
 class CustomPayloadPool : public eprosima::fastdds::rtps::IPayloadPool
 {
diff --git a/examples/cpp/custom_payload_pool/HelloWorld.hpp b/examples/cpp/custom_payload_pool/HelloWorld.hpp
index 971fea8d920..46d0d7b5814 100644
--- a/examples/cpp/custom_payload_pool/HelloWorld.hpp
+++ b/examples/cpp/custom_payload_pool/HelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/examples/cpp/custom_payload_pool/HelloWorldCdrAux.hpp b/examples/cpp/custom_payload_pool/HelloWorldCdrAux.hpp
index 6feb8a9da15..1164cd5cce1 100644
--- a/examples/cpp/custom_payload_pool/HelloWorldCdrAux.hpp
+++ b/examples/cpp/custom_payload_pool/HelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
 #include "HelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
diff --git a/examples/cpp/custom_payload_pool/HelloWorldCdrAux.ipp b/examples/cpp/custom_payload_pool/HelloWorldCdrAux.ipp
index 97df3fe9d9e..19316df7d3c 100644
--- a/examples/cpp/custom_payload_pool/HelloWorldCdrAux.ipp
+++ b/examples/cpp/custom_payload_pool/HelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
 #include "HelloWorldCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx
index 41da39407fa..38393dbf8c9 100644
--- a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx
+++ b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/content_filter/HelloWorldPubSubTypes.h b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp
similarity index 89%
rename from examples/cpp/content_filter/HelloWorldPubSubTypes.h
rename to examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp
index 3db9ca96458..556d4c05ecf 100644
--- a/examples/cpp/content_filter/HelloWorldPubSubTypes.h
+++ b/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file HelloWorldPubSubTypes.h
+ * @file HelloWorldPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "HelloWorld.hpp"
 
@@ -106,7 +106,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
diff --git a/examples/cpp/custom_payload_pool/HelloWorldTypeObjectSupport.hpp b/examples/cpp/custom_payload_pool/HelloWorldTypeObjectSupport.hpp
index 2eba797b07f..ec922163d11 100644
--- a/examples/cpp/custom_payload_pool/HelloWorldTypeObjectSupport.hpp
+++ b/examples/cpp/custom_payload_pool/HelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_HelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/custom_payload_pool/PublisherApp.hpp b/examples/cpp/custom_payload_pool/PublisherApp.hpp
index f65898d3485..8c57893c643 100644
--- a/examples/cpp/custom_payload_pool/PublisherApp.hpp
+++ b/examples/cpp/custom_payload_pool/PublisherApp.hpp
@@ -30,7 +30,7 @@
 #include "Application.hpp"
 #include "CLIParser.hpp"
 #include "CustomPayloadPool.hpp"
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
 
diff --git a/examples/cpp/custom_payload_pool/SubscriberApp.hpp b/examples/cpp/custom_payload_pool/SubscriberApp.hpp
index 345c4c05821..f83483b9089 100644
--- a/examples/cpp/custom_payload_pool/SubscriberApp.hpp
+++ b/examples/cpp/custom_payload_pool/SubscriberApp.hpp
@@ -31,7 +31,7 @@
 #include "Application.hpp"
 #include "CLIParser.hpp"
 #include "CustomPayloadPool.hpp"
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
 namespace eprosima {
diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp
index 0e9914beb91..2a83c809b50 100644
--- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp
+++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.cpp
@@ -27,12 +27,12 @@
 #include <fastdds/dds/publisher/Publisher.hpp>
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/publisher/qos/PublisherQos.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.h b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.h
index 1a8699cc029..a3e9b5e01d8 100644
--- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.h
+++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerPublisher.h
@@ -26,7 +26,7 @@
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
 
-#include "types/HelloWorldPubSubTypes.h"
+#include "types/HelloWorldPubSubTypes.hpp"
 #include "common.h"
 
 /**
diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.cpp b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.cpp
index 52dbdab1e66..60a915899fb 100644
--- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.cpp
+++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerServer.cpp
@@ -25,11 +25,11 @@
 #include <thread>
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
 
 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 386a6e1c3c8..ed0dea34efe 100644
--- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.cpp
+++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.cpp
@@ -28,12 +28,12 @@
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.h b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.h
index 3869f94eb52..2b2c83ceb12 100644
--- a/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.h
+++ b/examples/cpp/dds/DiscoveryServerExample/DiscoveryServerSubscriber.h
@@ -28,7 +28,7 @@
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 
-#include "types/HelloWorldPubSubTypes.h"
+#include "types/HelloWorldPubSubTypes.hpp"
 #include "common.h"
 
 /**
diff --git a/examples/cpp/dds/DiscoveryServerExample/arg_configuration.h b/examples/cpp/dds/DiscoveryServerExample/arg_configuration.h
index 04456a187a0..ad01e206847 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 <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include "common.h"
 
diff --git a/examples/cpp/dds/DiscoveryServerExample/common.h b/examples/cpp/dds/DiscoveryServerExample/common.h
index c48cf35978f..c62356266f0 100644
--- a/examples/cpp/dds/DiscoveryServerExample/common.h
+++ b/examples/cpp/dds/DiscoveryServerExample/common.h
@@ -20,8 +20,8 @@
 #ifndef _EPROSIMA_FASTDDS_EXAMPLES_CPP_DDS_DISCOVERYSERVEREXAMPLE_COMMON_H_
 #define _EPROSIMA_FASTDDS_EXAMPLES_CPP_DDS_DISCOVERYSERVEREXAMPLE_COMMON_H_
 
-#include <fastdds/rtps/attributes/ServerAttributes.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/attributes/ServerAttributes.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 enum class TransportKind
 {
diff --git a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorld.hpp b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorld.hpp
index 971fea8d920..46d0d7b5814 100644
--- a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorld.hpp
+++ b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldCdrAux.hpp b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldCdrAux.hpp
index 6feb8a9da15..1164cd5cce1 100644
--- a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldCdrAux.hpp
+++ b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
 #include "HelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
diff --git a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldCdrAux.ipp b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldCdrAux.ipp
index 97df3fe9d9e..19316df7d3c 100644
--- a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldCdrAux.ipp
+++ b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
 #include "HelloWorldCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
diff --git a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx
index 41da39407fa..38393dbf8c9 100644
--- a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx
+++ b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.h b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.hpp
similarity index 89%
rename from examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.h
rename to examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.hpp
index 3db9ca96458..556d4c05ecf 100644
--- a/examples/cpp/custom_payload_pool/HelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file HelloWorldPubSubTypes.h
+ * @file HelloWorldPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "HelloWorld.hpp"
 
@@ -106,7 +106,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
diff --git a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldTypeObjectSupport.hpp b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldTypeObjectSupport.hpp
index 2eba797b07f..ec922163d11 100644
--- a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldTypeObjectSupport.hpp
+++ b/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_HelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExample.hpp b/examples/cpp/dds/FlowControlExample/FlowControlExample.hpp
index 68bcb6de578..cb0f0da9bb3 100644
--- a/examples/cpp/dds/FlowControlExample/FlowControlExample.hpp
+++ b/examples/cpp/dds/FlowControlExample/FlowControlExample.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLE_HPP_
-#define _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLE_HPP_
+#ifndef FAST_DDS_GENERATED__FLOWCONTROLEXAMPLE_HPP
+#define FAST_DDS_GENERATED__FLOWCONTROLEXAMPLE_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExampleCdrAux.hpp b/examples/cpp/dds/FlowControlExample/FlowControlExampleCdrAux.hpp
index 279a35713c0..f68a328b359 100644
--- a/examples/cpp/dds/FlowControlExample/FlowControlExampleCdrAux.hpp
+++ b/examples/cpp/dds/FlowControlExample/FlowControlExampleCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLECDRAUX_HPP_
-#define _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLECDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__FLOWCONTROLEXAMPLECDRAUX_HPP
+#define FAST_DDS_GENERATED__FLOWCONTROLEXAMPLECDRAUX_HPP
 
 #include "FlowControlExample.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLECDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__FLOWCONTROLEXAMPLECDRAUX_HPP
 
diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExampleCdrAux.ipp b/examples/cpp/dds/FlowControlExample/FlowControlExampleCdrAux.ipp
index f2f080c5235..aed583c6162 100644
--- a/examples/cpp/dds/FlowControlExample/FlowControlExampleCdrAux.ipp
+++ b/examples/cpp/dds/FlowControlExample/FlowControlExampleCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLECDRAUX_IPP_
-#define _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLECDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__FLOWCONTROLEXAMPLECDRAUX_IPP
+#define FAST_DDS_GENERATED__FLOWCONTROLEXAMPLECDRAUX_IPP
 
 #include "FlowControlExampleCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLECDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__FLOWCONTROLEXAMPLECDRAUX_IPP
 
diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx
index 00f6809c721..91ce6f29ef7 100644
--- a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx
+++ b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "FlowControlExamplePubSubTypes.h"
+#include "FlowControlExamplePubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.h b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.hpp
similarity index 88%
rename from examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.h
rename to examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.hpp
index 32890ff2480..e62c1e29594 100644
--- a/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.h
+++ b/examples/cpp/dds/FlowControlExample/FlowControlExamplePubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file FlowControlExamplePubSubTypes.h
+ * @file FlowControlExamplePubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLE_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLE_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__FLOWCONTROLEXAMPLE_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__FLOWCONTROLEXAMPLE_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "FlowControlExample.hpp"
 
@@ -106,7 +106,7 @@ class FlowControlExamplePubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class FlowControlExamplePubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLE_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__FLOWCONTROLEXAMPLE_PUBSUBTYPES_HPP
 
diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExamplePublisher.h b/examples/cpp/dds/FlowControlExample/FlowControlExamplePublisher.h
index 5eee8d2bff0..a68a21c5039 100644
--- a/examples/cpp/dds/FlowControlExample/FlowControlExamplePublisher.h
+++ b/examples/cpp/dds/FlowControlExample/FlowControlExamplePublisher.h
@@ -29,7 +29,7 @@
 #include <fastdds/dds/publisher/DataWriterListener.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 
-#include "FlowControlExamplePubSubTypes.h"
+#include "FlowControlExamplePubSubTypes.hpp"
 
 
 
diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExampleSubscriber.h b/examples/cpp/dds/FlowControlExample/FlowControlExampleSubscriber.h
index 67ed11eed00..9391848206e 100644
--- a/examples/cpp/dds/FlowControlExample/FlowControlExampleSubscriber.h
+++ b/examples/cpp/dds/FlowControlExample/FlowControlExampleSubscriber.h
@@ -29,7 +29,7 @@
 #include <fastdds/dds/subscriber/DataReaderListener.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 
-#include "FlowControlExamplePubSubTypes.h"
+#include "FlowControlExamplePubSubTypes.hpp"
 
 class FlowControlExampleSubscriber
 {
diff --git a/examples/cpp/dds/FlowControlExample/FlowControlExampleTypeObjectSupport.hpp b/examples/cpp/dds/FlowControlExample/FlowControlExampleTypeObjectSupport.hpp
index 84da183f2d4..d0f01990ad0 100644
--- a/examples/cpp/dds/FlowControlExample/FlowControlExampleTypeObjectSupport.hpp
+++ b/examples/cpp/dds/FlowControlExample/FlowControlExampleTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLE_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLE_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__FLOWCONTROLEXAMPLE_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__FLOWCONTROLEXAMPLE_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_FlowControlExample_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_FLOWCONTROLEXAMPLE_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__FLOWCONTROLEXAMPLE_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorld.hpp b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorld.hpp
index 22c4f7b2cda..a0a4b92f85d 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorld.hpp
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.hpp b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.hpp
index 5d8548e14b8..c621a2ccad8 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.hpp
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
 #include "HelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.ipp b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.ipp
index 97df3fe9d9e..19316df7d3c 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.ipp
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
 #include "HelloWorldCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx
index 41da39407fa..38393dbf8c9 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.h b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp
similarity index 89%
rename from examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.h
rename to examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp
index b161b42f744..75830b9c78b 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file HelloWorldPubSubTypes.h
+ * @file HelloWorldPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "HelloWorld.hpp"
 
@@ -106,7 +106,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPublisher.h b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPublisher.h
index 8b631859de4..0d2fb051fa0 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPublisher.h
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPublisher.h
@@ -20,7 +20,7 @@
 #ifndef HELLOWORLDPUBLISHER_H_
 #define HELLOWORLDPUBLISHER_H_
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/publisher/DataWriterListener.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldSubscriber.h b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldSubscriber.h
index 4d700a8cab2..719c08a6be6 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldSubscriber.h
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldSubscriber.h
@@ -25,7 +25,7 @@
 #include <fastdds/dds/subscriber/DataReaderListener.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 class HelloWorldSubscriber
 {
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldTypeObjectSupport.hpp b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldTypeObjectSupport.hpp
index 2eba797b07f..ec922163d11 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldTypeObjectSupport.hpp
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_HelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.hpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.hpp
index 7fbb251328b..c1f33bd5c81 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.hpp
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldCdrAux.hpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldCdrAux.hpp
index 2755baecef9..7226728ad87 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldCdrAux.hpp
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
 #include "HelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldCdrAux.ipp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldCdrAux.ipp
index bcdc3a4d321..0380e6dc836 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldCdrAux.ipp
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
 #include "HelloWorldCdrAux.hpp"
 
@@ -130,5 +130,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx
index 41da39407fa..38393dbf8c9 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.h b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp
similarity index 89%
rename from examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.h
rename to examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp
index 3db9ca96458..556d4c05ecf 100644
--- a/examples/cpp/dds/DiscoveryServerExample/types/HelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file HelloWorldPubSubTypes.h
+ * @file HelloWorldPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "HelloWorld.hpp"
 
@@ -106,7 +106,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp
index 9640b2fb4f1..66dfd19b4c1 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp
@@ -20,8 +20,8 @@
 #include "HelloWorldPublisher.h"
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
 #include <thread>
 
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.h b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.h
index ef37aa5f383..71a55ef8837 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.h
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.h
@@ -20,7 +20,7 @@
 #ifndef HELLOWORLDPUBLISHER_H_
 #define HELLOWORLDPUBLISHER_H_
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/publisher/Publisher.hpp>
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp
index 9cb3cd81b58..ba580eb12da 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp
@@ -24,8 +24,8 @@
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.h b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.h
index 706ca6ada3d..4dfeadd6a5e 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.h
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.h
@@ -20,7 +20,7 @@
 #ifndef HELLOWORLDSUBSCRIBER_H_
 #define HELLOWORLDSUBSCRIBER_H_
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldTypeObjectSupport.hpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldTypeObjectSupport.hpp
index 2eba797b07f..ec922163d11 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldTypeObjectSupport.hpp
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_HelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorld.hpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorld.hpp
index 971fea8d920..46d0d7b5814 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorld.hpp
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldCdrAux.hpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldCdrAux.hpp
index 6feb8a9da15..1164cd5cce1 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldCdrAux.hpp
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
 #include "HelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldCdrAux.ipp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldCdrAux.ipp
index 97df3fe9d9e..19316df7d3c 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldCdrAux.ipp
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
 #include "HelloWorldCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx
index 41da39407fa..38393dbf8c9 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.h b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.h
deleted file mode 100644
index 3db9ca96458..00000000000
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima).
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/*!
- * @file HelloWorldPubSubTypes.h
- * This header file contains the declaration of the serialization functions.
- *
- * This file was generated by the tool fastddsgen.
- */
-
-
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-
-#include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
-
-#include "HelloWorld.hpp"
-
-
-#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
-#error \
-    Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
-#endif  // GEN_API_VER
-
-
-/*!
- * @brief This class represents the TopicDataType of the type HelloWorld defined by the user in the IDL file.
- * @ingroup HelloWorld
- */
-class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
-{
-public:
-
-    typedef HelloWorld type;
-
-    eProsima_user_DllExport HelloWorldPubSubType();
-
-    eProsima_user_DllExport ~HelloWorldPubSubType() override;
-
-    eProsima_user_DllExport bool serialize(
-            const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
-    {
-        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport bool serialize(
-            const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
-
-    eProsima_user_DllExport bool deserialize(
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
-            void* data) override;
-
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-            const void* const data) override
-    {
-        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-            const void* const data,
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
-
-    eProsima_user_DllExport bool getKey(
-            const void* const data,
-            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
-            bool force_md5 = false) override;
-
-    eProsima_user_DllExport void* createData() override;
-
-    eProsima_user_DllExport void deleteData(
-            void* data) override;
-
-    //Register TypeObject representation in Fast DDS TypeObjectRegistry
-    eProsima_user_DllExport void register_type_object_representation() override;
-
-#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-    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;
-    }
-
-#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;
-    }
-
-#endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-
-    MD5 m_md5;
-    unsigned char* m_keyBuffer;
-
-};
-
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp
new file mode 100644
index 00000000000..556d4c05ecf
--- /dev/null
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPubSubTypes.hpp
@@ -0,0 +1,133 @@
+// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*!
+ * @file HelloWorldPubSubTypes.hpp
+ * This header file contains the declaration of the serialization functions.
+ *
+ * This file was generated by the tool fastddsgen.
+ */
+
+
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+
+#include <fastdds/dds/core/policy/QosPolicies.hpp>
+#include <fastdds/dds/topic/TopicDataType.hpp>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
+
+#include "HelloWorld.hpp"
+
+
+#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
+#error \
+    Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
+#endif  // GEN_API_VER
+
+
+/*!
+ * @brief This class represents the TopicDataType of the type HelloWorld defined by the user in the IDL file.
+ * @ingroup HelloWorld
+ */
+class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
+
+    typedef HelloWorld type;
+
+    eProsima_user_DllExport HelloWorldPubSubType();
+
+    eProsima_user_DllExport ~HelloWorldPubSubType() override;
+
+    eProsima_user_DllExport bool serialize(
+            const void* const data,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
+
+    eProsima_user_DllExport bool serialize(
+            const void* const data,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            void* data) override;
+
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            const void* const data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
+
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            const void* const data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+
+    eProsima_user_DllExport bool getKey(
+            const void* const data,
+            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
+
+    eProsima_user_DllExport void* createData() override;
+
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
+
+    //Register TypeObject representation in Fast DDS TypeObjectRegistry
+    eProsima_user_DllExport void register_type_object_representation() override;
+
+#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
+    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;
+    }
+
+#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;
+    }
+
+#endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
+
+    eprosima::fastdds::MD5 m_md5;
+    unsigned char* m_keyBuffer;
+
+};
+
+#endif // FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp
index b0e75cfb5c8..5b1703b9336 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp
@@ -19,8 +19,8 @@
 
 #include "HelloWorldPublisher.h"
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <thread>
 
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.h b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.h
index 63a228fe286..d719ad13b97 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.h
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.h
@@ -20,7 +20,7 @@
 #ifndef HELLOWORLDPUBLISHER_H_
 #define HELLOWORLDPUBLISHER_H_
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/publisher/Publisher.hpp>
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp
index 9462b1b567c..90fbac5eab6 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp
@@ -24,8 +24,8 @@
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.h b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.h
index 15133e2ba63..1d488371131 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.h
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.h
@@ -20,7 +20,7 @@
 #ifndef HELLOWORLDSUBSCRIBER_H_
 #define HELLOWORLDSUBSCRIBER_H_
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldTypeObjectSupport.hpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldTypeObjectSupport.hpp
index 2eba797b07f..ec922163d11 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldTypeObjectSupport.hpp
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_HelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/dds/Keys/keys.cpp b/examples/cpp/dds/Keys/keys.cpp
index 079047eb7ce..59e22317fc6 100644
--- a/examples/cpp/dds/Keys/keys.cpp
+++ b/examples/cpp/dds/Keys/keys.cpp
@@ -16,7 +16,7 @@
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 
-#include "samplePubSubTypes.h"
+#include "samplePubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/dds/Keys/sample.hpp b/examples/cpp/dds/Keys/sample.hpp
index 3023a792269..fefd94ea7fc 100644
--- a/examples/cpp/dds/Keys/sample.hpp
+++ b/examples/cpp/dds/Keys/sample.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SAMPLE_HPP_
-#define _FAST_DDS_GENERATED_SAMPLE_HPP_
+#ifndef FAST_DDS_GENERATED__SAMPLE_HPP
+#define FAST_DDS_GENERATED__SAMPLE_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/examples/cpp/dds/Keys/sampleCdrAux.hpp b/examples/cpp/dds/Keys/sampleCdrAux.hpp
index b80dff31248..2cb29d9d58e 100644
--- a/examples/cpp/dds/Keys/sampleCdrAux.hpp
+++ b/examples/cpp/dds/Keys/sampleCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SAMPLECDRAUX_HPP_
-#define _FAST_DDS_GENERATED_SAMPLECDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__SAMPLECDRAUX_HPP
+#define FAST_DDS_GENERATED__SAMPLECDRAUX_HPP
 
 #include "sample.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_SAMPLECDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__SAMPLECDRAUX_HPP
 
diff --git a/examples/cpp/dds/Keys/sampleCdrAux.ipp b/examples/cpp/dds/Keys/sampleCdrAux.ipp
index 17a3d1025fc..52d47144d52 100644
--- a/examples/cpp/dds/Keys/sampleCdrAux.ipp
+++ b/examples/cpp/dds/Keys/sampleCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SAMPLECDRAUX_IPP_
-#define _FAST_DDS_GENERATED_SAMPLECDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__SAMPLECDRAUX_IPP
+#define FAST_DDS_GENERATED__SAMPLECDRAUX_IPP
 
 #include "sampleCdrAux.hpp"
 
@@ -124,5 +124,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_SAMPLECDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__SAMPLECDRAUX_IPP
 
diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.cxx b/examples/cpp/dds/Keys/samplePubSubTypes.cxx
index c8999620efb..7bde4db2c54 100644
--- a/examples/cpp/dds/Keys/samplePubSubTypes.cxx
+++ b/examples/cpp/dds/Keys/samplePubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "samplePubSubTypes.h"
+#include "samplePubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/dds/Keys/samplePubSubTypes.h b/examples/cpp/dds/Keys/samplePubSubTypes.hpp
similarity index 89%
rename from examples/cpp/dds/Keys/samplePubSubTypes.h
rename to examples/cpp/dds/Keys/samplePubSubTypes.hpp
index edcdcd08f8f..9ef5e577788 100644
--- a/examples/cpp/dds/Keys/samplePubSubTypes.h
+++ b/examples/cpp/dds/Keys/samplePubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file samplePubSubTypes.h
+ * @file samplePubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_SAMPLE_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_SAMPLE_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__SAMPLE_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__SAMPLE_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "sample.hpp"
 
@@ -106,7 +106,7 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class samplePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_SAMPLE_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__SAMPLE_PUBSUBTYPES_HPP
 
diff --git a/examples/cpp/dds/Keys/sampleTypeObjectSupport.hpp b/examples/cpp/dds/Keys/sampleTypeObjectSupport.hpp
index 013609fa263..220b36f0e3f 100644
--- a/examples/cpp/dds/Keys/sampleTypeObjectSupport.hpp
+++ b/examples/cpp/dds/Keys/sampleTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SAMPLE_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_SAMPLE_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__SAMPLE_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__SAMPLE_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_sample_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_SAMPLE_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__SAMPLE_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/dds/RequestReplyExample/Calculator.hpp b/examples/cpp/dds/RequestReplyExample/Calculator.hpp
index 9c293fac281..96e6c550547 100644
--- a/examples/cpp/dds/RequestReplyExample/Calculator.hpp
+++ b/examples/cpp/dds/RequestReplyExample/Calculator.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CALCULATOR_HPP_
-#define _FAST_DDS_GENERATED_CALCULATOR_HPP_
+#ifndef FAST_DDS_GENERATED__CALCULATOR_HPP
+#define FAST_DDS_GENERATED__CALCULATOR_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorCdrAux.hpp b/examples/cpp/dds/RequestReplyExample/CalculatorCdrAux.hpp
index 203f46ff5ec..a9afaef8f47 100644
--- a/examples/cpp/dds/RequestReplyExample/CalculatorCdrAux.hpp
+++ b/examples/cpp/dds/RequestReplyExample/CalculatorCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CALCULATORCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_CALCULATORCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__CALCULATORCDRAUX_HPP
+#define FAST_DDS_GENERATED__CALCULATORCDRAUX_HPP
 
 #include "Calculator.hpp"
 
@@ -49,5 +49,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_CALCULATORCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__CALCULATORCDRAUX_HPP
 
diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorCdrAux.ipp b/examples/cpp/dds/RequestReplyExample/CalculatorCdrAux.ipp
index 011ade654b9..d46633a3c92 100644
--- a/examples/cpp/dds/RequestReplyExample/CalculatorCdrAux.ipp
+++ b/examples/cpp/dds/RequestReplyExample/CalculatorCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CALCULATORCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_CALCULATORCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__CALCULATORCDRAUX_IPP
+#define FAST_DDS_GENERATED__CALCULATORCDRAUX_IPP
 
 #include "CalculatorCdrAux.hpp"
 
@@ -206,5 +206,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_CALCULATORCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__CALCULATORCDRAUX_IPP
 
diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorClient.cpp b/examples/cpp/dds/RequestReplyExample/CalculatorClient.cpp
index b920a3cdc44..0b784a5fc86 100644
--- a/examples/cpp/dds/RequestReplyExample/CalculatorClient.cpp
+++ b/examples/cpp/dds/RequestReplyExample/CalculatorClient.cpp
@@ -16,7 +16,7 @@
 #include <mutex>
 #include <vector>
 
-#include "CalculatorPubSubTypes.h"
+#include "CalculatorPubSubTypes.hpp"
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
@@ -25,7 +25,7 @@
 #include <fastdds/dds/subscriber/DataReader.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
-#include <fastdds/rtps/common/WriteParams.h>
+#include <fastdds/rtps/common/WriteParams.hpp>
 
 class CalculatorClient
 {
diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx
index 76e29c7d1eb..754dcb694bf 100644
--- a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx
+++ b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "CalculatorPubSubTypes.h"
+#include "CalculatorPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.hpp
similarity index 91%
rename from examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h
rename to examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.hpp
index 45dc6f8b1d2..99aaac7df59 100644
--- a/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.h
+++ b/examples/cpp/dds/RequestReplyExample/CalculatorPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file CalculatorPubSubTypes.h
+ * @file CalculatorPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_CALCULATOR_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_CALCULATOR_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__CALCULATOR_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__CALCULATOR_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "Calculator.hpp"
 
@@ -106,7 +106,7 @@ class RequestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,7 +124,7 @@ class RequestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -197,7 +197,7 @@ class ReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -215,10 +215,10 @@ class ReplyTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_CALCULATOR_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__CALCULATOR_PUBSUBTYPES_HPP
 
diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorServer.cpp b/examples/cpp/dds/RequestReplyExample/CalculatorServer.cpp
index 8d03e64595b..c8ba52d1359 100644
--- a/examples/cpp/dds/RequestReplyExample/CalculatorServer.cpp
+++ b/examples/cpp/dds/RequestReplyExample/CalculatorServer.cpp
@@ -16,7 +16,7 @@
 #include <mutex>
 #include <vector>
 
-#include "CalculatorPubSubTypes.h"
+#include "CalculatorPubSubTypes.hpp"
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
@@ -25,7 +25,7 @@
 #include <fastdds/dds/subscriber/DataReader.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
-#include <fastdds/rtps/common/WriteParams.h>
+#include <fastdds/rtps/common/WriteParams.hpp>
 
 class CalculatorServer
 {
diff --git a/examples/cpp/dds/RequestReplyExample/CalculatorTypeObjectSupport.hpp b/examples/cpp/dds/RequestReplyExample/CalculatorTypeObjectSupport.hpp
index 602d96dc580..d8bc006c6bf 100644
--- a/examples/cpp/dds/RequestReplyExample/CalculatorTypeObjectSupport.hpp
+++ b/examples/cpp/dds/RequestReplyExample/CalculatorTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CALCULATOR_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_CALCULATOR_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__CALCULATOR_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__CALCULATOR_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -77,4 +77,4 @@ eProsima_user_DllExport void register_ReplyType_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_CALCULATOR_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__CALCULATOR_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorld.hpp b/examples/cpp/dds/SecureHelloWorldExample/HelloWorld.hpp
index 971fea8d920..46d0d7b5814 100644
--- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorld.hpp
+++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldCdrAux.hpp b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldCdrAux.hpp
index 6feb8a9da15..1164cd5cce1 100644
--- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldCdrAux.hpp
+++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
 #include "HelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldCdrAux.ipp b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldCdrAux.ipp
index 97df3fe9d9e..19316df7d3c 100644
--- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldCdrAux.ipp
+++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
 #include "HelloWorldCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx
index 41da39407fa..38393dbf8c9 100644
--- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx
+++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.h b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.h
deleted file mode 100644
index 3db9ca96458..00000000000
--- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima).
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/*!
- * @file HelloWorldPubSubTypes.h
- * This header file contains the declaration of the serialization functions.
- *
- * This file was generated by the tool fastddsgen.
- */
-
-
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-
-#include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
-
-#include "HelloWorld.hpp"
-
-
-#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
-#error \
-    Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
-#endif  // GEN_API_VER
-
-
-/*!
- * @brief This class represents the TopicDataType of the type HelloWorld defined by the user in the IDL file.
- * @ingroup HelloWorld
- */
-class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
-{
-public:
-
-    typedef HelloWorld type;
-
-    eProsima_user_DllExport HelloWorldPubSubType();
-
-    eProsima_user_DllExport ~HelloWorldPubSubType() override;
-
-    eProsima_user_DllExport bool serialize(
-            const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
-    {
-        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport bool serialize(
-            const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
-
-    eProsima_user_DllExport bool deserialize(
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
-            void* data) override;
-
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-            const void* const data) override
-    {
-        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-            const void* const data,
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
-
-    eProsima_user_DllExport bool getKey(
-            const void* const data,
-            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
-            bool force_md5 = false) override;
-
-    eProsima_user_DllExport void* createData() override;
-
-    eProsima_user_DllExport void deleteData(
-            void* data) override;
-
-    //Register TypeObject representation in Fast DDS TypeObjectRegistry
-    eProsima_user_DllExport void register_type_object_representation() override;
-
-#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-    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;
-    }
-
-#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;
-    }
-
-#endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-
-    MD5 m_md5;
-    unsigned char* m_keyBuffer;
-
-};
-
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.hpp
new file mode 100644
index 00000000000..556d4c05ecf
--- /dev/null
+++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPubSubTypes.hpp
@@ -0,0 +1,133 @@
+// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*!
+ * @file HelloWorldPubSubTypes.hpp
+ * This header file contains the declaration of the serialization functions.
+ *
+ * This file was generated by the tool fastddsgen.
+ */
+
+
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+
+#include <fastdds/dds/core/policy/QosPolicies.hpp>
+#include <fastdds/dds/topic/TopicDataType.hpp>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
+
+#include "HelloWorld.hpp"
+
+
+#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
+#error \
+    Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
+#endif  // GEN_API_VER
+
+
+/*!
+ * @brief This class represents the TopicDataType of the type HelloWorld defined by the user in the IDL file.
+ * @ingroup HelloWorld
+ */
+class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
+
+    typedef HelloWorld type;
+
+    eProsima_user_DllExport HelloWorldPubSubType();
+
+    eProsima_user_DllExport ~HelloWorldPubSubType() override;
+
+    eProsima_user_DllExport bool serialize(
+            const void* const data,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
+
+    eProsima_user_DllExport bool serialize(
+            const void* const data,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            void* data) override;
+
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            const void* const data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
+
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            const void* const data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+
+    eProsima_user_DllExport bool getKey(
+            const void* const data,
+            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
+
+    eProsima_user_DllExport void* createData() override;
+
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
+
+    //Register TypeObject representation in Fast DDS TypeObjectRegistry
+    eProsima_user_DllExport void register_type_object_representation() override;
+
+#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
+    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;
+    }
+
+#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;
+    }
+
+#endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
+
+    eprosima::fastdds::MD5 m_md5;
+    unsigned char* m_keyBuffer;
+
+};
+
+#endif // FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPublisher.h b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPublisher.h
index 220e10338ce..e6a6319826a 100644
--- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPublisher.h
+++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPublisher.h
@@ -20,7 +20,7 @@
 #ifndef HELLOWORLDPUBLISHER_H_
 #define HELLOWORLDPUBLISHER_H_
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldSubscriber.h b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldSubscriber.h
index 0d5cb38bfae..e189e33fe0d 100644
--- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldSubscriber.h
+++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldSubscriber.h
@@ -20,7 +20,7 @@
 #ifndef HELLOWORLDSUBSCRIBER_H_
 #define HELLOWORLDSUBSCRIBER_H_
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldTypeObjectSupport.hpp b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldTypeObjectSupport.hpp
index 2eba797b07f..ec922163d11 100644
--- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldTypeObjectSupport.hpp
+++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_HelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorld.hpp b/examples/cpp/dds/StaticHelloWorldExample/HelloWorld.hpp
index 971fea8d920..46d0d7b5814 100644
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorld.hpp
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldCdrAux.hpp b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldCdrAux.hpp
index 6feb8a9da15..1164cd5cce1 100644
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldCdrAux.hpp
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
 #include "HelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldCdrAux.ipp b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldCdrAux.ipp
index 97df3fe9d9e..19316df7d3c 100644
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldCdrAux.ipp
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
 #include "HelloWorldCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx
index 41da39407fa..38393dbf8c9 100644
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.h b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.h
deleted file mode 100644
index 3db9ca96458..00000000000
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima).
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/*!
- * @file HelloWorldPubSubTypes.h
- * This header file contains the declaration of the serialization functions.
- *
- * This file was generated by the tool fastddsgen.
- */
-
-
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-
-#include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
-
-#include "HelloWorld.hpp"
-
-
-#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
-#error \
-    Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
-#endif  // GEN_API_VER
-
-
-/*!
- * @brief This class represents the TopicDataType of the type HelloWorld defined by the user in the IDL file.
- * @ingroup HelloWorld
- */
-class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
-{
-public:
-
-    typedef HelloWorld type;
-
-    eProsima_user_DllExport HelloWorldPubSubType();
-
-    eProsima_user_DllExport ~HelloWorldPubSubType() override;
-
-    eProsima_user_DllExport bool serialize(
-            const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
-    {
-        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport bool serialize(
-            const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
-
-    eProsima_user_DllExport bool deserialize(
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
-            void* data) override;
-
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-            const void* const data) override
-    {
-        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-            const void* const data,
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
-
-    eProsima_user_DllExport bool getKey(
-            const void* const data,
-            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
-            bool force_md5 = false) override;
-
-    eProsima_user_DllExport void* createData() override;
-
-    eProsima_user_DllExport void deleteData(
-            void* data) override;
-
-    //Register TypeObject representation in Fast DDS TypeObjectRegistry
-    eProsima_user_DllExport void register_type_object_representation() override;
-
-#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-    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;
-    }
-
-#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;
-    }
-
-#endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-
-    MD5 m_md5;
-    unsigned char* m_keyBuffer;
-
-};
-
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.hpp b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.hpp
new file mode 100644
index 00000000000..556d4c05ecf
--- /dev/null
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPubSubTypes.hpp
@@ -0,0 +1,133 @@
+// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*!
+ * @file HelloWorldPubSubTypes.hpp
+ * This header file contains the declaration of the serialization functions.
+ *
+ * This file was generated by the tool fastddsgen.
+ */
+
+
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+
+#include <fastdds/dds/core/policy/QosPolicies.hpp>
+#include <fastdds/dds/topic/TopicDataType.hpp>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
+
+#include "HelloWorld.hpp"
+
+
+#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
+#error \
+    Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
+#endif  // GEN_API_VER
+
+
+/*!
+ * @brief This class represents the TopicDataType of the type HelloWorld defined by the user in the IDL file.
+ * @ingroup HelloWorld
+ */
+class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
+
+    typedef HelloWorld type;
+
+    eProsima_user_DllExport HelloWorldPubSubType();
+
+    eProsima_user_DllExport ~HelloWorldPubSubType() override;
+
+    eProsima_user_DllExport bool serialize(
+            const void* const data,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
+
+    eProsima_user_DllExport bool serialize(
+            const void* const data,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            void* data) override;
+
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            const void* const data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
+
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            const void* const data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+
+    eProsima_user_DllExport bool getKey(
+            const void* const data,
+            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
+
+    eProsima_user_DllExport void* createData() override;
+
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
+
+    //Register TypeObject representation in Fast DDS TypeObjectRegistry
+    eProsima_user_DllExport void register_type_object_representation() override;
+
+#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
+    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;
+    }
+
+#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;
+    }
+
+#endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
+
+    eprosima::fastdds::MD5 m_md5;
+    unsigned char* m_keyBuffer;
+
+};
+
+#endif // FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPublisher.h b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPublisher.h
index ec1b5312bcc..90f3a114fd6 100644
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPublisher.h
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPublisher.h
@@ -20,7 +20,7 @@
 #ifndef HELLOWORLDPUBLISHER_H_
 #define HELLOWORLDPUBLISHER_H_
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/publisher/DataWriter.hpp>
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldSubscriber.h b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldSubscriber.h
index 5395d10e642..b3f2be7d2fd 100644
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldSubscriber.h
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldSubscriber.h
@@ -20,7 +20,7 @@
 #ifndef HELLOWORLDSUBSCRIBER_H_
 #define HELLOWORLDSUBSCRIBER_H_
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldTypeObjectSupport.hpp b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldTypeObjectSupport.hpp
index 2eba797b07f..ec922163d11 100644
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldTypeObjectSupport.hpp
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_HelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.hpp b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.hpp
index 1567811078c..55dc2956242 100644
--- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.hpp
+++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__LOANABLEHELLOWORLD_HPP
+#define FAST_DDS_GENERATED__LOANABLEHELLOWORLD_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldCdrAux.hpp b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldCdrAux.hpp
index 8fc200fee77..c90f3519a52 100644
--- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldCdrAux.hpp
+++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_LOANABLEHELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_LOANABLEHELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__LOANABLEHELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__LOANABLEHELLOWORLDCDRAUX_HPP
 
 #include "LoanableHelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_LOANABLEHELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__LOANABLEHELLOWORLDCDRAUX_HPP
 
diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldCdrAux.ipp b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldCdrAux.ipp
index 2c932b2b441..39a6233b81c 100644
--- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldCdrAux.ipp
+++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_LOANABLEHELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_LOANABLEHELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__LOANABLEHELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__LOANABLEHELLOWORLDCDRAUX_IPP
 
 #include "LoanableHelloWorldCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_LOANABLEHELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__LOANABLEHELLOWORLDCDRAUX_IPP
 
diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx
index fc2dfc4163b..d971e2e4f36 100644
--- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx
+++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "LoanableHelloWorldPubSubTypes.h"
+#include "LoanableHelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.h b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp
similarity index 89%
rename from examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.h
rename to examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp
index 56467a9a53f..3aed39a714c 100644
--- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file LoanableHelloWorldPubSubTypes.h
+ * @file LoanableHelloWorldPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__LOANABLEHELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__LOANABLEHELLOWORLD_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "LoanableHelloWorld.hpp"
 
@@ -139,9 +139,9 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -163,7 +163,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -184,5 +184,5 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 };
 
-#endif // _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__LOANABLEHELLOWORLD_PUBSUBTYPES_HPP
 
diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPublisher.cxx b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPublisher.cxx
index 9407dce4f3d..4db4a8e26ef 100644
--- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPublisher.cxx
+++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPublisher.cxx
@@ -21,7 +21,7 @@
 
 
 #include "LoanableHelloWorldPublisher.h"
-#include "LoanableHelloWorldPubSubTypes.h"
+#include "LoanableHelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/publisher/Publisher.hpp>
diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldSubscriber.cxx b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldSubscriber.cxx
index dfa87a321bb..fe023f38638 100644
--- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldSubscriber.cxx
+++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldSubscriber.cxx
@@ -26,7 +26,7 @@
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 
 #include "LoanableHelloWorldSubscriber.h"
-#include "LoanableHelloWorldPubSubTypes.h"
+#include "LoanableHelloWorldPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
 
diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldTypeObjectSupport.hpp b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldTypeObjectSupport.hpp
index 7cb9711a279..96dfc31898b 100644
--- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldTypeObjectSupport.hpp
+++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__LOANABLEHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__LOANABLEHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_LoanableHelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__LOANABLEHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.hpp b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.hpp
index 1567811078c..55dc2956242 100644
--- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.hpp
+++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__LOANABLEHELLOWORLD_HPP
+#define FAST_DDS_GENERATED__LOANABLEHELLOWORLD_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldCdrAux.hpp b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldCdrAux.hpp
index 8fc200fee77..c90f3519a52 100644
--- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldCdrAux.hpp
+++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_LOANABLEHELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_LOANABLEHELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__LOANABLEHELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__LOANABLEHELLOWORLDCDRAUX_HPP
 
 #include "LoanableHelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_LOANABLEHELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__LOANABLEHELLOWORLDCDRAUX_HPP
 
diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldCdrAux.ipp b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldCdrAux.ipp
index 2c932b2b441..39a6233b81c 100644
--- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldCdrAux.ipp
+++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_LOANABLEHELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_LOANABLEHELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__LOANABLEHELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__LOANABLEHELLOWORLDCDRAUX_IPP
 
 #include "LoanableHelloWorldCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_LOANABLEHELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__LOANABLEHELLOWORLDCDRAUX_IPP
 
diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx
index fc2dfc4163b..d971e2e4f36 100644
--- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx
+++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "LoanableHelloWorldPubSubTypes.h"
+#include "LoanableHelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp
similarity index 89%
rename from examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h
rename to examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp
index 56467a9a53f..3aed39a714c 100644
--- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.h
+++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file LoanableHelloWorldPubSubTypes.h
+ * @file LoanableHelloWorldPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__LOANABLEHELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__LOANABLEHELLOWORLD_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "LoanableHelloWorld.hpp"
 
@@ -139,9 +139,9 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -163,7 +163,7 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -184,5 +184,5 @@ class LoanableHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 };
 
-#endif // _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__LOANABLEHELLOWORLD_PUBSUBTYPES_HPP
 
diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPublisher.cxx b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPublisher.cxx
index e19c18d90ec..a98cff060a3 100644
--- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPublisher.cxx
+++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPublisher.cxx
@@ -21,7 +21,7 @@
 
 
 #include "LoanableHelloWorldPublisher.h"
-#include "LoanableHelloWorldPubSubTypes.h"
+#include "LoanableHelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/publisher/Publisher.hpp>
diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldSubscriber.cxx b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldSubscriber.cxx
index 15fa0200bfd..09cb2cb938b 100644
--- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldSubscriber.cxx
+++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldSubscriber.cxx
@@ -26,7 +26,7 @@
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 
 #include "LoanableHelloWorldSubscriber.h"
-#include "LoanableHelloWorldPubSubTypes.h"
+#include "LoanableHelloWorldPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
 
diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldTypeObjectSupport.hpp b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldTypeObjectSupport.hpp
index 7cb9711a279..96dfc31898b 100644
--- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldTypeObjectSupport.hpp
+++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__LOANABLEHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__LOANABLEHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_LoanableHelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_LOANABLEHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__LOANABLEHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/hello_world/HelloWorld.hpp b/examples/cpp/hello_world/HelloWorld.hpp
index 971fea8d920..46d0d7b5814 100644
--- a/examples/cpp/hello_world/HelloWorld.hpp
+++ b/examples/cpp/hello_world/HelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/examples/cpp/hello_world/HelloWorldCdrAux.hpp b/examples/cpp/hello_world/HelloWorldCdrAux.hpp
index 6feb8a9da15..1164cd5cce1 100644
--- a/examples/cpp/hello_world/HelloWorldCdrAux.hpp
+++ b/examples/cpp/hello_world/HelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
 #include "HelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
diff --git a/examples/cpp/hello_world/HelloWorldCdrAux.ipp b/examples/cpp/hello_world/HelloWorldCdrAux.ipp
index 97df3fe9d9e..19316df7d3c 100644
--- a/examples/cpp/hello_world/HelloWorldCdrAux.ipp
+++ b/examples/cpp/hello_world/HelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
 #include "HelloWorldCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx b/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx
index 41da39407fa..38393dbf8c9 100644
--- a/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx
+++ b/examples/cpp/hello_world/HelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.h b/examples/cpp/hello_world/HelloWorldPubSubTypes.h
deleted file mode 100644
index 3db9ca96458..00000000000
--- a/examples/cpp/hello_world/HelloWorldPubSubTypes.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima).
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/*!
- * @file HelloWorldPubSubTypes.h
- * This header file contains the declaration of the serialization functions.
- *
- * This file was generated by the tool fastddsgen.
- */
-
-
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-
-#include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
-
-#include "HelloWorld.hpp"
-
-
-#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
-#error \
-    Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
-#endif  // GEN_API_VER
-
-
-/*!
- * @brief This class represents the TopicDataType of the type HelloWorld defined by the user in the IDL file.
- * @ingroup HelloWorld
- */
-class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
-{
-public:
-
-    typedef HelloWorld type;
-
-    eProsima_user_DllExport HelloWorldPubSubType();
-
-    eProsima_user_DllExport ~HelloWorldPubSubType() override;
-
-    eProsima_user_DllExport bool serialize(
-            const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
-    {
-        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport bool serialize(
-            const void* const data,
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
-
-    eProsima_user_DllExport bool deserialize(
-            eprosima::fastdds::rtps::SerializedPayload_t* payload,
-            void* data) override;
-
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-            const void* const data) override
-    {
-        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
-    }
-
-    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
-            const void* const data,
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
-
-    eProsima_user_DllExport bool getKey(
-            const void* const data,
-            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
-            bool force_md5 = false) override;
-
-    eProsima_user_DllExport void* createData() override;
-
-    eProsima_user_DllExport void deleteData(
-            void* data) override;
-
-    //Register TypeObject representation in Fast DDS TypeObjectRegistry
-    eProsima_user_DllExport void register_type_object_representation() override;
-
-#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
-    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;
-    }
-
-#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;
-    }
-
-#endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
-
-    MD5 m_md5;
-    unsigned char* m_keyBuffer;
-
-};
-
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-
diff --git a/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp
new file mode 100644
index 00000000000..556d4c05ecf
--- /dev/null
+++ b/examples/cpp/hello_world/HelloWorldPubSubTypes.hpp
@@ -0,0 +1,133 @@
+// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*!
+ * @file HelloWorldPubSubTypes.hpp
+ * This header file contains the declaration of the serialization functions.
+ *
+ * This file was generated by the tool fastddsgen.
+ */
+
+
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+
+#include <fastdds/dds/core/policy/QosPolicies.hpp>
+#include <fastdds/dds/topic/TopicDataType.hpp>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
+
+#include "HelloWorld.hpp"
+
+
+#if !defined(GEN_API_VER) || (GEN_API_VER != 2)
+#error \
+    Generated HelloWorld is not compatible with current installed Fast DDS. Please, regenerate it with fastddsgen.
+#endif  // GEN_API_VER
+
+
+/*!
+ * @brief This class represents the TopicDataType of the type HelloWorld defined by the user in the IDL file.
+ * @ingroup HelloWorld
+ */
+class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
+{
+public:
+
+    typedef HelloWorld type;
+
+    eProsima_user_DllExport HelloWorldPubSubType();
+
+    eProsima_user_DllExport ~HelloWorldPubSubType() override;
+
+    eProsima_user_DllExport bool serialize(
+            const void* const data,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload) override
+    {
+        return serialize(data, payload, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
+
+    eProsima_user_DllExport bool serialize(
+            const void* const data,
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+
+    eProsima_user_DllExport bool deserialize(
+            eprosima::fastdds::rtps::SerializedPayload_t* payload,
+            void* data) override;
+
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            const void* const data) override
+    {
+        return getSerializedSizeProvider(data, eprosima::fastdds::dds::DEFAULT_DATA_REPRESENTATION);
+    }
+
+    eProsima_user_DllExport std::function<uint32_t()> getSerializedSizeProvider(
+            const void* const data,
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) override;
+
+    eProsima_user_DllExport bool getKey(
+            const void* const data,
+            eprosima::fastdds::rtps::InstanceHandle_t* ihandle,
+            bool force_md5 = false) override;
+
+    eProsima_user_DllExport void* createData() override;
+
+    eProsima_user_DllExport void deleteData(
+            void* data) override;
+
+    //Register TypeObject representation in Fast DDS TypeObjectRegistry
+    eProsima_user_DllExport void register_type_object_representation() override;
+
+#ifdef TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
+    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;
+    }
+
+#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;
+    }
+
+#endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
+
+    eprosima::fastdds::MD5 m_md5;
+    unsigned char* m_keyBuffer;
+
+};
+
+#endif // FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+
diff --git a/examples/cpp/hello_world/HelloWorldTypeObjectSupport.hpp b/examples/cpp/hello_world/HelloWorldTypeObjectSupport.hpp
index 2eba797b07f..ec922163d11 100644
--- a/examples/cpp/hello_world/HelloWorldTypeObjectSupport.hpp
+++ b/examples/cpp/hello_world/HelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_HelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/examples/cpp/hello_world/ListenerSubscriberApp.cpp b/examples/cpp/hello_world/ListenerSubscriberApp.cpp
index 4e5491ea0d5..df742c55666 100644
--- a/examples/cpp/hello_world/ListenerSubscriberApp.cpp
+++ b/examples/cpp/hello_world/ListenerSubscriberApp.cpp
@@ -31,7 +31,7 @@
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 
 #include "CLIParser.hpp"
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 #include "Application.hpp"
 
 using namespace eprosima::fastdds::dds;
diff --git a/examples/cpp/hello_world/ListenerSubscriberApp.hpp b/examples/cpp/hello_world/ListenerSubscriberApp.hpp
index cd22791dec6..7813cf4487b 100644
--- a/examples/cpp/hello_world/ListenerSubscriberApp.hpp
+++ b/examples/cpp/hello_world/ListenerSubscriberApp.hpp
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 
 #include "CLIParser.hpp"
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 #include "Application.hpp"
 
 using namespace eprosima::fastdds::dds;
diff --git a/examples/cpp/hello_world/PublisherApp.hpp b/examples/cpp/hello_world/PublisherApp.hpp
index 0b9c6b7f874..c2520a97a1c 100644
--- a/examples/cpp/hello_world/PublisherApp.hpp
+++ b/examples/cpp/hello_world/PublisherApp.hpp
@@ -28,7 +28,7 @@
 
 #include "Application.hpp"
 #include "CLIParser.hpp"
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
 
diff --git a/examples/cpp/hello_world/WaitsetSubscriberApp.cpp b/examples/cpp/hello_world/WaitsetSubscriberApp.cpp
index 49a39760e96..9bf670e5c9c 100644
--- a/examples/cpp/hello_world/WaitsetSubscriberApp.cpp
+++ b/examples/cpp/hello_world/WaitsetSubscriberApp.cpp
@@ -32,7 +32,7 @@
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 #include "CLIParser.hpp"
 #include "Application.hpp"
 
diff --git a/examples/cpp/hello_world/WaitsetSubscriberApp.hpp b/examples/cpp/hello_world/WaitsetSubscriberApp.hpp
index cb27cc5c016..507d00ad6ba 100644
--- a/examples/cpp/hello_world/WaitsetSubscriberApp.hpp
+++ b/examples/cpp/hello_world/WaitsetSubscriberApp.hpp
@@ -29,7 +29,7 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 
 #include "CLIParser.hpp"
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 #include "Application.hpp"
 
 using namespace eprosima::fastdds::dds;
diff --git a/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp b/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp
index b8a82dcab19..3cbb13f92b0 100644
--- a/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp
+++ b/examples/cpp/rtps/AsSocket/TestReaderSocket.cpp
@@ -19,14 +19,14 @@
 
 #include "TestReaderSocket.h"
 
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.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 <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 using namespace eprosima::fastdds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/rtps/AsSocket/TestReaderSocket.h b/examples/cpp/rtps/AsSocket/TestReaderSocket.h
index 093dfc09e2d..3151590c154 100644
--- a/examples/cpp/rtps/AsSocket/TestReaderSocket.h
+++ b/examples/cpp/rtps/AsSocket/TestReaderSocket.h
@@ -20,7 +20,7 @@
 #ifndef TESTREADERSOCKET_H_
 #define TESTREADERSOCKET_H_
 
-#include <fastdds/rtps/reader/ReaderListener.h>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/examples/cpp/rtps/AsSocket/TestWriterSocket.cpp b/examples/cpp/rtps/AsSocket/TestWriterSocket.cpp
index de31b665d0c..5e4d3d1d9e4 100644
--- a/examples/cpp/rtps/AsSocket/TestWriterSocket.cpp
+++ b/examples/cpp/rtps/AsSocket/TestWriterSocket.cpp
@@ -19,15 +19,15 @@
 
 #include "TestWriterSocket.h"
 
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.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 <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 using namespace eprosima::fastdds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/rtps/AsSocket/main_RTPSTest.cpp b/examples/cpp/rtps/AsSocket/main_RTPSTest.cpp
index 0d264664fb9..2fa6119d413 100644
--- a/examples/cpp/rtps/AsSocket/main_RTPSTest.cpp
+++ b/examples/cpp/rtps/AsSocket/main_RTPSTest.cpp
@@ -20,7 +20,7 @@
 #include <sstream>
 #include <stdio.h>
 
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
 
 #include "TestWriterSocket.h"
 #include "TestReaderSocket.h"
diff --git a/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp b/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp
index f3ce257c420..b1664f57b20 100644
--- a/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp
+++ b/examples/cpp/rtps/Persistent/TestReaderPersistent.cpp
@@ -20,14 +20,14 @@
 #include "TestReaderPersistent.h"
 
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
-#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 <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
 
 using namespace eprosima::fastdds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/rtps/Persistent/TestReaderPersistent.h b/examples/cpp/rtps/Persistent/TestReaderPersistent.h
index e11b00e8142..53a6ee5d729 100644
--- a/examples/cpp/rtps/Persistent/TestReaderPersistent.h
+++ b/examples/cpp/rtps/Persistent/TestReaderPersistent.h
@@ -20,7 +20,7 @@
 #ifndef TESTREADERPERSISTENT_H_
 #define TESTREADERPERSISTENT_H_
 
-#include <fastdds/rtps/reader/ReaderListener.h>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/examples/cpp/rtps/Persistent/TestWriterPersistent.cpp b/examples/cpp/rtps/Persistent/TestWriterPersistent.cpp
index 8972f6fb649..2781c017237 100644
--- a/examples/cpp/rtps/Persistent/TestWriterPersistent.cpp
+++ b/examples/cpp/rtps/Persistent/TestWriterPersistent.cpp
@@ -23,14 +23,14 @@
 #include <thread>
 
 #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 <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 using namespace eprosima::fastdds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/rtps/Persistent/TestWriterPersistent.h b/examples/cpp/rtps/Persistent/TestWriterPersistent.h
index 4cd38648312..80f414dbab7 100644
--- a/examples/cpp/rtps/Persistent/TestWriterPersistent.h
+++ b/examples/cpp/rtps/Persistent/TestWriterPersistent.h
@@ -20,7 +20,7 @@
 #ifndef TESTWRITERPERSISTENT_H_
 #define TESTWRITERPERSISTENT_H_
 
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/examples/cpp/rtps/Persistent/main_RTPSTest.cpp b/examples/cpp/rtps/Persistent/main_RTPSTest.cpp
index fc50819521d..93522612bdc 100644
--- a/examples/cpp/rtps/Persistent/main_RTPSTest.cpp
+++ b/examples/cpp/rtps/Persistent/main_RTPSTest.cpp
@@ -20,7 +20,7 @@
 #include <sstream>
 #include <stdio.h>
 
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
 
 #include "TestReaderPersistent.h"
 #include "TestWriterPersistent.h"
diff --git a/examples/cpp/rtps/Registered/TestReaderRegistered.cpp b/examples/cpp/rtps/Registered/TestReaderRegistered.cpp
index 1aba5e48c5d..b62a92cf082 100644
--- a/examples/cpp/rtps/Registered/TestReaderRegistered.cpp
+++ b/examples/cpp/rtps/Registered/TestReaderRegistered.cpp
@@ -20,14 +20,14 @@
 #include "TestReaderRegistered.h"
 
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
-#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 <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
 
 using namespace eprosima::fastdds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/rtps/Registered/TestReaderRegistered.h b/examples/cpp/rtps/Registered/TestReaderRegistered.h
index 514d4b87e37..219823955ed 100644
--- a/examples/cpp/rtps/Registered/TestReaderRegistered.h
+++ b/examples/cpp/rtps/Registered/TestReaderRegistered.h
@@ -20,7 +20,7 @@
 #ifndef TESTREADERREGISTERED_H_
 #define TESTREADERREGISTERED_H_
 
-#include <fastdds/rtps/reader/ReaderListener.h>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
 
 
 namespace eprosima {
diff --git a/examples/cpp/rtps/Registered/TestWriterRegistered.cpp b/examples/cpp/rtps/Registered/TestWriterRegistered.cpp
index 9f0fa278037..8ebb8cf6fa2 100644
--- a/examples/cpp/rtps/Registered/TestWriterRegistered.cpp
+++ b/examples/cpp/rtps/Registered/TestWriterRegistered.cpp
@@ -23,14 +23,14 @@
 #include <thread>
 
 #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 <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 using namespace eprosima::fastdds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/rtps/Registered/TestWriterRegistered.h b/examples/cpp/rtps/Registered/TestWriterRegistered.h
index 5f8a035c827..3e6840b8d45 100644
--- a/examples/cpp/rtps/Registered/TestWriterRegistered.h
+++ b/examples/cpp/rtps/Registered/TestWriterRegistered.h
@@ -20,7 +20,7 @@
 #ifndef TESTWRITERREGISTERED_H_
 #define TESTWRITERREGISTERED_H_
 
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/examples/cpp/rtps/Registered/main_RTPSTest.cpp b/examples/cpp/rtps/Registered/main_RTPSTest.cpp
index 43778a89ec7..4029c0e13e3 100644
--- a/examples/cpp/rtps/Registered/main_RTPSTest.cpp
+++ b/examples/cpp/rtps/Registered/main_RTPSTest.cpp
@@ -20,7 +20,7 @@
 #include <sstream>
 #include <stdio.h>
 
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
 
 #include "TestReaderRegistered.h"
 #include "TestWriterRegistered.h"
diff --git a/fuzz/C++/fuzz_XMLProfiles/fuzz_XMLProfiles.cxx b/fuzz/C++/fuzz_XMLProfiles/fuzz_XMLProfiles.cxx
index cfcf54d6fd9..3f621b1ce87 100644
--- a/fuzz/C++/fuzz_XMLProfiles/fuzz_XMLProfiles.cxx
+++ b/fuzz/C++/fuzz_XMLProfiles/fuzz_XMLProfiles.cxx
@@ -1,4 +1,18 @@
-#include "fuzz_utils.h"
+// Copyright 2024 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "fuzz_utils.hpp"
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 
diff --git a/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.cxx b/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.cxx
index 56feebad706..f6339ab23eb 100644
--- a/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.cxx
+++ b/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.cxx
@@ -1,4 +1,18 @@
-#include "fuzz_utils.h"
+// Copyright 2024 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "fuzz_utils.hpp"
 
 #include <err.h>
 #include <errno.h>
diff --git a/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.h b/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.h
deleted file mode 100644
index 193e635b733..00000000000
--- a/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Helpers functions for fuzz targets.
-
-#ifndef FUZZ_UTILS_H_
-#define FUZZ_UTILS_H_
-
-#include <stddef.h>
-#include <stdint.h>
-
-// Redirect stdout to /dev/null. Useful to ignore output from verbose fuzz
-// target functions.
-//
-// Return 0 on success, -1 otherwise.
-extern "C" int ignore_stdout(
-        void);
-
-
-#endif  // FUZZ_UTILS_H_
\ No newline at end of file
diff --git a/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.hpp b/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.hpp
new file mode 100644
index 00000000000..1b672d33998
--- /dev/null
+++ b/fuzz/C++/fuzz_XMLProfiles/fuzz_utils.hpp
@@ -0,0 +1,35 @@
+// Copyright 2024 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * @file fuzz_utils.hpp
+ *
+ */
+
+// Helpers functions for fuzz targets.
+#ifndef FASTDDS_FUZZ__FUZZ_UTILS_HPP
+#define FASTDDS_FUZZ__FUZZ_UTILS_HPP
+
+#include <stddef.h>
+#include <stdint.h>
+
+// Redirect stdout to /dev/null. Useful to ignore output from verbose fuzz
+// target functions.
+//
+// Return 0 on success, -1 otherwise.
+extern "C" int ignore_stdout(
+        void);
+
+
+#endif  // FASTDDS_FUZZ__FUZZ_UTILS_HPP
diff --git a/fuzz/C++/fuzz_processCDRMsg/fuzz_processCDRMsg.cxx b/fuzz/C++/fuzz_processCDRMsg/fuzz_processCDRMsg.cxx
index 4c57fdb7553..2d7002ca9cc 100644
--- a/fuzz/C++/fuzz_processCDRMsg/fuzz_processCDRMsg.cxx
+++ b/fuzz/C++/fuzz_processCDRMsg/fuzz_processCDRMsg.cxx
@@ -4,7 +4,7 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 
 #include <MessageReceiver.h>
 
diff --git a/include/fastdds/LibrarySettings.hpp b/include/fastdds/LibrarySettings.hpp
index a84dd5eb96d..22c025702ad 100644
--- a/include/fastdds/LibrarySettings.hpp
+++ b/include/fastdds/LibrarySettings.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_LIBRARY_SETTINGS_HPP_
-#define _FASTDDS_LIBRARY_SETTINGS_HPP_
+#ifndef FASTDDS__LIBRARY_SETTINGS_HPP
+#define FASTDDS__LIBRARY_SETTINGS_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -63,4 +63,4 @@ class LibrarySettings
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif /* _FASTDDS_LIBRARY_SETTINGS_HPP_ */
+#endif // FASTDDS__LIBRARY_SETTINGS_HPP
diff --git a/include/fastdds/config.h.in b/include/fastdds/config.hpp.in
similarity index 98%
rename from include/fastdds/config.h.in
rename to include/fastdds/config.hpp.in
index 8b3d118edfb..508897f88e6 100644
--- a/include/fastdds/config.h.in
+++ b/include/fastdds/config.hpp.in
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_CONFIG_H_
-#define _FASTDDS_CONFIG_H_
+#ifndef FASTDDS__CONFIG_H
+#define FASTDDS__CONFIG_H
 
 #define FASTDDS_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
 #define FASTDDS_VERSION_MINOR @PROJECT_VERSION_MINOR@
@@ -130,4 +130,4 @@
 #define FASTDDS_SER_METHOD_DEPRECATED(major, entity_name, msg)
 #endif // if FASTCDR_VERSION_MAJOR > 1
 
-#endif // _FASTDDS_CONFIG_H_
+#endif // FASTDDS__CONFIG_H
diff --git a/include/fastdds/config/doxygen_modules.hpp b/include/fastdds/config/doxygen_modules.hpp
index 308d70fa551..8bd8d1ff3a1 100644
--- a/include/fastdds/config/doxygen_modules.hpp
+++ b/include/fastdds/config/doxygen_modules.hpp
@@ -16,8 +16,8 @@
  * @file doxygen_modules.hpp
  */
 
-#ifndef _FASTDDS_DOXYGEN_MODULES_HPP_
-#define _FASTDDS_DOXYGEN_MODULES_HPP_
+#ifndef FASTDDS_CONFIG__DOXYGEN_MODULES_HPP
+#define FASTDDS_CONFIG__DOXYGEN_MODULES_HPP
 
 //Description of doxygen modules, not used in actual code.
 
@@ -141,4 +141,4 @@
  *  @ingroup UTILITIES_MODULE
  */
 
-#endif /* _FASTDDS_DOXYGEN_MODULES_HPP_ */
+#endif // FASTDDS_CONFIG__DOXYGEN_MODULES_HPP
diff --git a/include/fastdds/dds/builtin/topic/BuiltinTopicKey.hpp b/include/fastdds/dds/builtin/topic/BuiltinTopicKey.hpp
index 43fe1aae1ce..58fbcec1b2b 100644
--- a/include/fastdds/dds/builtin/topic/BuiltinTopicKey.hpp
+++ b/include/fastdds/dds/builtin/topic/BuiltinTopicKey.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_DDS_BUILTIN_TOPIC_BUILTINTOPICKEY_HPP
-#define FASTDDS_DDS_BUILTIN_TOPIC_BUILTINTOPICKEY_HPP
+#ifndef FASTDDS_DDS_BUILTIN_TOPIC__BUILTINTOPICKEY_HPP
+#define FASTDDS_DDS_BUILTIN_TOPIC__BUILTINTOPICKEY_HPP
 
 #include <stdint.h>
 
@@ -42,4 +42,4 @@ struct BuiltinTopicKey_t
 } // fastdds
 } // eprosima
 
-#endif // FASTDDS_DDS_BUILTIN_TOPIC_BUILTINTOPICKEY_HPP
+#endif // FASTDDS_DDS_BUILTIN_TOPIC__BUILTINTOPICKEY_HPP
diff --git a/include/fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp b/include/fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp
index a8083d61d71..8df2b567168 100644
--- a/include/fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp
+++ b/include/fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_DDS_BUILTIN_TOPIC_PARTICIPANTBUILTINTOPICDATA_HPP
-#define FASTDDS_DDS_BUILTIN_TOPIC_PARTICIPANTBUILTINTOPICDATA_HPP
+#ifndef FASTDDS_DDS_BUILTIN_TOPIC__PARTICIPANTBUILTINTOPICDATA_HPP
+#define FASTDDS_DDS_BUILTIN_TOPIC__PARTICIPANTBUILTINTOPICDATA_HPP
 
 #include <fastdds/dds/builtin/topic/BuiltinTopicKey.hpp>
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
@@ -42,4 +42,4 @@ struct ParticipantBuiltinTopicData
 } // fastdds
 } // eprosima
 
-#endif // FASTDDS_DDS_BUILTIN_TOPIC_PARTICIPANTBUILTINTOPICDATA_HPP
+#endif // FASTDDS_DDS_BUILTIN_TOPIC__PARTICIPANTBUILTINTOPICDATA_HPP
diff --git a/include/fastdds/dds/builtin/topic/PublicationBuiltinTopicData.hpp b/include/fastdds/dds/builtin/topic/PublicationBuiltinTopicData.hpp
index ed9601b91b4..48c0bdc74ce 100644
--- a/include/fastdds/dds/builtin/topic/PublicationBuiltinTopicData.hpp
+++ b/include/fastdds/dds/builtin/topic/PublicationBuiltinTopicData.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_DDS_BUILTIN_TOPIC_PUBLICATIONBUILTINTOPICDATA_HPP
-#define FASTDDS_DDS_BUILTIN_TOPIC_PUBLICATIONBUILTINTOPICDATA_HPP
+#ifndef FASTDDS_DDS_BUILTIN_TOPIC__PUBLICATIONBUILTINTOPICDATA_HPP
+#define FASTDDS_DDS_BUILTIN_TOPIC__PUBLICATIONBUILTINTOPICDATA_HPP
 
 #include <fastdds/dds/builtin/topic/BuiltinTopicKey.hpp>
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
@@ -97,4 +97,4 @@ struct PublicationBuiltinTopicData
 } // fastdds
 } // eprosima
 
-#endif // FASTDDS_DDS_BUILTIN_TOPIC_PUBLICATIONBUILTINTOPICDATA_HPP
+#endif // FASTDDS_DDS_BUILTIN_TOPIC__PUBLICATIONBUILTINTOPICDATA_HPP
diff --git a/include/fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.hpp b/include/fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.hpp
index 854fe4d7912..d5f662a5cf2 100644
--- a/include/fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.hpp
+++ b/include/fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_DDS_BUILTIN_TOPIC_SUBSCRIPTIONBUILTINTOPICDATA_HPP
-#define FASTDDS_DDS_BUILTIN_TOPIC_SUBSCRIPTIONBUILTINTOPICDATA_HPP
+#ifndef FASTDDS_DDS_BUILTIN_TOPIC__SUBSCRIPTIONBUILTINTOPICDATA_HPP
+#define FASTDDS_DDS_BUILTIN_TOPIC__SUBSCRIPTIONBUILTINTOPICDATA_HPP
 
 #include <fastdds/dds/builtin/topic/BuiltinTopicKey.hpp>
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
@@ -91,4 +91,4 @@ struct SubscriptionBuiltinTopicData
 } // fastdds
 } // eprosima
 
-#endif // FASTDDS_DDS_BUILTIN_TOPIC_SUBSCRIPTIONBUILTINTOPICDATA_HPP
+#endif // FASTDDS_DDS_BUILTIN_TOPIC__SUBSCRIPTIONBUILTINTOPICDATA_HPP
diff --git a/include/fastdds/dds/builtin/topic/TopicBuiltinTopicData.hpp b/include/fastdds/dds/builtin/topic/TopicBuiltinTopicData.hpp
index 6fa18077579..bba263408ed 100644
--- a/include/fastdds/dds/builtin/topic/TopicBuiltinTopicData.hpp
+++ b/include/fastdds/dds/builtin/topic/TopicBuiltinTopicData.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_DDS_BUILTIN_TOPIC_TOPICBUILTINTOPICDATA_HPP
-#define FASTDDS_DDS_BUILTIN_TOPIC_TOPICBUILTINTOPICDATA_HPP
+#ifndef FASTDDS_DDS_BUILTIN_TOPIC__TOPICBUILTINTOPICDATA_HPP
+#define FASTDDS_DDS_BUILTIN_TOPIC__TOPICBUILTINTOPICDATA_HPP
 
 #include <fastdds/dds/builtin/topic/BuiltinTopicKey.hpp>
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
@@ -78,4 +78,4 @@ struct TopicBuiltinTopicData
 } // fastdds
 } // eprosima
 
-#endif // FASTDDS_DDS_BUILTIN_TOPIC_TOPICBUILTINTOPICDATA_HPP
+#endif // FASTDDS_DDS_BUILTIN_TOPIC__TOPICBUILTINTOPICDATA_HPP
diff --git a/include/fastdds/dds/common/InstanceHandle.hpp b/include/fastdds/dds/common/InstanceHandle.hpp
index ae3ecee39d0..76746032ead 100644
--- a/include/fastdds/dds/common/InstanceHandle.hpp
+++ b/include/fastdds/dds/common/InstanceHandle.hpp
@@ -17,10 +17,10 @@
  *
  */
 
-#ifndef _FASTDDS_DDS_COMMON_INSTANCEHANDLE_HPP_
-#define _FASTDDS_DDS_COMMON_INSTANCEHANDLE_HPP_
+#ifndef FASTDDS_DDS_COMMON__INSTANCEHANDLE_HPP
+#define FASTDDS_DDS_COMMON__INSTANCEHANDLE_HPP
 
-#include <fastdds/rtps/common/InstanceHandle.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
 #include <fastdds/fastdds_dll.hpp>
 
 
@@ -36,4 +36,4 @@ extern FASTDDS_EXPORTED_API const InstanceHandle_t HANDLE_NIL;
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_COMMON_INSTANCEHANDLE_HPP_
+#endif // FASTDDS_DDS_COMMON__INSTANCEHANDLE_HPP
diff --git a/include/fastdds/dds/core/Entity.hpp b/include/fastdds/dds/core/Entity.hpp
index c1d22d9269e..dabf9fec671 100644
--- a/include/fastdds/dds/core/Entity.hpp
+++ b/include/fastdds/dds/core/Entity.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_ENTITY_HPP_
-#define _FASTDDS_ENTITY_HPP_
+#ifndef FASTDDS_DDS_CORE__ENTITY_HPP
+#define FASTDDS_DDS_CORE__ENTITY_HPP
 
 #include <fastdds/dds/common/InstanceHandle.hpp>
 #include <fastdds/dds/core/condition/StatusCondition.hpp>
@@ -183,4 +183,4 @@ class DomainEntity : public Entity
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_ENTITY_HPP_
+#endif // FASTDDS_DDS_CORE__ENTITY_HPP
diff --git a/include/fastdds/dds/core/LoanableArray.hpp b/include/fastdds/dds/core/LoanableArray.hpp
index 29c8ca59195..dbd5ee577f7 100644
--- a/include/fastdds/dds/core/LoanableArray.hpp
+++ b/include/fastdds/dds/core/LoanableArray.hpp
@@ -16,8 +16,8 @@
  * @file LoanableArray.hpp
  */
 
-#ifndef _FASTDDS_DDS_CORE_LOANABLEARRAY_HPP_
-#define _FASTDDS_DDS_CORE_LOANABLEARRAY_HPP_
+#ifndef FASTDDS_DDS_CORE__LOANABLEARRAY_HPP
+#define FASTDDS_DDS_CORE__LOANABLEARRAY_HPP
 
 #include <cstdint>
 #include <array>
@@ -72,4 +72,4 @@ struct LoanableArray : public std::array<T, num_items>
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_CORE_LOANABLEARRAY_HPP_
+#endif // FASTDDS_DDS_CORE__LOANABLEARRAY_HPP
diff --git a/include/fastdds/dds/core/LoanableCollection.hpp b/include/fastdds/dds/core/LoanableCollection.hpp
index bf472d95f4a..6f1ad1bd799 100644
--- a/include/fastdds/dds/core/LoanableCollection.hpp
+++ b/include/fastdds/dds/core/LoanableCollection.hpp
@@ -16,8 +16,8 @@
  * @file LoanableCollection.hpp
  */
 
-#ifndef _FASTDDS_DDS_CORE_LOANABLECOLLECTION_HPP_
-#define _FASTDDS_DDS_CORE_LOANABLECOLLECTION_HPP_
+#ifndef FASTDDS_DDS_CORE__LOANABLECOLLECTION_HPP
+#define FASTDDS_DDS_CORE__LOANABLECOLLECTION_HPP
 
 #include <cstdint>
 
@@ -247,4 +247,4 @@ class LoanableCollection
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_CORE_LOANABLECOLLECTION_HPP_
+#endif // FASTDDS_DDS_CORE__LOANABLECOLLECTION_HPP
diff --git a/include/fastdds/dds/core/LoanableSequence.hpp b/include/fastdds/dds/core/LoanableSequence.hpp
index 2d48069b984..6165be48157 100644
--- a/include/fastdds/dds/core/LoanableSequence.hpp
+++ b/include/fastdds/dds/core/LoanableSequence.hpp
@@ -16,8 +16,8 @@
  * @file LoanableSequence.hpp
  */
 
-#ifndef _FASTDDS_DDS_CORE_LOANABLESEQUENCE_HPP_
-#define _FASTDDS_DDS_CORE_LOANABLESEQUENCE_HPP_
+#ifndef FASTDDS_DDS_CORE__LOANABLESEQUENCE_HPP
+#define FASTDDS_DDS_CORE__LOANABLESEQUENCE_HPP
 
 #include <cassert>
 #include <cstdint>
@@ -230,4 +230,4 @@ class LoanableSequence : public LoanableTypedCollection<T, _NonConstEnabler>
 #define FASTDDS_CONST_SEQUENCE(FooSeq, Foo) using FooSeq = eprosima::fastdds::dds::LoanableSequence<Foo, \
                     std::false_type>
 
-#endif // _FASTDDS_DDS_CORE_LOANABLESEQUENCE_HPP_
+#endif // FASTDDS_DDS_CORE__LOANABLESEQUENCE_HPP
diff --git a/include/fastdds/dds/core/LoanableTypedCollection.hpp b/include/fastdds/dds/core/LoanableTypedCollection.hpp
index a35159f6673..d0161bf9c23 100644
--- a/include/fastdds/dds/core/LoanableTypedCollection.hpp
+++ b/include/fastdds/dds/core/LoanableTypedCollection.hpp
@@ -16,8 +16,8 @@
  * @file LoanableTypedCollection.hpp
  */
 
-#ifndef _FASTDDS_DDS_CORE_LOANABLETYPEDCOLLECTION_HPP_
-#define _FASTDDS_DDS_CORE_LOANABLETYPEDCOLLECTION_HPP_
+#ifndef FASTDDS_DDS_CORE__LOANABLETYPEDCOLLECTION_HPP
+#define FASTDDS_DDS_CORE__LOANABLETYPEDCOLLECTION_HPP
 
 #include <cassert>
 #include <cstdint>
@@ -98,4 +98,4 @@ class LoanableTypedCollection : public LoanableCollection
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_CORE_LOANABLETYPEDCOLLECTION_HPP_
+#endif // FASTDDS_DDS_CORE__LOANABLETYPEDCOLLECTION_HPP
diff --git a/include/fastdds/dds/core/ReturnCode.hpp b/include/fastdds/dds/core/ReturnCode.hpp
index 607e091c670..201bba78e4a 100644
--- a/include/fastdds/dds/core/ReturnCode.hpp
+++ b/include/fastdds/dds/core/ReturnCode.hpp
@@ -16,11 +16,11 @@
  * @file ReturnCode.hpp
  */
 
-#ifndef _FASTDDS_DDS_CORE_RETURNCODE_HPP_
-#define _FASTDDS_DDS_CORE_RETURNCODE_HPP_
+#ifndef FASTDDS_DDS_CORE__RETURNCODE_HPP
+#define FASTDDS_DDS_CORE__RETURNCODE_HPP
 
 #include "detail/DDSReturnCode.hpp"
 #include "detail/DDSSecurityReturnCode.hpp"
 
-#endif // _FASTDDS_DDS_CORE_RETURNCODE_HPP_
+#endif // FASTDDS_DDS_CORE__RETURNCODE_HPP
 
diff --git a/include/fastdds/dds/core/StackAllocatedSequence.hpp b/include/fastdds/dds/core/StackAllocatedSequence.hpp
index 7320ac69820..29ae2439428 100644
--- a/include/fastdds/dds/core/StackAllocatedSequence.hpp
+++ b/include/fastdds/dds/core/StackAllocatedSequence.hpp
@@ -16,8 +16,8 @@
  * @file StackAllocatedSequence.hpp
  */
 
-#ifndef _FASTDDS_DDS_CORE_STACKALLOCATEDSEQUENCE_HPP_
-#define _FASTDDS_DDS_CORE_STACKALLOCATEDSEQUENCE_HPP_
+#ifndef FASTDDS_DDS_CORE__STACKALLOCATEDSEQUENCE_HPP
+#define FASTDDS_DDS_CORE__STACKALLOCATEDSEQUENCE_HPP
 
 #include <array>
 #include <cassert>
@@ -88,4 +88,4 @@ struct StackAllocatedSequence : public LoanableTypedCollection<T>
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_CORE_STACKALLOCATEDSEQUENCE_HPP_
+#endif // FASTDDS_DDS_CORE__STACKALLOCATEDSEQUENCE_HPP
diff --git a/include/fastdds/dds/core/Types.hpp b/include/fastdds/dds/core/Types.hpp
index 667616d0a25..47876e1ba9f 100644
--- a/include/fastdds/dds/core/Types.hpp
+++ b/include/fastdds/dds/core/Types.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_DDS_CORE_TYPES_HPP
-#define FASTDDS_DDS_CORE_TYPES_HPP
+#ifndef FASTDDS_DDS_CORE__TYPES_HPP
+#define FASTDDS_DDS_CORE__TYPES_HPP
 
 #include <cstdint>
 
@@ -31,4 +31,4 @@ const int32_t LENGTH_UNLIMITED = -1;
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_DDS_CORE_TYPES_HPP
+#endif // FASTDDS_DDS_CORE__TYPES_HPP
diff --git a/include/fastdds/dds/core/UserAllocatedSequence.hpp b/include/fastdds/dds/core/UserAllocatedSequence.hpp
index eec686ab3ad..63882b53367 100644
--- a/include/fastdds/dds/core/UserAllocatedSequence.hpp
+++ b/include/fastdds/dds/core/UserAllocatedSequence.hpp
@@ -16,8 +16,8 @@
  * @file UserAllocatedSequence.hpp
  */
 
-#ifndef _FASTDDS_DDS_CORE_USERALLOCATEDSEQUENCE_HPP_
-#define _FASTDDS_DDS_CORE_USERALLOCATEDSEQUENCE_HPP_
+#ifndef FASTDDS_DDS_CORE__USERALLOCATEDSEQUENCE_HPP
+#define FASTDDS_DDS_CORE__USERALLOCATEDSEQUENCE_HPP
 
 #include <cassert>
 #include <cstdint>
@@ -100,4 +100,4 @@ struct UserAllocatedSequence : public LoanableCollection
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_CORE_USERALLOCATEDSEQUENCE_HPP_
+#endif // FASTDDS_DDS_CORE__USERALLOCATEDSEQUENCE_HPP
diff --git a/include/fastdds/dds/core/condition/Condition.hpp b/include/fastdds/dds/core/condition/Condition.hpp
index 3879bef7880..a3cc7866cce 100644
--- a/include/fastdds/dds/core/condition/Condition.hpp
+++ b/include/fastdds/dds/core/condition/Condition.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_CONDITION_HPP_
-#define _FASTDDS_CONDITION_HPP_
+#ifndef FASTDDS_DDS_CORE_CONDITION__CONDITION_HPP
+#define FASTDDS_DDS_CORE_CONDITION__CONDITION_HPP
 
 #include <memory>
 #include <vector>
@@ -71,4 +71,4 @@ using ConditionSeq = std::vector<Condition*>;
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_CONDITION_HPP_
+#endif // FASTDDS_DDS_CORE_CONDITION__CONDITION_HPP
diff --git a/include/fastdds/dds/core/condition/GuardCondition.hpp b/include/fastdds/dds/core/condition/GuardCondition.hpp
index e4329556a6b..90a4f43c611 100644
--- a/include/fastdds/dds/core/condition/GuardCondition.hpp
+++ b/include/fastdds/dds/core/condition/GuardCondition.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_GUARD_CONDITION_HPP_
-#define _FASTDDS_GUARD_CONDITION_HPP_
+#ifndef FASTDDS_DDS_CORE_CONDITION__GUARDCONDITION_HPP
+#define FASTDDS_DDS_CORE_CONDITION__GUARDCONDITION_HPP
 
 #include <atomic>
 
@@ -67,4 +67,4 @@ class GuardCondition : public Condition
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_GUARD_CONDITION_HPP_
+#endif // FASTDDS_DDS_CORE_CONDITION__GUARDCONDITION_HPP
diff --git a/include/fastdds/dds/core/condition/StatusCondition.hpp b/include/fastdds/dds/core/condition/StatusCondition.hpp
index a3d1b1ca285..1f32498ba44 100644
--- a/include/fastdds/dds/core/condition/StatusCondition.hpp
+++ b/include/fastdds/dds/core/condition/StatusCondition.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_STATUS_CONDITION_HPP_
-#define _FASTDDS_STATUS_CONDITION_HPP_
+#ifndef FASTDDS_DDS_CORE_CONDITION__STATUSCONDITION_HPP
+#define FASTDDS_DDS_CORE_CONDITION__STATUSCONDITION_HPP
 
 #include <fastdds/dds/core/condition/Condition.hpp>
 #include <fastdds/dds/core/ReturnCode.hpp>
@@ -107,4 +107,4 @@ class StatusCondition final : public Condition
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_STATUS_CONDITION_HPP_
+#endif // FASTDDS_DDS_CORE_CONDITION__STATUSCONDITION_HPP
diff --git a/include/fastdds/dds/core/condition/WaitSet.hpp b/include/fastdds/dds/core/condition/WaitSet.hpp
index 7838117de74..3df09501ad8 100644
--- a/include/fastdds/dds/core/condition/WaitSet.hpp
+++ b/include/fastdds/dds/core/condition/WaitSet.hpp
@@ -17,14 +17,14 @@
  *
  */
 
-#ifndef _FASTDDS_WAIT_SET_HPP_
-#define _FASTDDS_WAIT_SET_HPP_
+#ifndef FASTDDS_DDS_CORE_CONDITION__WAITSET_HPP
+#define FASTDDS_DDS_CORE_CONDITION__WAITSET_HPP
 
 #include <memory>
 
 #include <fastdds/dds/core/condition/Condition.hpp>
 #include <fastdds/dds/core/ReturnCode.hpp>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 #include <fastdds/fastdds_dll.hpp>
 
 namespace eprosima {
@@ -105,4 +105,4 @@ class WaitSet
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_WAIT_SET_HPP_
+#endif // FASTDDS_DDS_CORE_CONDITION__WAITSET_HPP
diff --git a/include/fastdds/dds/core/detail/DDSReturnCode.hpp b/include/fastdds/dds/core/detail/DDSReturnCode.hpp
index 24c32e8e8e8..71ccf1d9aee 100644
--- a/include/fastdds/dds/core/detail/DDSReturnCode.hpp
+++ b/include/fastdds/dds/core/detail/DDSReturnCode.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DDSRETURNCODE_HPP_
-#define _FAST_DDS_GENERATED_DDSRETURNCODE_HPP_
+#ifndef FAST_DDS_GENERATED__DDSRETURNCODE_HPP
+#define FAST_DDS_GENERATED__DDSRETURNCODE_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/include/fastdds/dds/core/detail/DDSSecurityReturnCode.hpp b/include/fastdds/dds/core/detail/DDSSecurityReturnCode.hpp
index 36955743934..92b030e1def 100644
--- a/include/fastdds/dds/core/detail/DDSSecurityReturnCode.hpp
+++ b/include/fastdds/dds/core/detail/DDSSecurityReturnCode.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DDSSECURITYRETURNCODE_HPP_
-#define _FAST_DDS_GENERATED_DDSSECURITYRETURNCODE_HPP_
+#ifndef FAST_DDS_GENERATED__DDSSECURITYRETURNCODE_HPP
+#define FAST_DDS_GENERATED__DDSSECURITYRETURNCODE_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/include/fastdds/dds/core/policy/ParameterTypes.hpp b/include/fastdds/dds/core/policy/ParameterTypes.hpp
index 8424240404b..4be7d16f403 100644
--- a/include/fastdds/dds/core/policy/ParameterTypes.hpp
+++ b/include/fastdds/dds/core/policy/ParameterTypes.hpp
@@ -16,8 +16,8 @@
  * @file ParameterTypes.hpp
  */
 
-#ifndef _FASTDDS_DDS_QOS_PARAMETERTYPES_HPP_
-#define _FASTDDS_DDS_QOS_PARAMETERTYPES_HPP_
+#ifndef FASTDDS_DDS_CORE_POLICY__PARAMETERTYPES_HPP
+#define FASTDDS_DDS_CORE_POLICY__PARAMETERTYPES_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -28,15 +28,15 @@
 #include <fastcdr/cdr/fixed_size_string.hpp>
 
 #include <fastdds/dds/core/Types.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/common/SampleIdentity.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/common/Token.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/SampleIdentity.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/common/Token.hpp>
 
 #if HAVE_SECURITY
-#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.hpp>
 #endif // if HAVE_SECURITY
 
 namespace eprosima {
@@ -1897,4 +1897,4 @@ using ParameterEndpointSecurityInfo_t = fastdds::dds::ParameterEndpointSecurityI
 } //namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif // _FASTDDS_DDS_QOS_PARAMETERTYPES_HPP_
+#endif // FASTDDS_DDS_CORE_POLICY__PARAMETERTYPES_HPP
diff --git a/include/fastdds/dds/core/policy/QosPolicies.hpp b/include/fastdds/dds/core/policy/QosPolicies.hpp
index 3ab39e79600..ae37537a0f9 100644
--- a/include/fastdds/dds/core/policy/QosPolicies.hpp
+++ b/include/fastdds/dds/core/policy/QosPolicies.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_DDS_QOS_QOSPOLICIES_HPP_
-#define _FASTDDS_DDS_QOS_QOSPOLICIES_HPP_
+#ifndef FASTDDS_DDS_CORE_POLICY__QOSPOLICIES_HPP
+#define FASTDDS_DDS_CORE_POLICY__QOSPOLICIES_HPP
 
 #include <bitset>
 #include <vector>
@@ -27,13 +27,13 @@
 #include <fastdds/dds/core/Types.hpp>
 #include <fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp>
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/rtps/flowcontrol/FlowControllerConsts.hpp>
 #include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
@@ -3216,4 +3216,4 @@ class DataSharingQosPolicy : public Parameter_t, public QosPolicy
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_QOS_QOSPOLICIES_HPP_
+#endif // FASTDDS_DDS_CORE_POLICY__QOSPOLICIES_HPP
diff --git a/include/fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.hpp b/include/fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.hpp
index 8541d50bcf1..b74a00af47a 100644
--- a/include/fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.hpp
+++ b/include/fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.hpp
@@ -16,10 +16,10 @@
  * @file ReaderDataLifecycleQosPolicy.hpp
  */
 
-#ifndef _FASTDDS_READERDATALIFECYCLEQOSPOLICY_HPP_
-#define _FASTDDS_READERDATALIFECYCLEQOSPOLICY_HPP_
+#ifndef FASTDDS_DDS_CORE_POLICY__READERDATALIFECYCLEQOSPOLICY_HPP
+#define FASTDDS_DDS_CORE_POLICY__READERDATALIFECYCLEQOSPOLICY_HPP
 
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 
@@ -85,4 +85,4 @@ class ReaderDataLifecycleQosPolicy
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_READERDATALIFECYCLEQOSPOLICY_HPP_
+#endif // FASTDDS_DDS_CORE_POLICY__READERDATALIFECYCLEQOSPOLICY_HPP
diff --git a/include/fastdds/dds/core/policy/WriterDataLifecycleQosPolicy.hpp b/include/fastdds/dds/core/policy/WriterDataLifecycleQosPolicy.hpp
index 6f412f513c1..d46fb130f3a 100644
--- a/include/fastdds/dds/core/policy/WriterDataLifecycleQosPolicy.hpp
+++ b/include/fastdds/dds/core/policy/WriterDataLifecycleQosPolicy.hpp
@@ -16,8 +16,8 @@
  * @file WriterDataLifecycleQosPolicy.hpp
  */
 
-#ifndef _FASTDDS_WRITERDATALIFECYCLEQOSPOLICY_HPP_
-#define _FASTDDS_WRITERDATALIFECYCLEQOSPOLICY_HPP_
+#ifndef FASTDDS_DDS_CORE_POLICY__WRITERDATALIFECYCLEQOSPOLICY_HPP
+#define FASTDDS_DDS_CORE_POLICY__WRITERDATALIFECYCLEQOSPOLICY_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -67,4 +67,4 @@ class WriterDataLifecycleQosPolicy
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_WRITERDATALIFECYCLEQOSPOLICY_HPP_
+#endif // FASTDDS_DDS_CORE_POLICY__WRITERDATALIFECYCLEQOSPOLICY_HPP
diff --git a/include/fastdds/dds/core/status/BaseStatus.hpp b/include/fastdds/dds/core/status/BaseStatus.hpp
index 4ca105ac33f..90ab1702251 100644
--- a/include/fastdds/dds/core/status/BaseStatus.hpp
+++ b/include/fastdds/dds/core/status/BaseStatus.hpp
@@ -16,8 +16,8 @@
  * @file BaseStatus.hpp
  */
 
-#ifndef _FASTDDS_BASE_STATUS_HPP_
-#define _FASTDDS_BASE_STATUS_HPP_
+#ifndef FASTDDS_DDS_CORE_STATUS__BASESTATUS_HPP
+#define FASTDDS_DDS_CORE_STATUS__BASESTATUS_HPP
 
 #include <cstdint>
 
@@ -49,4 +49,4 @@ using LivelinessLostStatus = fastdds::dds::BaseStatus;
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_BASE_STATUS_HPP_
+#endif // FASTDDS_DDS_CORE_STATUS__BASESTATUS_HPP
diff --git a/include/fastdds/dds/core/status/DeadlineMissedStatus.hpp b/include/fastdds/dds/core/status/DeadlineMissedStatus.hpp
index 6adbcc30b16..df64e365ce7 100644
--- a/include/fastdds/dds/core/status/DeadlineMissedStatus.hpp
+++ b/include/fastdds/dds/core/status/DeadlineMissedStatus.hpp
@@ -16,8 +16,8 @@
  * @file DeadlineMissedStatus.hpp
  */
 
-#ifndef _FASTDDS_DDS_QOS_DEADLINEMISSEDSTATUS_HPP_
-#define _FASTDDS_DDS_QOS_DEADLINEMISSEDSTATUS_HPP_
+#ifndef FASTDDS_DDS_CORE_STATUS__DEADLINEMISSEDSTATUS_HPP
+#define FASTDDS_DDS_CORE_STATUS__DEADLINEMISSEDSTATUS_HPP
 
 #include <fastdds/dds/topic/TypeSupport.hpp>
 
@@ -62,4 +62,4 @@ typedef DeadlineMissedStatus RequestedDeadlineMissedStatus;
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_DDS_QOS_DEADLINEMISSEDSTATUS_HPP_
+#endif // FASTDDS_DDS_CORE_STATUS__DEADLINEMISSEDSTATUS_HPP
diff --git a/include/fastdds/dds/core/status/IncompatibleQosStatus.hpp b/include/fastdds/dds/core/status/IncompatibleQosStatus.hpp
index d9c1dbd216b..0875213e7d9 100644
--- a/include/fastdds/dds/core/status/IncompatibleQosStatus.hpp
+++ b/include/fastdds/dds/core/status/IncompatibleQosStatus.hpp
@@ -16,8 +16,8 @@
  * @file IncompatibleQosStatus.hpp
  */
 
-#ifndef _FASTDDS_INCOMPATIBLE_QOS_STATUS_HPP_
-#define _FASTDDS_INCOMPATIBLE_QOS_STATUS_HPP_
+#ifndef FASTDDS_DDS_CORE_STATUS__INCOMPATIBLEQOSSTATUS_HPP
+#define FASTDDS_DDS_CORE_STATUS__INCOMPATIBLEQOSSTATUS_HPP
 
 #include <cstdint>
 #include <vector>
@@ -93,4 +93,4 @@ using OfferedIncompatibleQosStatus = IncompatibleQosStatus;
 } //end of namespace fastdds
 } //end of namespace eprosima
 
-#endif // _FASTDDS_INCOMPATIBLE_QOS_STATUS_HPP_
+#endif // FASTDDS_DDS_CORE_STATUS__INCOMPATIBLEQOSSTATUS_HPP
diff --git a/include/fastdds/dds/core/status/LivelinessChangedStatus.hpp b/include/fastdds/dds/core/status/LivelinessChangedStatus.hpp
index db79a3ca758..a8014c062ac 100644
--- a/include/fastdds/dds/core/status/LivelinessChangedStatus.hpp
+++ b/include/fastdds/dds/core/status/LivelinessChangedStatus.hpp
@@ -16,8 +16,8 @@
  * @file LivelinessChangedStatus.hpp
  */
 
-#ifndef _FASTDDS_DDS_QOS_LIVELINESSCHANGEDSTATUS_HPP_
-#define _FASTDDS_DDS_QOS_LIVELINESSCHANGEDSTATUS_HPP_
+#ifndef FASTDDS_DDS_CORE_STATUS__LIVELINESSCHANGEDSTATUS_HPP
+#define FASTDDS_DDS_CORE_STATUS__LIVELINESSCHANGEDSTATUS_HPP
 
 #include <fastdds/dds/common/InstanceHandle.hpp>
 
@@ -56,4 +56,4 @@ struct LivelinessChangedStatus
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_DDS_QOS_LIVELINESSCHANGEDSTATUS_HPP_
+#endif // FASTDDS_DDS_CORE_STATUS__LIVELINESSCHANGEDSTATUS_HPP
diff --git a/include/fastdds/dds/core/status/MatchedStatus.hpp b/include/fastdds/dds/core/status/MatchedStatus.hpp
index 949fdef4781..356ee6539c5 100644
--- a/include/fastdds/dds/core/status/MatchedStatus.hpp
+++ b/include/fastdds/dds/core/status/MatchedStatus.hpp
@@ -16,8 +16,8 @@
  * @file MatchedStatus.hpp
  */
 
-#ifndef _MATCHED_STATUS_HPP_
-#define _MATCHED_STATUS_HPP_
+#ifndef FASTDDS_DDS_CORE_STATUS__MATCHEDSTATUS_HPP
+#define FASTDDS_DDS_CORE_STATUS__MATCHEDSTATUS_HPP
 
 #include <cstdint>
 
@@ -52,4 +52,4 @@ struct MatchedStatus
 } // namespace fastdds
 } // namespace eprosima
 
-#endif //_MATCHED_STATUS_HPP_
+#endif //FASTDDS_DDS_CORE_STATUS__MATCHEDSTATUS_HPP
diff --git a/include/fastdds/dds/core/status/PublicationMatchedStatus.hpp b/include/fastdds/dds/core/status/PublicationMatchedStatus.hpp
index aee0647d505..8525c583a07 100644
--- a/include/fastdds/dds/core/status/PublicationMatchedStatus.hpp
+++ b/include/fastdds/dds/core/status/PublicationMatchedStatus.hpp
@@ -16,8 +16,8 @@
  * @file PublicationMatchedStatus.hpp
  */
 
-#ifndef _PUBLICATION_MATCHED_STATUS_HPP_
-#define _PUBLICATION_MATCHED_STATUS_HPP_
+#ifndef FASTDDS_DDS_CORE_STATUS__PUBLICATIONMATCHEDSTATUS_HPP
+#define FASTDDS_DDS_CORE_STATUS__PUBLICATIONMATCHEDSTATUS_HPP
 
 #include <cstdint>
 #include <fastdds/dds/core/status/MatchedStatus.hpp>
@@ -38,4 +38,4 @@ struct PublicationMatchedStatus : public MatchedStatus
 } // namespace fastdds
 } // namespace eprosima
 
-#endif //_PUBLICATION_MATCHED_STATUS_HPP_
+#endif //FASTDDS_DDS_CORE_STATUS__PUBLICATIONMATCHEDSTATUS_HPP
diff --git a/include/fastdds/dds/core/status/SampleRejectedStatus.hpp b/include/fastdds/dds/core/status/SampleRejectedStatus.hpp
index f119804b9b8..57728c2aaea 100644
--- a/include/fastdds/dds/core/status/SampleRejectedStatus.hpp
+++ b/include/fastdds/dds/core/status/SampleRejectedStatus.hpp
@@ -16,8 +16,8 @@
  * @file SampleRejectedStatus.hpp
  */
 
-#ifndef _FASTDDS_DDS_QOS_SAMPLEREJECTEDSTATUS_HPP_
-#define _FASTDDS_DDS_QOS_SAMPLEREJECTEDSTATUS_HPP_
+#ifndef FASTDDS_DDS_CORE_STATUS__SAMPLEREJECTEDSTATUS_HPP
+#define FASTDDS_DDS_CORE_STATUS__SAMPLEREJECTEDSTATUS_HPP
 
 #include <cstdint>
 
@@ -69,4 +69,4 @@ struct SampleRejectedStatus
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_DDS_QOS_SAMPLEREJECTEDSTATUS_HPP_
+#endif // FASTDDS_DDS_CORE_STATUS__SAMPLEREJECTEDSTATUS_HPP
diff --git a/include/fastdds/dds/core/status/StatusMask.hpp b/include/fastdds/dds/core/status/StatusMask.hpp
index 6e21b87ca9f..90827572c43 100644
--- a/include/fastdds/dds/core/status/StatusMask.hpp
+++ b/include/fastdds/dds/core/status/StatusMask.hpp
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef _FASTDDS_STATUSMASK_HPP_
-#define _FASTDDS_STATUSMASK_HPP_
+#ifndef FASTDDS_DDS_CORE_STATUS__STATUSMASK_HPP
+#define FASTDDS_DDS_CORE_STATUS__STATUSMASK_HPP
 
 #include <fastdds/fastdds_dll.hpp>
 
@@ -267,4 +267,4 @@ class FASTDDS_EXPORTED_API StatusMask : public std::bitset<FASTDDS_STATUS_COUNT>
 } //namespace eprosima
 
 
-#endif //_FASTDDS_STATUSMASK_HPP_
+#endif //FASTDDS_DDS_CORE_STATUS__STATUSMASK_HPP
diff --git a/include/fastdds/dds/core/status/SubscriptionMatchedStatus.hpp b/include/fastdds/dds/core/status/SubscriptionMatchedStatus.hpp
index 7bcfba51f67..81312c25e88 100644
--- a/include/fastdds/dds/core/status/SubscriptionMatchedStatus.hpp
+++ b/include/fastdds/dds/core/status/SubscriptionMatchedStatus.hpp
@@ -16,8 +16,8 @@
  * @file SubscriptionMatchedStatus.hpp
  */
 
-#ifndef _SUBSCRIPTION_MATCHED_STATUS_HPP_
-#define _SUBSCRIPTION_MATCHED_STATUS_HPP_
+#ifndef FASTDDS_DDS_CORE_STATUS__SUBSCRIPTIONMATCHEDSTATUS_HPP
+#define FASTDDS_DDS_CORE_STATUS__SUBSCRIPTIONMATCHEDSTATUS_HPP
 
 #include <cstdint>
 
diff --git a/include/fastdds/dds/domain/DomainParticipant.hpp b/include/fastdds/dds/domain/DomainParticipant.hpp
index e359c38eab4..4b83b1509b0 100644
--- a/include/fastdds/dds/domain/DomainParticipant.hpp
+++ b/include/fastdds/dds/domain/DomainParticipant.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_DOMAIN_PARTICIPANT_HPP_
-#define _FASTDDS_DOMAIN_PARTICIPANT_HPP_
+#ifndef FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANT_HPP
+#define FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANT_HPP
 
 #include <functional>
 #include <string>
@@ -38,9 +38,9 @@
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TopicListener.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/SampleIdentity.h>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/SampleIdentity.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 namespace dds {
 namespace domain {
@@ -921,6 +921,6 @@ class DomainParticipant : public Entity
 
 } // namespace dds
 } // namespace fastdds
-} /* namespace eprosima */
+} // namespace eprosima
 
-#endif /* _FASTDDS_DOMAIN_PARTICIPANT_HPP_ */
+#endif // FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANT_HPP
diff --git a/include/fastdds/dds/domain/DomainParticipantFactory.hpp b/include/fastdds/dds/domain/DomainParticipantFactory.hpp
index 0dfe8b62048..721d622dcf1 100644
--- a/include/fastdds/dds/domain/DomainParticipantFactory.hpp
+++ b/include/fastdds/dds/domain/DomainParticipantFactory.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_
-#define _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_
+#ifndef FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTFACTORY_HPP
+#define FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTFACTORY_HPP
 
 #include <map>
 #include <memory>
@@ -414,4 +414,4 @@ class DomainParticipantFactory
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif /* _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_*/
+#endif // FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTFACTORY_HPP
diff --git a/include/fastdds/dds/domain/DomainParticipantListener.hpp b/include/fastdds/dds/domain/DomainParticipantListener.hpp
index ee210266cf2..083c8428e33 100644
--- a/include/fastdds/dds/domain/DomainParticipantListener.hpp
+++ b/include/fastdds/dds/domain/DomainParticipantListener.hpp
@@ -17,15 +17,15 @@
  *
  */
 
-#ifndef __FASTDDS__PARTICIPANT_PARTICIPANTLISTENER_HPP__
-#define __FASTDDS__PARTICIPANT_PARTICIPANTLISTENER_HPP__
+#ifndef FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTLISTENER_HPP
+#define FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTLISTENER_HPP
 
 #include <fastdds/dds/publisher/PublisherListener.hpp>
 #include <fastdds/dds/subscriber/SubscriberListener.hpp>
 #include <fastdds/dds/topic/TopicListener.hpp>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
-#include <fastdds/rtps/reader/ReaderDiscoveryInfo.h>
-#include <fastdds/rtps/writer/WriterDiscoveryInfo.h>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
+#include <fastdds/rtps/reader/ReaderDiscoveryInfo.hpp>
+#include <fastdds/rtps/writer/WriterDiscoveryInfo.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -137,4 +137,4 @@ class DomainParticipantListener :
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // __FASTDDS__PARTICIPANT_PARTICIPANTLISTENER_HPP__
+#endif // FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTLISTENER_HPP
diff --git a/include/fastdds/dds/domain/qos/DomainParticipantExtendedQos.hpp b/include/fastdds/dds/domain/qos/DomainParticipantExtendedQos.hpp
index eeaa9daad43..10e0691fbfc 100644
--- a/include/fastdds/dds/domain/qos/DomainParticipantExtendedQos.hpp
+++ b/include/fastdds/dds/domain/qos/DomainParticipantExtendedQos.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_PARTICIPANTEXTENDEDQOS_HPP_
-#define _FASTDDS_PARTICIPANTEXTENDEDQOS_HPP_
+#ifndef FASTDDS_DDS_DOMAIN_QOS__PARTICIPANTEXTENDEDQOS_HPP
+#define FASTDDS_DDS_DOMAIN_QOS__PARTICIPANTEXTENDEDQOS_HPP
 
 #include <fastdds/fastdds_dll.hpp>
 
@@ -95,8 +95,8 @@ class DomainParticipantExtendedQos : public DomainParticipantQos
 };
 
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_PARTICIPANTEXTENDEDQOS_HPP_ */
+#endif // FASTDDS_DDS_DOMAIN_QOS__PARTICIPANTEXTENDEDQOS_HPP
diff --git a/include/fastdds/dds/domain/qos/DomainParticipantFactoryQos.hpp b/include/fastdds/dds/domain/qos/DomainParticipantFactoryQos.hpp
index be0c1c1ccef..9785a1570fc 100644
--- a/include/fastdds/dds/domain/qos/DomainParticipantFactoryQos.hpp
+++ b/include/fastdds/dds/domain/qos/DomainParticipantFactoryQos.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_PARTICIPANTFACTORYQOS_HPP_
-#define _FASTDDS_PARTICIPANTFACTORYQOS_HPP_
+#ifndef FASTDDS_DDS_DOMAIN_QOS__DOMAINPARTICIPANTFACTORYQOS_HPP
+#define FASTDDS_DDS_DOMAIN_QOS__DOMAINPARTICIPANTFACTORYQOS_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
@@ -164,8 +164,8 @@ class DomainParticipantFactoryQos
 
 FASTDDS_EXPORTED_API extern const DomainParticipantFactoryQos PARTICIPANT_FACTORY_QOS_DEFAULT;
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_PARTICIPANTFACTORYQOS_HPP_ */
+#endif // FASTDDS_DDS_DOMAIN_QOS__DOMAINPARTICIPANTFACTORYQOS_HPP
diff --git a/include/fastdds/dds/domain/qos/DomainParticipantQos.hpp b/include/fastdds/dds/domain/qos/DomainParticipantQos.hpp
index 00ceb970ebc..e81d0e9c83d 100644
--- a/include/fastdds/dds/domain/qos/DomainParticipantQos.hpp
+++ b/include/fastdds/dds/domain/qos/DomainParticipantQos.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_PARTICIPANTQOS_HPP_
-#define _FASTDDS_PARTICIPANTQOS_HPP_
+#ifndef FASTDDS_DDS_DOMAIN_QOS__DOMAINPARTICIPANTQOS_HPP
+#define FASTDDS_DDS_DOMAIN_QOS__DOMAINPARTICIPANTQOS_HPP
 
 #include <string>
 
@@ -552,8 +552,8 @@ class DomainParticipantQos
 FASTDDS_EXPORTED_API extern const DomainParticipantQos PARTICIPANT_QOS_DEFAULT;
 
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_PARTICIPANTQOS_HPP_ */
+#endif // FASTDDS_DDS_DOMAIN_QOS__DOMAINPARTICIPANTQOS_HPP
diff --git a/include/fastdds/dds/domain/qos/ReplierQos.hpp b/include/fastdds/dds/domain/qos/ReplierQos.hpp
index 3b992a202b3..7c113747fcd 100644
--- a/include/fastdds/dds/domain/qos/ReplierQos.hpp
+++ b/include/fastdds/dds/domain/qos/ReplierQos.hpp
@@ -16,8 +16,8 @@
  * @file ReplierQos.hpp
  */
 
-#ifndef _FASTDDS_REPLIERQOS_HPP_
-#define _FASTDDS_REPLIERQOS_HPP_
+#ifndef FASTDDS_DDS_DOMAIN_QOS__REPLIERQOS_HPP
+#define FASTDDS_DDS_DOMAIN_QOS__REPLIERQOS_HPP
 
 #include <string>
 
@@ -73,8 +73,8 @@ class ReplierQos
     DataReaderQos reader_qos;
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_REPLIERQOS_HPP_ */
+#endif // FASTDDS_DDS_DOMAIN_QOS__REPLIERQOS_HPP
diff --git a/include/fastdds/dds/domain/qos/RequesterQos.hpp b/include/fastdds/dds/domain/qos/RequesterQos.hpp
index fb31447c4bc..a13bcb72ec8 100644
--- a/include/fastdds/dds/domain/qos/RequesterQos.hpp
+++ b/include/fastdds/dds/domain/qos/RequesterQos.hpp
@@ -16,8 +16,8 @@
  * @file RequesterQos.hpp
  */
 
-#ifndef _FASTDDS_REQUESTERQOS_HPP_
-#define _FASTDDS_REQUESTERQOS_HPP_
+#ifndef FASTDDS_DDS_DOMAIN_QOS__REQUESTERQOS_HPP
+#define FASTDDS_DDS_DOMAIN_QOS__REQUESTERQOS_HPP
 
 #include <string>
 
@@ -73,8 +73,8 @@ class RequesterQos
     DataReaderQos reader_qos;
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_REQUESTERQOS_HPP_ */
+#endif // FASTDDS_DDS_DOMAIN_QOS__REQUESTERQOS_HPP
diff --git a/include/fastdds/dds/log/Colors.hpp b/include/fastdds/dds/log/Colors.hpp
index 67ce4249da4..6e731384b0c 100644
--- a/include/fastdds/dds/log/Colors.hpp
+++ b/include/fastdds/dds/log/Colors.hpp
@@ -16,8 +16,8 @@
  * @file Colors.hpp
  */
 
-#ifndef _FASTDDS_DDS_LOG_COLORS_H_
-#define _FASTDDS_DDS_LOG_COLORS_H_
+#ifndef FASTDDS_DDS_LOG__COLORS_HPP
+#define FASTDDS_DDS_LOG__COLORS_HPP
 
 
 #if defined(_WIN32)
@@ -57,4 +57,4 @@
 #endif // if defined(_WIN32)
 
 
-#endif /* _FASTDDS_DDS_LOG_COLORS_H_ */
+#endif // FASTDDS_DDS_LOG__COLORS_HPP
diff --git a/include/fastdds/dds/log/FileConsumer.hpp b/include/fastdds/dds/log/FileConsumer.hpp
index 7bafbe1844a..19e2d1cf477 100644
--- a/include/fastdds/dds/log/FileConsumer.hpp
+++ b/include/fastdds/dds/log/FileConsumer.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_DDS_LOG_FILECONSUMER_HPP_
-#define _FASTDDS_DDS_LOG_FILECONSUMER_HPP_
+#ifndef FASTDDS_DDS_LOG__FILECONSUMER_HPP
+#define FASTDDS_DDS_LOG__FILECONSUMER_HPP
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/dds/log/OStreamConsumer.hpp>
@@ -69,4 +69,4 @@ class FileConsumer : public OStreamConsumer
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_LOG_FILECONSUMER_HPP_
+#endif // FASTDDS_DDS_LOG__FILECONSUMER_HPP
diff --git a/include/fastdds/dds/log/Log.hpp b/include/fastdds/dds/log/Log.hpp
index ccd5b1b63fc..af095a06e59 100644
--- a/include/fastdds/dds/log/Log.hpp
+++ b/include/fastdds/dds/log/Log.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#ifndef _FASTDDS_DDS_LOG_LOG_HPP_
-#define _FASTDDS_DDS_LOG_LOG_HPP_
+#ifndef FASTDDS_DDS_LOG__LOG_HPP
+#define FASTDDS_DDS_LOG__LOG_HPP
 
 #include <regex>
 #include <sstream>
@@ -393,4 +393,4 @@ class LogConsumer
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // ifndef _FASTDDS_DDS_LOG_LOG_HPP_
+#endif // FASTDDS_DDS_LOG__LOG_HPP
diff --git a/include/fastdds/dds/log/OStreamConsumer.hpp b/include/fastdds/dds/log/OStreamConsumer.hpp
index 50550671b28..24db7cdf0e1 100644
--- a/include/fastdds/dds/log/OStreamConsumer.hpp
+++ b/include/fastdds/dds/log/OStreamConsumer.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_DDS_LOG_OSTREAMCONSUMER_HPP_
-#define _FASTDDS_DDS_LOG_OSTREAMCONSUMER_HPP_
+#ifndef FASTDDS_DDS_LOG__OSTREAMCONSUMER_HPP
+#define FASTDDS_DDS_LOG__OSTREAMCONSUMER_HPP
 
 #include <iostream>
 
@@ -55,4 +55,4 @@ class OStreamConsumer : public LogConsumer
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // ifndef _FASTDDS_DDS_LOG_OSTREAMCONSUMER_HPP_
+#endif // FASTDDS_DDS_LOG__OSTREAMCONSUMER_HPP
diff --git a/include/fastdds/dds/log/StdoutConsumer.hpp b/include/fastdds/dds/log/StdoutConsumer.hpp
index f1a73f443a7..eb0af617bdd 100644
--- a/include/fastdds/dds/log/StdoutConsumer.hpp
+++ b/include/fastdds/dds/log/StdoutConsumer.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_DDS_LOG_STDOUTCONSUMER_HPP_
-#define _FASTDDS_DDS_LOG_STDOUTCONSUMER_HPP_
+#ifndef FASTDDS_DDS_LOG__STDOUTCONSUMER_HPP
+#define FASTDDS_DDS_LOG__STDOUTCONSUMER_HPP
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/dds/log/OStreamConsumer.hpp>
@@ -42,4 +42,4 @@ class StdoutConsumer : public OStreamConsumer
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // ifndef _FASTDDS_DDS_LOG_STDOUTCONSUMER_HPP_
+#endif // FASTDDS_DDS_LOG__STDOUTCONSUMER_HPP
diff --git a/include/fastdds/dds/log/StdoutErrConsumer.hpp b/include/fastdds/dds/log/StdoutErrConsumer.hpp
index 1f71506f420..650a7ee762f 100644
--- a/include/fastdds/dds/log/StdoutErrConsumer.hpp
+++ b/include/fastdds/dds/log/StdoutErrConsumer.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_DDS_LOG_STDOUTERRCONSUMER_HPP_
-#define _FASTDDS_DDS_LOG_STDOUTERRCONSUMER_HPP_
+#ifndef FASTDDS_DDS_LOG__STDOUTERRCONSUMER_HPP
+#define FASTDDS_DDS_LOG__STDOUTERRCONSUMER_HPP
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/dds/log/OStreamConsumer.hpp>
@@ -77,4 +77,4 @@ class StdoutErrConsumer : public OStreamConsumer
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // ifndef _FASTDDS_DDS_LOG_STDOUTERRCONSUMER_HPP_
+#endif // FASTDDS_DDS_LOG__STDOUTERRCONSUMER_HPP
diff --git a/include/fastdds/dds/publisher/DataWriter.hpp b/include/fastdds/dds/publisher/DataWriter.hpp
index 649e23ce611..ac12afe2928 100644
--- a/include/fastdds/dds/publisher/DataWriter.hpp
+++ b/include/fastdds/dds/publisher/DataWriter.hpp
@@ -16,8 +16,8 @@
  * @file DataWriter.hpp
  */
 
-#ifndef _FASTDDS_DDS_PUBLISHER_DATAWRITER_HPP_
-#define _FASTDDS_DDS_PUBLISHER_DATAWRITER_HPP_
+#ifndef FASTDDS_DDS_PUBLISHER__DATAWRITER_HPP
+#define FASTDDS_DDS_PUBLISHER__DATAWRITER_HPP
 
 #include <fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.hpp>
 #include <fastdds/dds/core/Entity.hpp>
@@ -29,7 +29,7 @@
 #include <fastdds/dds/core/status/StatusMask.hpp>
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 #include <fastdds/fastdds_dll.hpp>
 
 namespace eprosima {
@@ -589,8 +589,8 @@ class DataWriter : public DomainEntity
     DataWriterImpl* impl_;
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif // _FASTDDS_DDS_PUBLISHER_DATAWRITER_HPP_
+#endif // FASTDDS_DDS_PUBLISHER__DATAWRITER_HPP
diff --git a/include/fastdds/dds/publisher/DataWriterListener.hpp b/include/fastdds/dds/publisher/DataWriterListener.hpp
index b75bf6bbcc1..65d0a152e72 100644
--- a/include/fastdds/dds/publisher/DataWriterListener.hpp
+++ b/include/fastdds/dds/publisher/DataWriterListener.hpp
@@ -16,10 +16,10 @@
  * @file DataWriterListener.hpp
  */
 
-#ifndef _FASTDDS_DATAWRITERLISTENER_HPP_
-#define _FASTDDS_DATAWRITERLISTENER_HPP_
+#ifndef FASTDDS_DDS_PUBLISHER__DATAWRITERLISTENER_HPP
+#define FASTDDS_DDS_PUBLISHER__DATAWRITERLISTENER_HPP
 
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/dds/core/status/BaseStatus.hpp>
 #include <fastdds/dds/core/status/PublicationMatchedStatus.hpp>
 #include <fastdds/dds/core/status/IncompatibleQosStatus.hpp>
@@ -125,8 +125,8 @@ class FASTDDS_EXPORTED_API DataWriterListener
 
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_DATAWRITERLISTENER_HPP_ */
+#endif // FASTDDS_DDS_PUBLISHER__DATAWRITERLISTENER_HPP
diff --git a/include/fastdds/dds/publisher/Publisher.hpp b/include/fastdds/dds/publisher/Publisher.hpp
index 6de57deb2a0..0ee45f78fe9 100644
--- a/include/fastdds/dds/publisher/Publisher.hpp
+++ b/include/fastdds/dds/publisher/Publisher.hpp
@@ -17,15 +17,15 @@
  *
  */
 
-#ifndef _FASTDDS_PUBLISHER_HPP_
-#define _FASTDDS_PUBLISHER_HPP_
+#ifndef FASTDDS_DDS_PUBLISHER__PUBLISHER_HPP
+#define FASTDDS_DDS_PUBLISHER__PUBLISHER_HPP
 
 #include <fastdds/dds/core/Entity.hpp>
 #include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/publisher/qos/PublisherQos.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 #include <fastdds/fastdds_dll.hpp>
 
@@ -375,8 +375,8 @@ class Publisher : public DomainEntity
     friend class ::dds::pub::Publisher;
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_PUBLISHER_HPP_ */
+#endif // FASTDDS_DDS_PUBLISHER__PUBLISHER_HPP
diff --git a/include/fastdds/dds/publisher/PublisherListener.hpp b/include/fastdds/dds/publisher/PublisherListener.hpp
index 2a27ae26d57..2bfec5337a3 100644
--- a/include/fastdds/dds/publisher/PublisherListener.hpp
+++ b/include/fastdds/dds/publisher/PublisherListener.hpp
@@ -16,8 +16,8 @@
  * @file PublisherListener.hpp
  */
 
-#ifndef _FASTDDS_PUBLISHERLISTENER_HPP_
-#define _FASTDDS_PUBLISHERLISTENER_HPP_
+#ifndef FASTDDS_DDS_PUBLISHER__PUBLISHERLISTENER_HPP
+#define FASTDDS_DDS_PUBLISHER__PUBLISHERLISTENER_HPP
 
 #include <fastdds/dds/core/status/BaseStatus.hpp>
 #include <fastdds/dds/core/status/DeadlineMissedStatus.hpp>
@@ -55,8 +55,8 @@ class PublisherListener : public DataWriterListener
 
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_PUBLISHERLISTENER_HPP_ */
+#endif // FASTDDS_DDS_PUBLISHER__PUBLISHERLISTENER_HPP
diff --git a/include/fastdds/dds/publisher/qos/DataWriterQos.hpp b/include/fastdds/dds/publisher/qos/DataWriterQos.hpp
index 0c0cd2a275f..bd2531ce972 100644
--- a/include/fastdds/dds/publisher/qos/DataWriterQos.hpp
+++ b/include/fastdds/dds/publisher/qos/DataWriterQos.hpp
@@ -17,8 +17,8 @@
  */
 
 
-#ifndef _FASTDDS_DATAWRITERQOS_HPP
-#define _FASTDDS_DATAWRITERQOS_HPP
+#ifndef FASTDDS_DDS_PUBLISHER_QOS__DATAWRITERQOS_HPP
+#define FASTDDS_DDS_PUBLISHER_QOS__DATAWRITERQOS_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
@@ -27,7 +27,7 @@
 #include <fastdds/dds/publisher/qos/PublisherQos.hpp>
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -883,4 +883,4 @@ FASTDDS_EXPORTED_API extern const DataWriterQos DATAWRITER_QOS_USE_TOPIC_QOS;
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DATAWRITERQOS_HPP
+#endif // FASTDDS_DDS_PUBLISHER_QOS__DATAWRITERQOS_HPP
diff --git a/include/fastdds/dds/publisher/qos/PublisherQos.hpp b/include/fastdds/dds/publisher/qos/PublisherQos.hpp
index 42e12a8e0ad..6e6bcbd7d9a 100644
--- a/include/fastdds/dds/publisher/qos/PublisherQos.hpp
+++ b/include/fastdds/dds/publisher/qos/PublisherQos.hpp
@@ -17,8 +17,8 @@
  */
 
 
-#ifndef _FASTDDS_PUBLISHERQOS_HPP_
-#define _FASTDDS_PUBLISHERQOS_HPP_
+#ifndef FASTDDS_DDS_PUBLISHER_QOS__PUBLISHERQOS_HPP
+#define FASTDDS_DDS_PUBLISHER_QOS__PUBLISHERQOS_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 
@@ -206,4 +206,4 @@ FASTDDS_EXPORTED_API extern const PublisherQos PUBLISHER_QOS_DEFAULT;
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_PUBLISHERQOS_HPP_
+#endif // FASTDDS_DDS_PUBLISHER_QOS__PUBLISHERQOS_HPP
diff --git a/include/fastdds/dds/publisher/qos/WriterQos.hpp b/include/fastdds/dds/publisher/qos/WriterQos.hpp
index 337f44769ea..32a4a984f56 100644
--- a/include/fastdds/dds/publisher/qos/WriterQos.hpp
+++ b/include/fastdds/dds/publisher/qos/WriterQos.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_DDS_QOS_WRITERQOS_HPP_
-#define _FASTDDS_DDS_QOS_WRITERQOS_HPP_
+#ifndef FASTDDS_DDS_PUBLISHER_QOS__WRITERQOS_HPP
+#define FASTDDS_DDS_PUBLISHER_QOS__WRITERQOS_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 
@@ -155,4 +155,4 @@ class WriterQos
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_DDS_QOS_WRITERQOS_HPP_
+#endif // FASTDDS_DDS_PUBLISHER_QOS__WRITERQOS_HPP
diff --git a/include/fastdds/dds/subscriber/DataReader.hpp b/include/fastdds/dds/subscriber/DataReader.hpp
index f72e651af6b..522d1c93a1b 100644
--- a/include/fastdds/dds/subscriber/DataReader.hpp
+++ b/include/fastdds/dds/subscriber/DataReader.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_DDS_SUBSCRIBER_DATAREADER_HPP_
-#define _FASTDDS_DDS_SUBSCRIBER_DATAREADER_HPP_
+#ifndef FASTDDS_DDS_SUBSCRIBER__DATAREADER_HPP
+#define FASTDDS_DDS_SUBSCRIBER__DATAREADER_HPP
 
 #include <cstdint>
 #include <vector>
@@ -41,7 +41,7 @@
 #include <fastdds/fastdds_dll.hpp>
 
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 namespace dds {
 namespace sub {
@@ -1084,8 +1084,8 @@ class DataReader : public DomainEntity
 
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_DDS_SUBSCRIBER_DATAREADER_HPP_*/
+#endif // FASTDDS_DDS_SUBSCRIBER__DATAREADER_HPP
diff --git a/include/fastdds/dds/subscriber/DataReaderListener.hpp b/include/fastdds/dds/subscriber/DataReaderListener.hpp
index aad9d3c3574..e63f6b02480 100644
--- a/include/fastdds/dds/subscriber/DataReaderListener.hpp
+++ b/include/fastdds/dds/subscriber/DataReaderListener.hpp
@@ -16,8 +16,8 @@
  * @file DataReaderListener.hpp
  */
 
-#ifndef _FASTDDS_DATAREADERLISTENER_HPP_
-#define _FASTDDS_DATAREADERLISTENER_HPP_
+#ifndef FASTDDS_DDS_SUBSCRIBER__DATAREADERLISTENER_HPP
+#define FASTDDS_DDS_SUBSCRIBER__DATAREADERLISTENER_HPP
 
 #include <fastdds/dds/core/status/BaseStatus.hpp>
 #include <fastdds/dds/core/status/DeadlineMissedStatus.hpp>
@@ -152,8 +152,8 @@ class DataReaderListener
 
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_DATAREADERLISTENER_HPP_ */
+#endif // FASTDDS_DDS_SUBSCRIBER__DATAREADERLISTENER_HPP
diff --git a/include/fastdds/dds/subscriber/InstanceState.hpp b/include/fastdds/dds/subscriber/InstanceState.hpp
index 15d2b030409..65e14fe6cb2 100644
--- a/include/fastdds/dds/subscriber/InstanceState.hpp
+++ b/include/fastdds/dds/subscriber/InstanceState.hpp
@@ -16,8 +16,8 @@
  * @file InstanceState.hpp
  */
 
-#ifndef _FASTDDS_DDS_SUBSCRIBER_INSTANCESTATE_HPP_
-#define _FASTDDS_DDS_SUBSCRIBER_INSTANCESTATE_HPP_
+#ifndef FASTDDS_DDS_SUBSCRIBER__INSTANCESTATE_HPP
+#define FASTDDS_DDS_SUBSCRIBER__INSTANCESTATE_HPP
 
 #include <cstdint>
 
@@ -84,4 +84,4 @@ constexpr InstanceStateMask ANY_INSTANCE_STATE = ALIVE_INSTANCE_STATE | NOT_ALIV
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // _FASTDDS_DDS_SUBSCRIBER_INSTANCESTATE_HPP_
+#endif  // FASTDDS_DDS_SUBSCRIBER__INSTANCESTATE_HPP
diff --git a/include/fastdds/dds/subscriber/ReadCondition.hpp b/include/fastdds/dds/subscriber/ReadCondition.hpp
index 7e79732b308..ff2c7c8ac14 100644
--- a/include/fastdds/dds/subscriber/ReadCondition.hpp
+++ b/include/fastdds/dds/subscriber/ReadCondition.hpp
@@ -16,8 +16,8 @@
  * @file ReadCondition.hpp
  */
 
-#ifndef _FASTDDS_DDS_SUBSCRIBER_READCONDITION_HPP_
-#define _FASTDDS_DDS_SUBSCRIBER_READCONDITION_HPP_
+#ifndef FASTDDS_DDS_SUBSCRIBER__READCONDITION_HPP
+#define FASTDDS_DDS_SUBSCRIBER__READCONDITION_HPP
 
 #include <cassert>
 
@@ -123,4 +123,4 @@ class ReadCondition : public Condition
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_SUBSCRIBER_READCONDITION_HPP_
+#endif // FASTDDS_DDS_SUBSCRIBER__READCONDITION_HPP
diff --git a/include/fastdds/dds/subscriber/SampleInfo.hpp b/include/fastdds/dds/subscriber/SampleInfo.hpp
index 3a4329deab1..66a41d31880 100644
--- a/include/fastdds/dds/subscriber/SampleInfo.hpp
+++ b/include/fastdds/dds/subscriber/SampleInfo.hpp
@@ -17,17 +17,17 @@
  *
  */
 
-#ifndef _FASTDDS_DDS_SUBSCRIBER_SAMPLEINFO_HPP_
-#define _FASTDDS_DDS_SUBSCRIBER_SAMPLEINFO_HPP_
+#ifndef FASTDDS_DDS_SUBSCRIBER__SAMPLEINFO_HPP
+#define FASTDDS_DDS_SUBSCRIBER__SAMPLEINFO_HPP
 
 #include <fastdds/dds/subscriber/InstanceState.hpp>
 #include <fastdds/dds/subscriber/SampleState.hpp>
 #include <fastdds/dds/subscriber/ViewState.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
 
-#include <fastdds/rtps/common/SampleIdentity.h>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/SampleIdentity.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/dds/common/InstanceHandle.hpp>
 
 namespace eprosima {
@@ -93,4 +93,4 @@ struct SampleInfo
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif /* _FASTDDS_DDS_SUBSCRIBER_SAMPLEINFO_HPP_*/
+#endif // FASTDDS_DDS_SUBSCRIBER__SAMPLEINFO_HPP
diff --git a/include/fastdds/dds/subscriber/SampleState.hpp b/include/fastdds/dds/subscriber/SampleState.hpp
index 04d144aaacd..658d850fdd8 100644
--- a/include/fastdds/dds/subscriber/SampleState.hpp
+++ b/include/fastdds/dds/subscriber/SampleState.hpp
@@ -16,8 +16,8 @@
  * @file SampleState.hpp
  */
 
-#ifndef _FASTDDS_DDS_SUBSCRIBER_SAMPLESTATE_HPP_
-#define _FASTDDS_DDS_SUBSCRIBER_SAMPLESTATE_HPP_
+#ifndef FASTDDS_DDS_SUBSCRIBER__SAMPLESTATE_HPP
+#define FASTDDS_DDS_SUBSCRIBER__SAMPLESTATE_HPP
 
 #include <cstdint>
 
@@ -57,4 +57,4 @@ constexpr SampleStateMask ANY_SAMPLE_STATE = READ_SAMPLE_STATE | NOT_READ_SAMPLE
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // _FASTDDS_DDS_SUBSCRIBER_SAMPLESTATE_HPP_
+#endif  // FASTDDS_DDS_SUBSCRIBER__SAMPLESTATE_HPP
diff --git a/include/fastdds/dds/subscriber/Subscriber.hpp b/include/fastdds/dds/subscriber/Subscriber.hpp
index b74a6366e6f..a69c981a356 100644
--- a/include/fastdds/dds/subscriber/Subscriber.hpp
+++ b/include/fastdds/dds/subscriber/Subscriber.hpp
@@ -16,8 +16,8 @@
  * @file Subscriber.hpp
  */
 
-#ifndef _FASTDDS_SUBSCRIBER_HPP_
-#define _FASTDDS_SUBSCRIBER_HPP_
+#ifndef FASTDDS_DDS_SUBSCRIBER__SUBSCRIBER_HPP
+#define FASTDDS_DDS_SUBSCRIBER__SUBSCRIBER_HPP
 
 #include <fastdds/dds/core/Entity.hpp>
 #include <fastdds/dds/core/ReturnCode.hpp>
@@ -392,8 +392,8 @@ class Subscriber : public DomainEntity
     friend class ::dds::sub::Subscriber;
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_SUBSCRIBER_HPP_ */
+#endif // FASTDDS_DDS_SUBSCRIBER__SUBSCRIBER_HPP
diff --git a/include/fastdds/dds/subscriber/SubscriberListener.hpp b/include/fastdds/dds/subscriber/SubscriberListener.hpp
index c70af5f5f8e..12a7804b884 100644
--- a/include/fastdds/dds/subscriber/SubscriberListener.hpp
+++ b/include/fastdds/dds/subscriber/SubscriberListener.hpp
@@ -16,8 +16,8 @@
  * @file SubscriberListener.hpp
  */
 
-#ifndef _FASTDDS_SUBLISTENER_HPP_
-#define _FASTDDS_SUBLISTENER_HPP_
+#ifndef FASTDDS_DDS_SUBSCRIBER__SUBSCRIBERLISTENER_HPP
+#define FASTDDS_DDS_SUBSCRIBER__SUBSCRIBERLISTENER_HPP
 
 #include <fastdds/dds/core/status/DeadlineMissedStatus.hpp>
 #include <fastdds/dds/core/status/LivelinessChangedStatus.hpp>
@@ -69,8 +69,8 @@ class SubscriberListener : public DataReaderListener
 
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_SUBLISTENER_HPP_ */
+#endif // FASTDDS_DDS_SUBSCRIBER__SUBSCRIBERLISTENER_HPP
diff --git a/include/fastdds/dds/subscriber/ViewState.hpp b/include/fastdds/dds/subscriber/ViewState.hpp
index 23615fc2af7..7b582a6000d 100644
--- a/include/fastdds/dds/subscriber/ViewState.hpp
+++ b/include/fastdds/dds/subscriber/ViewState.hpp
@@ -16,8 +16,8 @@
  * @file ViewState.hpp
  */
 
-#ifndef _FASTDDS_DDS_SUBSCRIBER_VIEWSTATE_HPP_
-#define _FASTDDS_DDS_SUBSCRIBER_VIEWSTATE_HPP_
+#ifndef FASTDDS_DDS_SUBSCRIBER__VIEWSTATE_HPP
+#define FASTDDS_DDS_SUBSCRIBER__VIEWSTATE_HPP
 
 #include <cstdint>
 
@@ -68,4 +68,4 @@ constexpr ViewStateMask ANY_VIEW_STATE = NEW_VIEW_STATE | NOT_NEW_VIEW_STATE;
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // _FASTDDS_DDS_SUBSCRIBER_VIEWSTATE_HPP_
+#endif  // FASTDDS_DDS_SUBSCRIBER__VIEWSTATE_HPP
diff --git a/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp b/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp
index 17339fd2c2d..60c75f41862 100644
--- a/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp
+++ b/include/fastdds/dds/subscriber/qos/DataReaderQos.hpp
@@ -17,15 +17,15 @@
  */
 
 
-#ifndef _FASTDDS_DATAREADERQOS_HPP
-#define _FASTDDS_DATAREADERQOS_HPP
+#ifndef FASTDDS_DDS_SUBSCRIBER_QOS__DATAREADERQOS_HPP
+#define FASTDDS_DDS_SUBSCRIBER_QOS__DATAREADERQOS_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/core/policy/ReaderDataLifecycleQosPolicy.hpp>
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
 #include <fastdds/dds/subscriber/qos/SubscriberQos.hpp>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastdds/rtps/attributes/TopicAttributes.h>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
 #include <fastdds/fastdds_dll.hpp>
 
 namespace eprosima {
@@ -922,4 +922,4 @@ FASTDDS_EXPORTED_API extern const DataReaderQos DATAREADER_QOS_USE_TOPIC_QOS;
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DATAREADERQOS_HPP
+#endif // FASTDDS_DDS_SUBSCRIBER_QOS__DATAREADERQOS_HPP
diff --git a/include/fastdds/dds/subscriber/qos/ReaderQos.hpp b/include/fastdds/dds/subscriber/qos/ReaderQos.hpp
index ac8a42a9126..2dea625e4ea 100644
--- a/include/fastdds/dds/subscriber/qos/ReaderQos.hpp
+++ b/include/fastdds/dds/subscriber/qos/ReaderQos.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_DDS_QOS_READERQOS_HPP_
-#define _FASTDDS_DDS_QOS_READERQOS_HPP_
+#ifndef FASTDDS_DDS_SUBSCRIBER_QOS__READERQOS_HPP
+#define FASTDDS_DDS_SUBSCRIBER_QOS__READERQOS_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 
@@ -156,4 +156,4 @@ class ReaderQos
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_DDS_QOS_READERQOS_HPP_
+#endif // FASTDDS_DDS_SUBSCRIBER_QOS__READERQOS_HPP
diff --git a/include/fastdds/dds/subscriber/qos/SubscriberQos.hpp b/include/fastdds/dds/subscriber/qos/SubscriberQos.hpp
index 11c74a871c9..07853085106 100644
--- a/include/fastdds/dds/subscriber/qos/SubscriberQos.hpp
+++ b/include/fastdds/dds/subscriber/qos/SubscriberQos.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_SUBSCRIBERQOS_HPP_
-#define _FASTDDS_SUBSCRIBERQOS_HPP_
+#ifndef FASTDDS_DDS_SUBSCRIBER_QOS__SUBSCRIBERQOS_HPP
+#define FASTDDS_DDS_SUBSCRIBER_QOS__SUBSCRIBERQOS_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 
@@ -203,8 +203,8 @@ class SubscriberQos
 FASTDDS_EXPORTED_API extern const SubscriberQos SUBSCRIBER_QOS_DEFAULT;
 
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_SUBSCRIBERQOS_HPP_ */
+#endif // FASTDDS_DDS_SUBSCRIBER_QOS__SUBSCRIBERQOS_HPP
diff --git a/include/fastdds/dds/topic/ContentFilteredTopic.hpp b/include/fastdds/dds/topic/ContentFilteredTopic.hpp
index bda635de270..42392ceb9bf 100644
--- a/include/fastdds/dds/topic/ContentFilteredTopic.hpp
+++ b/include/fastdds/dds/topic/ContentFilteredTopic.hpp
@@ -16,8 +16,8 @@
  * @file ContentFilteredTopic.hpp
  */
 
-#ifndef _FASTDDS_DDS_TOPIC_CONTENTFILTEREDTOPIC_HPP_
-#define _FASTDDS_DDS_TOPIC_CONTENTFILTEREDTOPIC_HPP_
+#ifndef FASTDDS_DDS_TOPIC__CONTENTFILTEREDTOPIC_HPP
+#define FASTDDS_DDS_TOPIC__CONTENTFILTEREDTOPIC_HPP
 
 #include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/topic/TopicDescription.hpp>
@@ -141,4 +141,4 @@ class ContentFilteredTopic : public TopicDescription
 } // namespace fastdds
 } // namespace eprosima
 
-#endif  // _FASTDDS_DDS_TOPIC_CONTENTFILTEREDTOPIC_HPP_
+#endif  // FASTDDS_DDS_TOPIC__CONTENTFILTEREDTOPIC_HPP
diff --git a/include/fastdds/dds/topic/IContentFilter.hpp b/include/fastdds/dds/topic/IContentFilter.hpp
index e490d9698f6..9725549c9ad 100644
--- a/include/fastdds/dds/topic/IContentFilter.hpp
+++ b/include/fastdds/dds/topic/IContentFilter.hpp
@@ -16,14 +16,14 @@
  * @file IContentFilter.hpp
  */
 
-#ifndef _FASTDDS_DDS_TOPIC_ICONTENTFILTER_HPP_
-#define _FASTDDS_DDS_TOPIC_ICONTENTFILTER_HPP_
+#ifndef FASTDDS_DDS_TOPIC__ICONTENTFILTER_HPP
+#define FASTDDS_DDS_TOPIC__ICONTENTFILTER_HPP
 
 #include <fastdds/fastdds_dll.hpp>
 
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/SampleIdentity.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/SampleIdentity.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -70,4 +70,4 @@ struct IContentFilter
 } // namespace fastdds
 } // namespace eprosima
 
-#endif  // _FASTDDS_DDS_TOPIC_ICONTENTFILTER_HPP_
+#endif  // FASTDDS_DDS_TOPIC__ICONTENTFILTER_HPP
diff --git a/include/fastdds/dds/topic/IContentFilterFactory.hpp b/include/fastdds/dds/topic/IContentFilterFactory.hpp
index b61219d4151..02705f2cd56 100644
--- a/include/fastdds/dds/topic/IContentFilterFactory.hpp
+++ b/include/fastdds/dds/topic/IContentFilterFactory.hpp
@@ -16,8 +16,8 @@
  * @file IContentFilter.hpp
  */
 
-#ifndef _FASTDDS_DDS_TOPIC_ICONTENTFILTERFACTORY_HPP_
-#define _FASTDDS_DDS_TOPIC_ICONTENTFILTERFACTORY_HPP_
+#ifndef FASTDDS_DDS_TOPIC__ICONTENTFILTERFACTORY_HPP
+#define FASTDDS_DDS_TOPIC__ICONTENTFILTERFACTORY_HPP
 
 #include <fastdds/fastdds_dll.hpp>
 
@@ -90,4 +90,4 @@ struct IContentFilterFactory
 } // namespace fastdds
 } // namespace eprosima
 
-#endif  // _FASTDDS_DDS_TOPIC_ICONTENTFILTERFACTORY_HPP_
+#endif  // FASTDDS_DDS_TOPIC__ICONTENTFILTERFACTORY_HPP
diff --git a/include/fastdds/dds/topic/Topic.hpp b/include/fastdds/dds/topic/Topic.hpp
index c10e34f9793..5cca635de3b 100644
--- a/include/fastdds/dds/topic/Topic.hpp
+++ b/include/fastdds/dds/topic/Topic.hpp
@@ -16,8 +16,8 @@
  * @file Topic.hpp
  */
 
-#ifndef _FASTDDS_TOPIC_HPP_
-#define _FASTDDS_TOPIC_HPP_
+#ifndef FASTDDS_DDS_TOPIC__TOPIC_HPP
+#define FASTDDS_DDS_TOPIC__TOPIC_HPP
 
 #include <fastdds/fastdds_dll.hpp>
 #include <fastdds/dds/core/Entity.hpp>
@@ -149,8 +149,8 @@ class Topic : public DomainEntity, public TopicDescription
 
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_TOPIC_HPP_ */
+#endif // FASTDDS_DDS_TOPIC__TOPIC_HPP
diff --git a/include/fastdds/dds/topic/TopicDataType.hpp b/include/fastdds/dds/topic/TopicDataType.hpp
index 5569448ce86..9ccc798a347 100644
--- a/include/fastdds/dds/topic/TopicDataType.hpp
+++ b/include/fastdds/dds/topic/TopicDataType.hpp
@@ -16,8 +16,8 @@
  * @file TopicDataType.hpp
  */
 
-#ifndef _FASTDDS_TOPICDATATYPE_HPP_
-#define _FASTDDS_TOPICDATATYPE_HPP_
+#ifndef FASTDDS_DDS_TOPIC__TOPICDATATYPE_HPP
+#define FASTDDS_DDS_TOPIC__TOPICDATATYPE_HPP
 
 #include <functional>
 #include <memory>
@@ -27,9 +27,9 @@
 #include <fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.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/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 // This version of TypeSupport has `is_bounded()`
 #define TOPIC_DATA_TYPE_API_HAS_IS_BOUNDED
@@ -279,8 +279,8 @@ class TopicDataType
 
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_TOPICDATATYPE_HPP_ */
+#endif // FASTDDS_DDS_TOPIC__TOPICDATATYPE_HPP
diff --git a/include/fastdds/dds/topic/TopicDescription.hpp b/include/fastdds/dds/topic/TopicDescription.hpp
index 656e70b6675..a5054d51eec 100644
--- a/include/fastdds/dds/topic/TopicDescription.hpp
+++ b/include/fastdds/dds/topic/TopicDescription.hpp
@@ -16,8 +16,8 @@
  * @file TopicDescription.hpp
  */
 
-#ifndef _FASTDDS_TOPIC_DESCRIPTION_HPP_
-#define _FASTDDS_TOPIC_DESCRIPTION_HPP_
+#ifndef FASTDDS_DDS_TOPIC__TOPICDESCRIPTION_HPP
+#define FASTDDS_DDS_TOPIC__TOPICDESCRIPTION_HPP
 
 #include <string>
 
@@ -90,8 +90,8 @@ class TopicDescription
     std::string type_name_;
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_TOPIC_DESCRIPTION_HPP_ */
+#endif // FASTDDS_DDS_TOPIC__TOPICDESCRIPTION_HPP
diff --git a/include/fastdds/dds/topic/TopicListener.hpp b/include/fastdds/dds/topic/TopicListener.hpp
index 6f5dd31a482..90d52de76cd 100644
--- a/include/fastdds/dds/topic/TopicListener.hpp
+++ b/include/fastdds/dds/topic/TopicListener.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file SubscriberListener.hpp
+ * @file TopicListener.hpp
  */
 
-#ifndef _FASTDDS_TOPICLISTENER_HPP_
-#define _FASTDDS_TOPICLISTENER_HPP_
+#ifndef FASTDDS_DDS_TOPIC__TOPICLISTENER_HPP
+#define FASTDDS_DDS_TOPIC__TOPICLISTENER_HPP
 
 #include <fastdds/fastdds_dll.hpp>
 #include <fastdds/dds/core/status/BaseStatus.hpp>
@@ -68,8 +68,8 @@ class FASTDDS_EXPORTED_API TopicListener
 
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_TOPICLISTENER_HPP_ */
+#endif // FASTDDS_DDS_TOPIC__TOPICLISTENER_HPP
diff --git a/include/fastdds/dds/topic/TypeSupport.hpp b/include/fastdds/dds/topic/TypeSupport.hpp
index 8341f47982f..951123ead71 100644
--- a/include/fastdds/dds/topic/TypeSupport.hpp
+++ b/include/fastdds/dds/topic/TypeSupport.hpp
@@ -16,8 +16,8 @@
  * @file TypeSupport.hpp
  */
 
-#ifndef _FASTDDS_TYPE_SUPPORT_HPP_
-#define _FASTDDS_TYPE_SUPPORT_HPP_
+#ifndef FASTDDS_DDS_TOPIC__TYPESUPPORT_HPP
+#define FASTDDS_DDS_TOPIC__TYPESUPPORT_HPP
 
 #include <string>
 #include <functional>
@@ -291,8 +291,8 @@ class TypeSupport : public std::shared_ptr<TopicDataType>
 
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_TYPE_SUPPORT_HPP_ */
+#endif // FASTDDS_DDS_TOPIC__TYPESUPPORT_HPP
diff --git a/include/fastdds/dds/topic/qos/TopicQos.hpp b/include/fastdds/dds/topic/qos/TopicQos.hpp
index 7970e1af73d..f469d28897c 100644
--- a/include/fastdds/dds/topic/qos/TopicQos.hpp
+++ b/include/fastdds/dds/topic/qos/TopicQos.hpp
@@ -17,11 +17,11 @@
  */
 
 
-#ifndef _FASTDDS_TOPICQOS_HPP
-#define _FASTDDS_TOPICQOS_HPP
+#ifndef FASTDDS_DDS_TOPIC_QOS__TOPICQOS_HPP
+#define FASTDDS_DDS_TOPIC_QOS__TOPICQOS_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/rtps/attributes/TopicAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
 
 #include <fastdds/dds/log/Log.hpp>
 
@@ -549,4 +549,4 @@ FASTDDS_EXPORTED_API extern const TopicQos TOPIC_QOS_DEFAULT;
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TOPICQOS_HPP
+#endif // FASTDDS_DDS_TOPIC_QOS__TOPICQOS_HPP
diff --git a/include/fastdds/dds/xtypes/common.hpp b/include/fastdds/dds/xtypes/common.hpp
index cdce000d9b4..eaf170c46e9 100644
--- a/include/fastdds/dds/xtypes/common.hpp
+++ b/include/fastdds/dds/xtypes/common.hpp
@@ -17,8 +17,8 @@
  * This file contains common definitions for the different XTypes modules.
  */
 
-#ifndef _FASTDDS_DDS_XTYPES_COMMON_HPP_
-#define _FASTDDS_DDS_XTYPES_COMMON_HPP_
+#ifndef FASTDDS_DDS_XTYPES__COMMON_HPP
+#define FASTDDS_DDS_XTYPES__COMMON_HPP
 
 #include <cstdint>
 
@@ -119,4 +119,4 @@ constexpr const char* topic_annotation_name = "topic";
 } // fastdds
 } // eprosima
 
-#endif // _FASTDDS_DDS_XTYPES_COMMON_HPP_
+#endif // FASTDDS_DDS_XTYPES__COMMON_HPP
diff --git a/include/fastdds/dds/xtypes/dynamic_types/AnnotationDescriptor.hpp b/include/fastdds/dds/xtypes/dynamic_types/AnnotationDescriptor.hpp
index 781bed34cf9..23d218a19a7 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/AnnotationDescriptor.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/AnnotationDescriptor.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_ANNOTATION_DESCRIPTOR_HPP
-#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_ANNOTATION_DESCRIPTOR_HPP
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__ANNOTATIONDESCRIPTOR_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__ANNOTATIONDESCRIPTOR_HPP
 
 #include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/Types.hpp>
@@ -128,4 +128,4 @@ class FASTDDS_EXPORTED_API AnnotationDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_ANNOTATION_DESCRIPTOR_HPP
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__ANNOTATIONDESCRIPTOR_HPP
diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicData.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicData.hpp
index be1fa559962..da601ba5e30 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/DynamicData.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/DynamicData.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_DATA_HPP
-#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_DATA_HPP
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICDATA_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICDATA_HPP
 
 #include <memory>
 #include <string>
@@ -22,7 +22,7 @@
 #include <fastdds/dds/xtypes/dynamic_types/DynamicType.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/Types.hpp>
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -1039,4 +1039,4 @@ class DynamicData : public std::enable_shared_from_this<DynamicData>
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_DATA_HPP
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICDATA_HPP
diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp
index 688363347e8..11546d6e764 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_DATA_FACTORY_HPP
-#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_DATA_FACTORY_HPP
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICDATAFACTORY_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICDATAFACTORY_HPP
 
 #include <memory>
 
@@ -75,4 +75,4 @@ class DynamicDataFactory : public std::enable_shared_from_this<DynamicDataFactor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_DATA_FACTORY_HPP
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICDATAFACTORY_HPP
diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp
index fe434f464cc..3746ad287ff 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_PUB_SUB_TYPE_HPP
-#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_PUB_SUB_TYPE_HPP
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICPUBSUBTYPE_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICPUBSUBTYPE_HPP
 
 #include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/Types.hpp>
-#include <fastdds/utils/md5.h>
+#include <fastdds/utils/md5.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -154,4 +154,4 @@ class DynamicPubSubType : public virtual eprosima::fastdds::dds::TopicDataType
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_PUB_SUB_TYPE_HPP
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICPUBSUBTYPE_HPP
diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicType.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicType.hpp
index f9082159f40..21571d07b56 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/DynamicType.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/DynamicType.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_TYPE_HPP
-#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_TYPE_HPP
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICTYPE_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICTYPE_HPP
 
 #include <memory>
 
@@ -188,4 +188,4 @@ class DynamicType : public std::enable_shared_from_this<DynamicType>
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_TYPE_HPP
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICTYPE_HPP
diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilder.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilder.hpp
index dcda644b415..7bc72535940 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilder.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilder.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_TYPE_BUILDER_HPP
-#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_TYPE_BUILDER_HPP
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICTYPEBUILDER_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICTYPEBUILDER_HPP
 
 #include <memory>
 
@@ -208,4 +208,4 @@ class DynamicTypeBuilder : public std::enable_shared_from_this<DynamicTypeBuilde
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_TYPE_BUILDER_HPP
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICTYPEBUILDER_HPP
diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp
index 16aa2cf8de3..645d06ca5c7 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_TYPE_BUILDER_FACTORY_HPP
-#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_TYPE_BUILDER_FACTORY_HPP
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICTYPEBUILDERFACTORY_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICTYPEBUILDERFACTORY_HPP
 
 #include <memory>
 #include <string>
@@ -210,4 +210,4 @@ class DynamicTypeBuilderFactory : public std::enable_shared_from_this<DynamicTyp
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_TYPE_BUILDER_FACTORY_HPP
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICTYPEBUILDERFACTORY_HPP
diff --git a/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeMember.hpp b/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeMember.hpp
index e1c3c9fadb9..68ebf0fdc91 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeMember.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/DynamicTypeMember.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_TYPE_MEMBER_HPP
-#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_TYPE_MEMBER_HPP
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICTYPEMEMBER_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICTYPEMEMBER_HPP
 
 #include <map>
 #include <memory>
@@ -136,4 +136,4 @@ typedef std::map<MemberId, traits<DynamicTypeMember>::ref_type> DynamicTypeMembe
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DYNAMIC_TYPE_MEMBER_HPP
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__DYNAMICTYPEMEMBER_HPP
diff --git a/include/fastdds/dds/xtypes/dynamic_types/MemberDescriptor.hpp b/include/fastdds/dds/xtypes/dynamic_types/MemberDescriptor.hpp
index 9c6f7b111ee..d1212d12cac 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/MemberDescriptor.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/MemberDescriptor.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_MEMBER_DESCRIPTOR_HPP
-#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_MEMBER_DESCRIPTOR_HPP
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__MEMBERDESCRIPTOR_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__MEMBERDESCRIPTOR_HPP
 
 #include <cstdint>
 #include <string>
@@ -328,4 +328,4 @@ class FASTDDS_EXPORTED_API MemberDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_MEMBER_DESCRIPTOR_HPP
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__MEMBERDESCRIPTOR_HPP
diff --git a/include/fastdds/dds/xtypes/dynamic_types/TypeDescriptor.hpp b/include/fastdds/dds/xtypes/dynamic_types/TypeDescriptor.hpp
index b7a5b10b6d7..a59dbdb79bd 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/TypeDescriptor.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/TypeDescriptor.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_TYPE_DESCRIPTOR_HPP
-#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_TYPE_DESCRIPTOR_HPP
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__TYPEDESCRIPTOR_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__TYPEDESCRIPTOR_HPP
 
 #include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/Types.hpp>
@@ -271,4 +271,4 @@ class FASTDDS_EXPORTED_API TypeDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_TYPE_DESCRIPTOR_HPP
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__TYPEDESCRIPTOR_HPP
diff --git a/include/fastdds/dds/xtypes/dynamic_types/Types.hpp b/include/fastdds/dds/xtypes/dynamic_types/Types.hpp
index 544fa49427a..c023ccc6057 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/Types.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/Types.hpp
@@ -16,8 +16,8 @@
  * @file Types.hpp
  */
 
-#ifndef _FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_TYPES_HPP_
-#define _FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_TYPES_HPP_
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__TYPES_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__TYPES_HPP
 
 #include "detail/dynamic_language_binding.hpp"
 #include "type_traits.hpp"
@@ -80,4 +80,4 @@ struct traits<DynamicTypeMember> : public object_traits<DynamicTypeMember>
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_TYPES_HPP_
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__TYPES_HPP
diff --git a/include/fastdds/dds/xtypes/dynamic_types/VerbatimTextDescriptor.hpp b/include/fastdds/dds/xtypes/dynamic_types/VerbatimTextDescriptor.hpp
index dcf8cb203e7..b244105c773 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/VerbatimTextDescriptor.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/VerbatimTextDescriptor.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_VERBATIM_TEXT_DESCRIPTOR_HPP
-#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_VERBATIM_TEXT_DESCRIPTOR_HPP
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__VERBATIMTEXTDESCRIPTOR_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__VERBATIMTEXTDESCRIPTOR_HPP
 
 #include <string>
 
@@ -132,4 +132,4 @@ class FASTDDS_EXPORTED_API VerbatimTextDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_VERBATIM_TEXT_DESCRIPTOR_HPP
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__VERBATIMTEXTDESCRIPTOR_HPP
diff --git a/include/fastdds/dds/xtypes/dynamic_types/detail/dynamic_language_binding.hpp b/include/fastdds/dds/xtypes/dynamic_types/detail/dynamic_language_binding.hpp
index eaa40fcfff3..ff6dad14ab4 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/detail/dynamic_language_binding.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/detail/dynamic_language_binding.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DYNAMIC_LANGUAGE_BINDING_HPP_
-#define _FAST_DDS_GENERATED_DYNAMIC_LANGUAGE_BINDING_HPP_
+#ifndef FAST_DDS_GENERATED__DYNAMIC_LANGUAGE_BINDING_HPP
+#define FAST_DDS_GENERATED__DYNAMIC_LANGUAGE_BINDING_HPP
 
 #include <cstdint>
 #include <map>
diff --git a/include/fastdds/dds/xtypes/dynamic_types/detail/type_traits.hpp b/include/fastdds/dds/xtypes/dynamic_types/detail/type_traits.hpp
index d3b4dbddd39..71d0ece3e72 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/detail/type_traits.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/detail/type_traits.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DETAIL_TYPE_TRAITS_HPP_
-#define _FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DETAIL_TYPE_TRAITS_HPP_
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DETAIL__TYPE_TRAITS_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DETAIL__TYPE_TRAITS_HPP
 
 #include <memory>
 
@@ -61,5 +61,5 @@ struct object_traits
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DETAIL_TYPE_TRAITS_HPP_
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_DETAIL__TYPE_TRAITS_HPP
 
diff --git a/include/fastdds/dds/xtypes/dynamic_types/type_traits.hpp b/include/fastdds/dds/xtypes/dynamic_types/type_traits.hpp
index 5ce20f7cda8..4271dfa403d 100644
--- a/include/fastdds/dds/xtypes/dynamic_types/type_traits.hpp
+++ b/include/fastdds/dds/xtypes/dynamic_types/type_traits.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_TYPE_TRAITS_HPP_
-#define _FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_TYPE_TRAITS_HPP_
+#ifndef FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__TYPETRAITS_HPP
+#define FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__TYPETRAITS_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -31,4 +31,4 @@ struct object_traits;
 
 #include "detail/type_traits.hpp"
 
-#endif // _FASTDDS_DDS_XTYPES_DYNAMIC_TYPES_TYPE_TRAITS_HPP_
+#endif // FASTDDS_DDS_XTYPES_DYNAMIC_TYPES__TYPETRAITS_HPP
diff --git a/include/fastdds/dds/xtypes/exception/Exception.hpp b/include/fastdds/dds/xtypes/exception/Exception.hpp
index 31d15ffc2c7..ea4f93fa05e 100644
--- a/include/fastdds/dds/xtypes/exception/Exception.hpp
+++ b/include/fastdds/dds/xtypes/exception/Exception.hpp
@@ -17,8 +17,8 @@
  * This file is based on the DDS-PSM-CXX Exception.hpp file.
  */
 
-#ifndef _FASTDDS_DDS_XTYPES_EXCEPTION_EXCEPTION_HPP_
-#define _FASTDDS_DDS_XTYPES_EXCEPTION_EXCEPTION_HPP_
+#ifndef FASTDDS_DDS_XTYPES_EXCEPTION__EXCEPTION_HPP
+#define FASTDDS_DDS_XTYPES_EXCEPTION__EXCEPTION_HPP
 
 #include <stdexcept>
 #include <string>
@@ -76,4 +76,4 @@ class InvalidArgumentError : public Exception, public std::invalid_argument
 } // fastdds
 } // eprosima
 
-#endif // _FASTDDS_DDS_XTYPES_EXCEPTION_EXCEPTION_HPP_
+#endif // FASTDDS_DDS_XTYPES_EXCEPTION__EXCEPTION_HPP
diff --git a/include/fastdds/dds/xtypes/type_representation/ITypeObjectRegistry.hpp b/include/fastdds/dds/xtypes/type_representation/ITypeObjectRegistry.hpp
index fc815bb73d6..501d61ce2c2 100644
--- a/include/fastdds/dds/xtypes/type_representation/ITypeObjectRegistry.hpp
+++ b/include/fastdds/dds/xtypes/type_representation/ITypeObjectRegistry.hpp
@@ -17,8 +17,8 @@
  * This file contains the required classes to keep a TypeObject/TypeIdentifier registry.
  */
 
-#ifndef _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_ITYPEOBJECTREGISTRY_HPP_
-#define _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_ITYPEOBJECTREGISTRY_HPP_
+#ifndef FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__ITYPEOBJECTREGISTRY_HPP
+#define FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__ITYPEOBJECTREGISTRY_HPP
 
 #include <string>
 
@@ -195,6 +195,6 @@ class ITypeObjectRegistry
 } // fastdds
 } // eprosima
 
-#endif // _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_ITYPEOBJECTREGISTRY_HPP_
+#endif // FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__ITYPEOBJECTREGISTRY_HPP
 
 
diff --git a/include/fastdds/dds/xtypes/type_representation/TypeObject.hpp b/include/fastdds/dds/xtypes/type_representation/TypeObject.hpp
index 3be6383ca03..194cf475002 100644
--- a/include/fastdds/dds/xtypes/type_representation/TypeObject.hpp
+++ b/include/fastdds/dds/xtypes/type_representation/TypeObject.hpp
@@ -19,12 +19,12 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECT_HPP_
-#define _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECT_HPP_
+#ifndef FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECT_HPP
+#define FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp>
 #include <fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectCdrAux.hpp>
-#include <fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.h>
+#include <fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp>
 
-#endif // _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECT_HPP_
+#endif // FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECT_HPP
 
diff --git a/include/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp b/include/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp
index e7db70bf8d6..97cf04ef523 100644
--- a/include/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp
+++ b/include/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp
@@ -17,8 +17,8 @@
  * This file contains static functions to help build a TypeObject.
  */
 
-#ifndef _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP_
-#define _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP_
+#ifndef FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECTUTILS_HPP
+#define FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECTUTILS_HPP
 
 #include <string>
 
@@ -3131,4 +3131,4 @@ class TypeObjectUtils
 } // fastdds
 } // eprosima
 
-#endif // _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP_
+#endif // FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECTUTILS_HPP
diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp
index e230483cdce..3d3eca8d708 100644
--- a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp
+++ b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECT_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECT_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECT_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECT_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectCdrAux.hpp b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectCdrAux.hpp
index 4a9d0b5e4da..8a9a76c3c4f 100644
--- a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectCdrAux.hpp
+++ b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECTCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECTCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECTCDRAUX_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECTCDRAUX_HPP
 
 #include "dds_xtypes_typeobject.hpp"
 
@@ -804,5 +804,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECTCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECTCDRAUX_HPP
 
diff --git a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.h b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp
similarity index 95%
rename from include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.h
rename to include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp
index bb6e1b4b2f8..b858f57eb0f 100644
--- a/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.h
+++ b/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file dds_xtypes_typeobjectPubSubTypes.h
+ * @file dds_xtypes_typeobjectPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECT_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECT_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECT_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECT_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "dds_xtypes_typeobject.hpp"
 
@@ -230,9 +230,9 @@ class StringSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -254,7 +254,7 @@ class StringSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -376,9 +376,9 @@ class StringLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -400,7 +400,7 @@ class StringLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -489,7 +489,7 @@ class PlainCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -507,7 +507,7 @@ class PlainCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -580,7 +580,7 @@ class PlainSequenceSElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -598,7 +598,7 @@ class PlainSequenceSElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -671,7 +671,7 @@ class PlainSequenceLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -689,7 +689,7 @@ class PlainSequenceLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -762,7 +762,7 @@ class PlainArraySElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -780,7 +780,7 @@ class PlainArraySElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -853,7 +853,7 @@ class PlainArrayLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -871,7 +871,7 @@ class PlainArrayLElemDefnPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -944,7 +944,7 @@ class PlainMapSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -962,7 +962,7 @@ class PlainMapSTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1035,7 +1035,7 @@ class PlainMapLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1053,7 +1053,7 @@ class PlainMapLTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1126,7 +1126,7 @@ class StronglyConnectedComponentIdPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1144,7 +1144,7 @@ class StronglyConnectedComponentIdPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1217,7 +1217,7 @@ class ExtendedTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1235,7 +1235,7 @@ class ExtendedTypeDefnPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1313,7 +1313,7 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1331,7 +1331,7 @@ class ExtendedAnnotationParameterValuePubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1405,7 +1405,7 @@ class AppliedAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1423,7 +1423,7 @@ class AppliedAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1497,7 +1497,7 @@ class AppliedAnnotationPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1515,7 +1515,7 @@ class AppliedAnnotationPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1589,7 +1589,7 @@ class AppliedVerbatimAnnotationPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1607,7 +1607,7 @@ class AppliedVerbatimAnnotationPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1680,7 +1680,7 @@ class AppliedBuiltinMemberAnnotationsPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1698,7 +1698,7 @@ class AppliedBuiltinMemberAnnotationsPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1771,7 +1771,7 @@ class CommonStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1789,7 +1789,7 @@ class CommonStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1862,7 +1862,7 @@ class CompleteMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1880,7 +1880,7 @@ class CompleteMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1986,9 +1986,9 @@ class MinimalMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -2010,7 +2010,7 @@ class MinimalMemberDetailPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -2099,7 +2099,7 @@ class CompleteStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2117,7 +2117,7 @@ class CompleteStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2191,7 +2191,7 @@ class MinimalStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2209,7 +2209,7 @@ class MinimalStructMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2283,7 +2283,7 @@ class AppliedBuiltinTypeAnnotationsPubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2301,7 +2301,7 @@ class AppliedBuiltinTypeAnnotationsPubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2374,9 +2374,9 @@ class MinimalTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -2398,7 +2398,7 @@ class MinimalTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -2483,7 +2483,7 @@ class CompleteTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2501,7 +2501,7 @@ class CompleteTypeDetailPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2574,7 +2574,7 @@ class CompleteStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2592,7 +2592,7 @@ class CompleteStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2665,7 +2665,7 @@ class MinimalStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2683,7 +2683,7 @@ class MinimalStructHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2756,7 +2756,7 @@ class CompleteStructTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2774,7 +2774,7 @@ class CompleteStructTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2847,7 +2847,7 @@ class MinimalStructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2865,7 +2865,7 @@ class MinimalStructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2939,7 +2939,7 @@ class CommonUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2957,7 +2957,7 @@ class CommonUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3030,7 +3030,7 @@ class CompleteUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3048,7 +3048,7 @@ class CompleteUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3122,7 +3122,7 @@ class MinimalUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3140,7 +3140,7 @@ class MinimalUnionMemberPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3214,7 +3214,7 @@ class CommonDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3232,7 +3232,7 @@ class CommonDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3305,7 +3305,7 @@ class CompleteDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3323,7 +3323,7 @@ class CompleteDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3396,7 +3396,7 @@ class MinimalDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3414,7 +3414,7 @@ class MinimalDiscriminatorMemberPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3487,7 +3487,7 @@ class CompleteUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3505,7 +3505,7 @@ class CompleteUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3578,7 +3578,7 @@ class MinimalUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3596,7 +3596,7 @@ class MinimalUnionHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3669,7 +3669,7 @@ class CompleteUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3687,7 +3687,7 @@ class CompleteUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3760,7 +3760,7 @@ class MinimalUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3778,7 +3778,7 @@ class MinimalUnionTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3851,7 +3851,7 @@ class CommonAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3869,7 +3869,7 @@ class CommonAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3942,7 +3942,7 @@ class CompleteAnnotationParameterPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3960,7 +3960,7 @@ class CompleteAnnotationParameterPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4034,7 +4034,7 @@ class MinimalAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4052,7 +4052,7 @@ class MinimalAnnotationParameterPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4126,7 +4126,7 @@ class CompleteAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4144,7 +4144,7 @@ class CompleteAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4217,7 +4217,7 @@ class MinimalAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4235,7 +4235,7 @@ class MinimalAnnotationHeaderPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4308,7 +4308,7 @@ class CompleteAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4326,7 +4326,7 @@ class CompleteAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4399,7 +4399,7 @@ class MinimalAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4417,7 +4417,7 @@ class MinimalAnnotationTypePubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4490,7 +4490,7 @@ class CommonAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4508,7 +4508,7 @@ class CommonAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4581,7 +4581,7 @@ class CompleteAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4599,7 +4599,7 @@ class CompleteAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4672,7 +4672,7 @@ class MinimalAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4690,7 +4690,7 @@ class MinimalAliasBodyPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4763,7 +4763,7 @@ class CompleteAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4781,7 +4781,7 @@ class CompleteAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4854,7 +4854,7 @@ class MinimalAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4872,7 +4872,7 @@ class MinimalAliasHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4945,7 +4945,7 @@ class CompleteAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4963,7 +4963,7 @@ class CompleteAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5036,7 +5036,7 @@ class MinimalAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5054,7 +5054,7 @@ class MinimalAliasTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5127,7 +5127,7 @@ class CompleteElementDetailPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5145,7 +5145,7 @@ class CompleteElementDetailPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5218,7 +5218,7 @@ class CommonCollectionElementPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5236,7 +5236,7 @@ class CommonCollectionElementPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5309,7 +5309,7 @@ class CompleteCollectionElementPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5327,7 +5327,7 @@ class CompleteCollectionElementPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5400,7 +5400,7 @@ class MinimalCollectionElementPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5418,7 +5418,7 @@ class MinimalCollectionElementPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5524,9 +5524,9 @@ class CommonCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -5548,7 +5548,7 @@ class CommonCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -5637,7 +5637,7 @@ class CompleteCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5655,7 +5655,7 @@ class CompleteCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5728,7 +5728,7 @@ class MinimalCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5746,7 +5746,7 @@ class MinimalCollectionHeaderPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5819,7 +5819,7 @@ class CompleteSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5837,7 +5837,7 @@ class CompleteSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5910,7 +5910,7 @@ class MinimalSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5928,7 +5928,7 @@ class MinimalSequenceTypePubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6001,7 +6001,7 @@ class CommonArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6019,7 +6019,7 @@ class CommonArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6092,7 +6092,7 @@ class CompleteArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6110,7 +6110,7 @@ class CompleteArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6183,7 +6183,7 @@ class MinimalArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6201,7 +6201,7 @@ class MinimalArrayHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6274,7 +6274,7 @@ class CompleteArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6292,7 +6292,7 @@ class CompleteArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6365,7 +6365,7 @@ class MinimalArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6383,7 +6383,7 @@ class MinimalArrayTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6456,7 +6456,7 @@ class CompleteMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6474,7 +6474,7 @@ class CompleteMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6547,7 +6547,7 @@ class MinimalMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6565,7 +6565,7 @@ class MinimalMapTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6639,7 +6639,7 @@ class CommonEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6657,7 +6657,7 @@ class CommonEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6730,7 +6730,7 @@ class CompleteEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6748,7 +6748,7 @@ class CompleteEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6822,7 +6822,7 @@ class MinimalEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6840,7 +6840,7 @@ class MinimalEnumeratedLiteralPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6947,9 +6947,9 @@ class CommonEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -6971,7 +6971,7 @@ class CommonEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -7060,7 +7060,7 @@ class CompleteEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7078,7 +7078,7 @@ class CompleteEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7151,7 +7151,7 @@ class MinimalEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7169,7 +7169,7 @@ class MinimalEnumeratedHeaderPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7242,7 +7242,7 @@ class CompleteEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7260,7 +7260,7 @@ class CompleteEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7333,7 +7333,7 @@ class MinimalEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7351,7 +7351,7 @@ class MinimalEnumeratedTypePubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7424,7 +7424,7 @@ class CommonBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7442,7 +7442,7 @@ class CommonBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7515,7 +7515,7 @@ class CompleteBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7533,7 +7533,7 @@ class CompleteBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7607,7 +7607,7 @@ class MinimalBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7625,7 +7625,7 @@ class MinimalBitflagPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7732,9 +7732,9 @@ class CommonBitmaskHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -7756,7 +7756,7 @@ class CommonBitmaskHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -7847,7 +7847,7 @@ class CompleteBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7865,7 +7865,7 @@ class CompleteBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7938,7 +7938,7 @@ class MinimalBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7956,7 +7956,7 @@ class MinimalBitmaskTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8029,7 +8029,7 @@ class CommonBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8047,7 +8047,7 @@ class CommonBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8120,7 +8120,7 @@ class CompleteBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8138,7 +8138,7 @@ class CompleteBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8212,7 +8212,7 @@ class MinimalBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8230,7 +8230,7 @@ class MinimalBitfieldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8304,7 +8304,7 @@ class CompleteBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8322,7 +8322,7 @@ class CompleteBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8395,7 +8395,7 @@ class MinimalBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8413,7 +8413,7 @@ class MinimalBitsetHeaderPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8486,7 +8486,7 @@ class CompleteBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8504,7 +8504,7 @@ class CompleteBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8577,7 +8577,7 @@ class MinimalBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8595,7 +8595,7 @@ class MinimalBitsetTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8668,7 +8668,7 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8686,7 +8686,7 @@ class CompleteExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8760,7 +8760,7 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8778,7 +8778,7 @@ class MinimalExtendedTypePubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8855,7 +8855,7 @@ class TypeIdentifierTypeObjectPairPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8873,7 +8873,7 @@ class TypeIdentifierTypeObjectPairPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8947,7 +8947,7 @@ class TypeIdentifierPairPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8965,7 +8965,7 @@ class TypeIdentifierPairPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9039,7 +9039,7 @@ class TypeIdentfierWithSizePubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9057,7 +9057,7 @@ class TypeIdentfierWithSizePubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9131,7 +9131,7 @@ class TypeIdentifierWithDependenciesPubSubType : public eprosima::fastdds::dds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9149,7 +9149,7 @@ class TypeIdentifierWithDependenciesPubSubType : public eprosima::fastdds::dds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9223,7 +9223,7 @@ class TypeInformationPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9241,7 +9241,7 @@ class TypeInformationPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9257,5 +9257,5 @@ typedef std::vector<eprosima::fastdds::dds::xtypes::TypeInformation> TypeInforma
 } // namespace eprosima
 
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECT_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECT_PUBSUBTYPES_HPP
 
diff --git a/include/fastdds/fastdds_dll.hpp b/include/fastdds/fastdds_dll.hpp
index 7e1d58bc5a7..e27e8be884a 100644
--- a/include/fastdds/fastdds_dll.hpp
+++ b/include/fastdds/fastdds_dll.hpp
@@ -12,10 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_FASTDDS_DLL_H_
-#define _FASTDDS_FASTDDS_DLL_H_
+/**
+ * @file fastdds_dll.hpp
+ *
+ */
 
-#include <fastdds/config.h>
+#ifndef FASTDDS_FASTDDS_DLL_H
+#define FASTDDS_FASTDDS_DLL_H
+
+#include <fastdds/config.hpp>
 
 // normalize macros
 #if !defined(FASTDDS_DYN_LINK) && !defined(FASTDDS_STATIC_LINK) \
@@ -66,4 +71,4 @@
 #include <fastdds/fastdds_auto_link.hpp>
 #endif // auto-linking disabled
 
-#endif // _FASTDDS_FASTDDS_DLL_H_
+#endif // FASTDDS_FASTDDS_DLL_H
diff --git a/include/fastdds/rtps/Endpoint.h b/include/fastdds/rtps/Endpoint.hpp
similarity index 87%
rename from include/fastdds/rtps/Endpoint.h
rename to include/fastdds/rtps/Endpoint.hpp
index a9ba1433e56..f1b89dd9caf 100644
--- a/include/fastdds/rtps/Endpoint.h
+++ b/include/fastdds/rtps/Endpoint.hpp
@@ -13,18 +13,18 @@
 // limitations under the License.
 
 /**
- * @file Endpoint.h
+ * @file Endpoint.hpp
  */
 
-#ifndef _FASTDDS_RTPS_ENDPOINT_H_
-#define _FASTDDS_RTPS_ENDPOINT_H_
+#ifndef FASTDDS_RTPS__ENDPOINT_HPP
+#define FASTDDS_RTPS__ENDPOINT_HPP
 
-#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 <fastdds/rtps/attributes/EndpointAttributes.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/history/IChangePool.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 
 namespace eprosima {
@@ -141,7 +141,7 @@ class Endpoint
 
 
 } // namespace rtps
-} /* namespace rtps */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace eprosima
 
-#endif //_FASTDDS_RTPS_ENDPOINT_H_
+#endif //FASTDDS_RTPS__ENDPOINT_HPP
diff --git a/include/fastdds/rtps/RTPSDomain.h b/include/fastdds/rtps/RTPSDomain.hpp
similarity index 96%
rename from include/fastdds/rtps/RTPSDomain.h
rename to include/fastdds/rtps/RTPSDomain.hpp
index 25441033009..808577c998b 100644
--- a/include/fastdds/rtps/RTPSDomain.h
+++ b/include/fastdds/rtps/RTPSDomain.hpp
@@ -13,23 +13,23 @@
 // limitations under the License.
 
 /**
- * @file RTPSDomain.h
+ * @file RTPSDomain.hpp
  */
 
-#ifndef _FASTDDS_RTPS_DOMAIN_H_
-#define _FASTDDS_RTPS_DOMAIN_H_
+#ifndef FASTDDS_RTPS__RTPSDOMAIN_HPP
+#define FASTDDS_RTPS__RTPSDOMAIN_HPP
 
 #include <atomic>
 #include <mutex>
 #include <set>
 
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
-#include <fastdds/rtps/history/IChangePool.h>
-#include <fastdds/rtps/attributes/TopicAttributes.h>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
+#include <fastdds/rtps/history/IChangePool.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -335,7 +335,7 @@ class RTPSDomain
 };
 
 } // namespace rtps
-} /* namespace fastdds  */
-} /* namespace eprosima */
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_DOMAIN_H_*/
+#endif // FASTDDS_RTPS__RTPSDOMAIN_HPP
diff --git a/include/fastdds/rtps/attributes/BuiltinTransports.hpp b/include/fastdds/rtps/attributes/BuiltinTransports.hpp
index fe38051ccb7..cc5addafc3c 100644
--- a/include/fastdds/rtps/attributes/BuiltinTransports.hpp
+++ b/include/fastdds/rtps/attributes/BuiltinTransports.hpp
@@ -16,14 +16,14 @@
  * @file BuiltinTransports.hpp
  */
 
-#ifndef _FASTDDS_RTPS_ATTRIBUTES__BUILTINTRANSPORTS_HPP_
-#define _FASTDDS_RTPS_ATTRIBUTES__BUILTINTRANSPORTS_HPP_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__BUILTINTRANSPORTS_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__BUILTINTRANSPORTS_HPP
 
 #include <ostream>
 #include <cstdint>
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/transport/TransportInterface.h>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -155,4 +155,4 @@ inline std::ostream& operator <<(
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // _FASTDDS_RTPS_ATTRIBUTES__BUILTINTRANSPORTS_HPP_
+#endif  // FASTDDS_RTPS_ATTRIBUTES__BUILTINTRANSPORTS_HPP
diff --git a/include/fastdds/rtps/attributes/EndpointAttributes.h b/include/fastdds/rtps/attributes/EndpointAttributes.hpp
similarity index 90%
rename from include/fastdds/rtps/attributes/EndpointAttributes.h
rename to include/fastdds/rtps/attributes/EndpointAttributes.hpp
index 11dbca15283..8f841e9572c 100644
--- a/include/fastdds/rtps/attributes/EndpointAttributes.h
+++ b/include/fastdds/rtps/attributes/EndpointAttributes.hpp
@@ -13,20 +13,20 @@
 // limitations under the License.
 
 /**
- * @file fastdds/rtps/attributes/EndpointAttributes.h
+ * @file EndpointAttributes.hpp
  */
 
-#ifndef _FASTDDS_ENDPOINTATTRIBUTES_H_
-#define _FASTDDS_ENDPOINTATTRIBUTES_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__ENDPOINTATTRIBUTES_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__ENDPOINTATTRIBUTES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 #if HAVE_SECURITY
-#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.hpp>
 #endif // if HAVE_SECURITY
 namespace eprosima {
 namespace fastdds {
@@ -170,8 +170,8 @@ class EndpointAttributes
     fastdds::dds::DataSharingQosPolicy datasharing_;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_ENDPOINTATTRIBUTES_H_ */
+#endif // FASTDDS_RTPS_ATTRIBUTES__ENDPOINTATTRIBUTES_HPP
diff --git a/include/fastdds/rtps/attributes/EndpointSecurityAttributes.h b/include/fastdds/rtps/attributes/EndpointSecurityAttributes.hpp
similarity index 94%
rename from include/fastdds/rtps/attributes/EndpointSecurityAttributes.h
rename to include/fastdds/rtps/attributes/EndpointSecurityAttributes.hpp
index 89873896316..489bed1d6db 100644
--- a/include/fastdds/rtps/attributes/EndpointSecurityAttributes.h
+++ b/include/fastdds/rtps/attributes/EndpointSecurityAttributes.hpp
@@ -13,10 +13,10 @@
 // limitations under the License.
 
 /*!
- * @file EndpointSecurityAttributes.h
+ * @file EndpointSecurityAttributes.hpp
  */
-#ifndef _FASTDDS_RTPS_SECURITY_ACCESSCONTROL_ENDPOINTSECURITYATTRIBUTES_H_
-#define _FASTDDS_RTPS_SECURITY_ACCESSCONTROL_ENDPOINTSECURITYATTRIBUTES_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__ENDPOINTSECURITYATTRIBUTES_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__ENDPOINTSECURITYATTRIBUTES_HPP
 
 #include <cstdint>
 
@@ -127,4 +127,4 @@ struct EndpointSecurityAttributes
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_SECURITY_ACCESSCONTROL_ENDPOINTSECURITYATTRIBUTES_H_
+#endif // FASTDDS_RTPS_ATTRIBUTES__ENDPOINTSECURITYATTRIBUTES_HPP
diff --git a/include/fastdds/rtps/attributes/ExternalLocators.hpp b/include/fastdds/rtps/attributes/ExternalLocators.hpp
index b68384e021b..abf07de1364 100644
--- a/include/fastdds/rtps/attributes/ExternalLocators.hpp
+++ b/include/fastdds/rtps/attributes/ExternalLocators.hpp
@@ -16,8 +16,8 @@
  * @file ExternalLocators.hpp
  */
 
-#ifndef _FASTDDS_RTPS_ATTRIBUTES_EXTERNALLOCATORS_HPP_
-#define _FASTDDS_RTPS_ATTRIBUTES_EXTERNALLOCATORS_HPP_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__EXTERNALLOCATORS_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__EXTERNALLOCATORS_HPP
 
 #include <map>
 #include <vector>
@@ -45,4 +45,4 @@ using ExternalLocators = std::map<
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_ATTRIBUTES_EXTERNALLOCATORS_HPP_ */
+#endif // FASTDDS_RTPS_ATTRIBUTES__EXTERNALLOCATORS_HPP
diff --git a/include/fastdds/rtps/attributes/HistoryAttributes.h b/include/fastdds/rtps/attributes/HistoryAttributes.hpp
similarity index 95%
rename from include/fastdds/rtps/attributes/HistoryAttributes.h
rename to include/fastdds/rtps/attributes/HistoryAttributes.hpp
index ea114100dbb..69625ace74c 100644
--- a/include/fastdds/rtps/attributes/HistoryAttributes.h
+++ b/include/fastdds/rtps/attributes/HistoryAttributes.hpp
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 /**
- * @file HistoryAttributes.h
+ * @file HistoryAttributes.hpp
  *
  */
 
-#ifndef _FASTDDS_HISTORYATTRIBUTES_H_
-#define _FASTDDS_HISTORYATTRIBUTES_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__HISTORYATTRIBUTES_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__HISTORYATTRIBUTES_HPP
 
 #include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/fastdds_dll.hpp>
@@ -127,4 +127,4 @@ class FASTDDS_EXPORTED_API HistoryAttributes
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_HISTORYATTRIBUTES_H_ */
+#endif // FASTDDS_RTPS_ATTRIBUTES__HISTORYATTRIBUTES_HPP
diff --git a/include/fastdds/rtps/attributes/PropertyPolicy.h b/include/fastdds/rtps/attributes/PropertyPolicy.hpp
similarity index 93%
rename from include/fastdds/rtps/attributes/PropertyPolicy.h
rename to include/fastdds/rtps/attributes/PropertyPolicy.hpp
index 936e32d16ad..28339477d90 100644
--- a/include/fastdds/rtps/attributes/PropertyPolicy.h
+++ b/include/fastdds/rtps/attributes/PropertyPolicy.hpp
@@ -13,13 +13,13 @@
 // limitations under the License.
 
 /*!
- * @file PropertyPolicy.h
+ * @file PropertyPolicy.hpp
  */
-#ifndef _FASTDDS_RTPS_ATTRIBUTES_PROPERTYPOLICY_H_
-#define _FASTDDS_RTPS_ATTRIBUTES_PROPERTYPOLICY_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__PROPERTYPOLICY_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__PROPERTYPOLICY_HPP
 
-#include <fastdds/rtps/common/Property.h>
-#include <fastdds/rtps/common/BinaryProperty.h>
+#include <fastdds/rtps/common/Property.hpp>
+#include <fastdds/rtps/common/BinaryProperty.hpp>
 #include <fastdds/fastdds_dll.hpp>
 
 namespace eprosima {
@@ -152,4 +152,4 @@ class PropertyPolicyHelper
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_RTPS_ATTRIBUTES_PROPERTYPOLICY_H_
+#endif // FASTDDS_RTPS_ATTRIBUTES__PROPERTYPOLICY_HPP
diff --git a/include/fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp b/include/fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp
index c5c1dc9bb8d..375c6b1e2f4 100644
--- a/include/fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp
+++ b/include/fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp
@@ -16,8 +16,8 @@
  * @file RTPSParticipantAllocationAttributes.hpp
  */
 
-#ifndef _FASTDDS_RTPS_RTPSPARTICIPANTALLOCATIONATTRIBUTES_HPP_
-#define _FASTDDS_RTPS_RTPSPARTICIPANTALLOCATIONATTRIBUTES_HPP_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__RTPSPARTICIPANTALLOCATIONATTRIBUTES_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__RTPSPARTICIPANTALLOCATIONATTRIBUTES_HPP
 
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
 
@@ -188,8 +188,8 @@ struct RTPSParticipantAllocationAttributes
 const RTPSParticipantAllocationAttributes c_default_RTPSParticipantAllocationAttributes
     = RTPSParticipantAllocationAttributes();
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_RTPSPARTICIPANTALLOCATIONATTRIBUTES_HPP_ */
+#endif // FASTDDS_RTPS_ATTRIBUTES__RTPSPARTICIPANTALLOCATIONATTRIBUTES_HPP
diff --git a/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h b/include/fastdds/rtps/attributes/RTPSParticipantAttributes.hpp
similarity index 97%
rename from include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
rename to include/fastdds/rtps/attributes/RTPSParticipantAttributes.hpp
index 89eed265066..665297f6ed7 100644
--- a/include/fastdds/rtps/attributes/RTPSParticipantAttributes.h
+++ b/include/fastdds/rtps/attributes/RTPSParticipantAttributes.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file RTPSParticipantAttributes.h
+ * @file RTPSParticipantAttributes.hpp
  */
 
-#ifndef _FASTDDS_RTPSPARTICIPANTPARAMETERS_H_
-#define _FASTDDS_RTPSPARTICIPANTPARAMETERS_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__RTPSPARTICIPANTATTRIBUTES_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__RTPSPARTICIPANTATTRIBUTES_HPP
 
 #include <memory>
 #include <sstream>
@@ -26,18 +26,18 @@
 
 #include <fastdds/rtps/attributes/BuiltinTransports.hpp>
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
-#include <fastdds/rtps/attributes/ServerAttributes.h>
+#include <fastdds/rtps/attributes/ServerAttributes.hpp>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/common/PortParameters.h>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/PortParameters.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp>
-#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
-#include <fastdds/rtps/transport/TransportInterface.h>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
 #include <fastdds/fastdds_dll.hpp>
 
 namespace eprosima {
@@ -578,4 +578,4 @@ class RTPSParticipantAttributes
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // _FASTDDS_RTPSPARTICIPANTPARAMETERS_H_
+#endif  // FASTDDS_RTPS_ATTRIBUTES__RTPSPARTICIPANTATTRIBUTES_HPP
diff --git a/include/fastdds/rtps/attributes/ReaderAttributes.h b/include/fastdds/rtps/attributes/ReaderAttributes.hpp
similarity index 88%
rename from include/fastdds/rtps/attributes/ReaderAttributes.h
rename to include/fastdds/rtps/attributes/ReaderAttributes.hpp
index 73ed60f7db7..cafc7e1aa8f 100644
--- a/include/fastdds/rtps/attributes/ReaderAttributes.h
+++ b/include/fastdds/rtps/attributes/ReaderAttributes.hpp
@@ -13,17 +13,17 @@
 // limitations under the License.
 
 /**
- * @file ReaderAttributes.h
+ * @file ReaderAttributes.hpp
  *
  */
 
-#ifndef _FASTDDS_RTPS_ATTRIBUTES_READERATTRIBUTES_H_
-#define _FASTDDS_RTPS_ATTRIBUTES_READERATTRIBUTES_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__READERATTRIBUTES_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__READERATTRIBUTES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/rtps/attributes/EndpointAttributes.h>
+#include <fastdds/rtps/attributes/EndpointAttributes.hpp>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 #include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
 
 namespace eprosima {
@@ -95,8 +95,8 @@ class ReaderAttributes
     fastdds::rtps::ThreadSettings data_sharing_listener_thread {};
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_ATTRIBUTES_READERATTRIBUTES_H_ */
+#endif // FASTDDS_RTPS_ATTRIBUTES__READERATTRIBUTES_HPP
diff --git a/include/fastdds/rtps/attributes/ServerAttributes.h b/include/fastdds/rtps/attributes/ServerAttributes.hpp
similarity index 97%
rename from include/fastdds/rtps/attributes/ServerAttributes.h
rename to include/fastdds/rtps/attributes/ServerAttributes.hpp
index 2fb237b7f68..fe1b55e321b 100644
--- a/include/fastdds/rtps/attributes/ServerAttributes.h
+++ b/include/fastdds/rtps/attributes/ServerAttributes.hpp
@@ -13,15 +13,15 @@
 // limitations under the License.
 
 /**
- * @file ServerAttributes.h
+ * @file ServerAttributes.hpp
  *
  */
 
-#ifndef _FASTDDS_SERVERATTRIBUTES_H_
-#define _FASTDDS_SERVERATTRIBUTES_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__SERVERATTRIBUTES_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__SERVERATTRIBUTES_HPP
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 
 #include <algorithm>
@@ -218,8 +218,7 @@ FASTDDS_EXPORTED_API bool get_server_client_default_guidPrefix(
 
 } // rtps
 } // fastdds
-
 } // namespace eprosima
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_SERVERATTRIBUTES_H_ */
+#endif // FASTDDS_RTPS_ATTRIBUTES__SERVERATTRIBUTES_HPP
diff --git a/include/fastdds/rtps/attributes/ThreadSettings.hpp b/include/fastdds/rtps/attributes/ThreadSettings.hpp
index d6d39524ee3..79e36e94a1d 100644
--- a/include/fastdds/rtps/attributes/ThreadSettings.hpp
+++ b/include/fastdds/rtps/attributes/ThreadSettings.hpp
@@ -21,8 +21,8 @@
 
 #include <fastdds/fastdds_dll.hpp>
 
-#ifndef _FASTDDS_THREADSETTINGS_HPP_
-#define _FASTDDS_THREADSETTINGS_HPP_
+#ifndef FASTDDS_RTPS_ATTRIBUTES_THREADSETTINGS_HPP
+#define FASTDDS_RTPS_ATTRIBUTES_THREADSETTINGS_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -108,4 +108,4 @@ struct FASTDDS_EXPORTED_API ThreadSettings
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_THREADSETTINGS_HPP_ */
+#endif // FASTDDS_RTPS_ATTRIBUTES_THREADSETTINGS_HPP
diff --git a/include/fastdds/rtps/attributes/TopicAttributes.h b/include/fastdds/rtps/attributes/TopicAttributes.hpp
similarity index 93%
rename from include/fastdds/rtps/attributes/TopicAttributes.h
rename to include/fastdds/rtps/attributes/TopicAttributes.hpp
index 0fb88714031..53d2c66522d 100644
--- a/include/fastdds/rtps/attributes/TopicAttributes.h
+++ b/include/fastdds/rtps/attributes/TopicAttributes.hpp
@@ -13,16 +13,16 @@
 // limitations under the License.
 
 /**
- * @file TopicAttributes.h
+ * @file TopicAttributes.hpp
  */
 
-#ifndef _FASTDDS_TOPICPARAMETERS_H_
-#define _FASTDDS_TOPICPARAMETERS_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__TOPICATTRIBUTES_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__TOPICATTRIBUTES_HPP
 
 #include <string>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -145,7 +145,7 @@ bool inline operator !=(
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_TOPICPARAMETERS_H_ */
+#endif // FASTDDS_RTPS_ATTRIBUTES__TOPICATTRIBUTES_HPP
diff --git a/include/fastdds/rtps/attributes/WriterAttributes.h b/include/fastdds/rtps/attributes/WriterAttributes.hpp
similarity index 91%
rename from include/fastdds/rtps/attributes/WriterAttributes.h
rename to include/fastdds/rtps/attributes/WriterAttributes.hpp
index c5706c656bb..fee5ab56aad 100644
--- a/include/fastdds/rtps/attributes/WriterAttributes.h
+++ b/include/fastdds/rtps/attributes/WriterAttributes.hpp
@@ -13,18 +13,18 @@
 // limitations under the License.
 
 /**
- * @file WriterAttributes.h
+ * @file WriterAttributes.hpp
  *
  */
-#ifndef _FASTDDS_WRITERATTRIBUTES_H_
-#define _FASTDDS_WRITERATTRIBUTES_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__WRITERATTRIBUTES_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__WRITERATTRIBUTES_HPP
 
 #include <functional>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/rtps/attributes/EndpointAttributes.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/attributes/EndpointAttributes.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
 #include <fastdds/rtps/flowcontrol/FlowControllerConsts.hpp>
 #include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
 
@@ -138,8 +138,8 @@ class WriterAttributes
     std::string flow_controller_name = fastdds::rtps::FASTDDS_FLOW_CONTROLLER_DEFAULT;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_WRITERATTRIBUTES_H_ */
+#endif // FASTDDS_RTPS_ATTRIBUTES__WRITERATTRIBUTES_HPP
diff --git a/include/fastdds/rtps/builtin/data/ContentFilterProperty.hpp b/include/fastdds/rtps/builtin/data/ContentFilterProperty.hpp
index 32cded64db7..3f3a5bea05a 100644
--- a/include/fastdds/rtps/builtin/data/ContentFilterProperty.hpp
+++ b/include/fastdds/rtps/builtin/data/ContentFilterProperty.hpp
@@ -16,8 +16,8 @@
  * @file ContentFilterProperty.hpp
  */
 
-#ifndef FASTDDS_RTPS_BUILTIN_DATA_CONTENTFILTERPROPERTY_HPP_
-#define FASTDDS_RTPS_BUILTIN_DATA_CONTENTFILTERPROPERTY_HPP_
+#ifndef FASTDDS_RTPS_BUILTIN_DATA__CONTENTFILTERPROPERTY_HPP
+#define FASTDDS_RTPS_BUILTIN_DATA__CONTENTFILTERPROPERTY_HPP
 
 #include <string>
 
@@ -79,4 +79,4 @@ class ContentFilterProperty
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif // FASTDDS_RTPS_BUILTIN_DATA_CONTENTFILTERPROPERTY_HPP_
+#endif // FASTDDS_RTPS_BUILTIN_DATA__CONTENTFILTERPROPERTY_HPP
diff --git a/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp b/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp
index e518af95e1a..8a94ef2ef71 100644
--- a/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp
+++ b/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_
-#define _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_
+#ifndef FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
+#define FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -26,12 +26,12 @@
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/core/Types.hpp>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
 #include <fastdds/rtps/common/RemoteLocators.hpp>
-#include <fastdds/rtps/common/Token.h>
+#include <fastdds/rtps/common/Token.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 
 namespace eprosima {
@@ -49,7 +49,7 @@ class NetworkFactory;
 #if HAVE_SECURITY
 namespace security {
 struct ParticipantSecurityAttributes;
-} /* namespace security */
+} // namespace security
 #endif // if HAVE_SECURITY
 
 // proxy specific declarations
@@ -231,10 +231,10 @@ class ParticipantProxyData
     std::chrono::microseconds lease_duration_;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_
+#endif // FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
diff --git a/include/fastdds/rtps/builtin/data/ReaderProxyData.h b/include/fastdds/rtps/builtin/data/ReaderProxyData.hpp
similarity index 97%
rename from include/fastdds/rtps/builtin/data/ReaderProxyData.h
rename to include/fastdds/rtps/builtin/data/ReaderProxyData.hpp
index 58af91186dc..7541fa8b828 100644
--- a/include/fastdds/rtps/builtin/data/ReaderProxyData.h
+++ b/include/fastdds/rtps/builtin/data/ReaderProxyData.hpp
@@ -13,24 +13,24 @@
 // limitations under the License.
 
 /**
- * @file ReaderProxyData.h
+ * @file ReaderProxyData.hpp
  *
  */
 
-#ifndef _FASTDDS_RTPS_BUILTIN_DATA_READERPROXYDATA_H_
-#define _FASTDDS_RTPS_BUILTIN_DATA_READERPROXYDATA_H_
+#ifndef FASTDDS_RTPS_BUILTIN_DATA__READERPROXYDATA_HPP
+#define FASTDDS_RTPS_BUILTIN_DATA__READERPROXYDATA_HPP
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
 #if HAVE_SECURITY
-#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.hpp>
 #endif // if HAVE_SECURITY
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
 #include <fastdds/rtps/common/RemoteLocators.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastdds/rtps/attributes/TopicAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -514,8 +514,8 @@ class ReaderProxyData
 };
 
 } // namespace rtps
-} /* namespace rtps */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif // _FASTDDS_RTPS_BUILTIN_DATA_READERPROXYDATA_H_
+#endif // FASTDDS_RTPS_BUILTIN_DATA__READERPROXYDATA_HPP
diff --git a/include/fastdds/rtps/builtin/data/WriterProxyData.h b/include/fastdds/rtps/builtin/data/WriterProxyData.hpp
similarity index 97%
rename from include/fastdds/rtps/builtin/data/WriterProxyData.h
rename to include/fastdds/rtps/builtin/data/WriterProxyData.hpp
index 777b96e1b3f..23004666e48 100644
--- a/include/fastdds/rtps/builtin/data/WriterProxyData.h
+++ b/include/fastdds/rtps/builtin/data/WriterProxyData.hpp
@@ -13,24 +13,24 @@
 // limitations under the License.
 
 /**
- * @file WriterProxyData.h
+ * @file WriterProxyData.hpp
  *
  */
 
-#ifndef _FASTDDS_RTPS_BUILTIN_DATA_WRITERPROXYDATA_H_
-#define _FASTDDS_RTPS_BUILTIN_DATA_WRITERPROXYDATA_H_
+#ifndef FASTDDS_RTPS_BUILTIN_DATA__WRITERPROXYDATA_HPP
+#define FASTDDS_RTPS_BUILTIN_DATA__WRITERPROXYDATA_HPP
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <fastcdr/cdr/fixed_size_string.hpp>
 
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
-#include <fastdds/rtps/attributes/TopicAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
 #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/attributes/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.hpp>
 #endif // if HAVE_SECURITY
 
 
@@ -508,9 +508,9 @@ class WriterProxyData
     ParameterPropertyList_t m_properties;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif // _FASTDDS_RTPS_BUILTIN_DATA_WRITERPROXYDATA_H_
+#endif // FASTDDS_RTPS_BUILTIN_DATA__WRITERPROXYDATA_HPP
diff --git a/include/fastdds/rtps/common/BinaryProperty.h b/include/fastdds/rtps/common/BinaryProperty.hpp
similarity index 96%
rename from include/fastdds/rtps/common/BinaryProperty.h
rename to include/fastdds/rtps/common/BinaryProperty.hpp
index 21786c620c1..9587dc20a02 100644
--- a/include/fastdds/rtps/common/BinaryProperty.h
+++ b/include/fastdds/rtps/common/BinaryProperty.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /*!
- * @file BinaryProperty.h
+ * @file BinaryProperty.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_BINARYPROPERTY_H_
-#define _FASTDDS_RTPS_COMMON_BINARYPROPERTY_H_
+#ifndef FASTDDS_RTPS_COMMON__BINARYPROPERTY_HPP
+#define FASTDDS_RTPS_COMMON__BINARYPROPERTY_HPP
 
 #include <string>
 #include <vector>
@@ -219,4 +219,4 @@ class BinaryPropertyHelper
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_RTPS_COMMON_BINARYPROPERTY_H_
+#endif // FASTDDS_RTPS_COMMON__BINARYPROPERTY_HPP
diff --git a/include/fastdds/rtps/common/CDRMessage_t.h b/include/fastdds/rtps/common/CDRMessage_t.hpp
similarity index 95%
rename from include/fastdds/rtps/common/CDRMessage_t.h
rename to include/fastdds/rtps/common/CDRMessage_t.hpp
index 35d572433a1..3c19d99854b 100644
--- a/include/fastdds/rtps/common/CDRMessage_t.h
+++ b/include/fastdds/rtps/common/CDRMessage_t.hpp
@@ -13,15 +13,15 @@
 // limitations under the License.
 
 /**
- * @file CDRMessage_t.h
+ * @file CDRMessage_t.hpp
  */
 
-#ifndef _FASTDDS_RTPS_CDRMESSAGE_T_H_
-#define _FASTDDS_RTPS_CDRMESSAGE_T_H_
+#ifndef FASTDDS_RTPS_COMMON__CDRMESSAGE_T_HPP
+#define FASTDDS_RTPS_COMMON__CDRMESSAGE_T_HPP
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 #include <cassert>
 #include <cstdlib>
 #include <cstring>
@@ -224,5 +224,5 @@ struct FASTDDS_EXPORTED_API CDRMessage_t final
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif /* DOXYGEN_SHOULD_SKIP_THIS_PUBLIC */
-#endif /* _FASTDDS_RTPS_CDRMESSAGE_T_H_ */
+#endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
+#endif // FASTDDS_RTPS_COMMON__CDRMESSAGE_T_HPP
diff --git a/include/fastdds/rtps/common/CacheChange.h b/include/fastdds/rtps/common/CacheChange.hpp
similarity index 96%
rename from include/fastdds/rtps/common/CacheChange.h
rename to include/fastdds/rtps/common/CacheChange.hpp
index 841b363cb03..13bd3568143 100644
--- a/include/fastdds/rtps/common/CacheChange.h
+++ b/include/fastdds/rtps/common/CacheChange.hpp
@@ -13,24 +13,24 @@
 // limitations under the License.
 
 /**
- * @file CacheChange.h
+ * @file CacheChange.hpp
  */
 
-#ifndef _FASTDDS_RTPS_CACHECHANGE_H_
-#define _FASTDDS_RTPS_CACHECHANGE_H_
+#ifndef FASTDDS_RTPS_COMMON__CACHECHANGE_HPP
+#define FASTDDS_RTPS_COMMON__CACHECHANGE_HPP
 
 #include <atomic>
 #include <cassert>
 
 #include <fastdds/rtps/common/ChangeKind_t.hpp>
-#include <fastdds/rtps/common/FragmentNumber.h>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/FragmentNumber.hpp>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastdds/rtps/common/WriteParams.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
+#include <fastdds/rtps/common/WriteParams.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -427,4 +427,4 @@ struct FASTDDS_EXPORTED_API CacheChange_t
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_CACHECHANGE_H_ */
+#endif // FASTDDS_RTPS_COMMON__CACHECHANGE_HPP
diff --git a/include/fastdds/rtps/common/CdrSerialization.hpp b/include/fastdds/rtps/common/CdrSerialization.hpp
index 0547a46f6d8..5595278bf5b 100644
--- a/include/fastdds/rtps/common/CdrSerialization.hpp
+++ b/include/fastdds/rtps/common/CdrSerialization.hpp
@@ -16,8 +16,8 @@
  * @file CdrSerialization.hpp
  */
 
-#ifndef FASTDDS_RTPS_COMMON_CDRSERIALIZATION_HPP
-#define FASTDDS_RTPS_COMMON_CDRSERIALIZATION_HPP
+#ifndef FASTDDS_RTPS_COMMON__CDRSERIALIZATION_HPP
+#define FASTDDS_RTPS_COMMON__CDRSERIALIZATION_HPP
 
 #include <fastcdr/Cdr.h>
 
@@ -103,4 +103,4 @@ constexpr eprosima::fastcdr::CdrVersion DEFAULT_XCDR_VERSION {eprosima::fastcdr:
 
 #endif //FASTCDR_VERSION_MAJOR == 1
 
-#endif // FASTDDS_RTPS_COMMON_CDRSERIALIZATION_HPP
+#endif // FASTDDS_RTPS_COMMON__CDRSERIALIZATION_HPP
diff --git a/include/fastdds/rtps/common/ChangeKind_t.hpp b/include/fastdds/rtps/common/ChangeKind_t.hpp
index b9944f4413b..c46919613a4 100644
--- a/include/fastdds/rtps/common/ChangeKind_t.hpp
+++ b/include/fastdds/rtps/common/ChangeKind_t.hpp
@@ -16,8 +16,8 @@
  * @file ChangeKind_t.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_CHANGEKINDT_HPP_
-#define _FASTDDS_RTPS_COMMON_CHANGEKINDT_HPP_
+#ifndef FASTDDS_RTPS_COMMON__CHANGEKIND_T_HPP
+#define FASTDDS_RTPS_COMMON__CHANGEKIND_T_HPP
 
 #include <fastdds/fastdds_dll.hpp>
 
@@ -41,4 +41,4 @@ enum FASTDDS_EXPORTED_API ChangeKind_t
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_COMMON_CHANGEKINDT_HPP_ */
+#endif // FASTDDS_RTPS_COMMON__CHANGEKIND_T_HPP
diff --git a/include/fastdds/rtps/common/EntityId_t.hpp b/include/fastdds/rtps/common/EntityId_t.hpp
index 835da80500a..a308f4634fd 100644
--- a/include/fastdds/rtps/common/EntityId_t.hpp
+++ b/include/fastdds/rtps/common/EntityId_t.hpp
@@ -16,11 +16,11 @@
  * @file EntityId_t.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_ENTITYID_T_HPP_
-#define _FASTDDS_RTPS_COMMON_ENTITYID_T_HPP_
+#ifndef FASTDDS_RTPS_COMMON__ENTITYID_T_HPP
+#define FASTDDS_RTPS_COMMON__ENTITYID_T_HPP
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 
 #include <cstdint>
 #include <cstring>
@@ -402,4 +402,4 @@ struct hash<eprosima::fastdds::rtps::EntityId_t>
 } // namespace std
 
 
-#endif /* _FASTDDS_RTPS_COMMON_ENTITYID_T_HPP_ */
+#endif // FASTDDS_RTPS_COMMON__ENTITYID_T_HPP
diff --git a/include/fastdds/rtps/common/FragmentNumber.h b/include/fastdds/rtps/common/FragmentNumber.hpp
similarity index 86%
rename from include/fastdds/rtps/common/FragmentNumber.h
rename to include/fastdds/rtps/common/FragmentNumber.hpp
index 5c195a91849..13066cf9e15 100644
--- a/include/fastdds/rtps/common/FragmentNumber.h
+++ b/include/fastdds/rtps/common/FragmentNumber.hpp
@@ -13,14 +13,14 @@
 // limitations under the License.
 
 /**
- * @file FragmentNumber.h
+ * @file FragmentNumber.hpp
  */
 
-#ifndef _FASTDDS_RTPS_RPTS_ELEM_FRAGNUM_H_
-#define _FASTDDS_RTPS_RPTS_ELEM_FRAGNUM_H_
+#ifndef FASTDDS_RTPS_COMMON__FRAGMENTNUMBER_HPP
+#define FASTDDS_RTPS_COMMON__FRAGMENTNUMBER_HPP
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/utils/fixed_size_bitmap.hpp>
 
 #include <set>
@@ -54,4 +54,4 @@ inline std::ostream& operator <<(
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_RPTS_ELEM_FRAGNUM_H_ */
+#endif // FASTDDS_RTPS_COMMON__FRAGMENTNUMBER_HPP
diff --git a/include/fastdds/rtps/common/Guid.h b/include/fastdds/rtps/common/Guid.hpp
similarity index 97%
rename from include/fastdds/rtps/common/Guid.h
rename to include/fastdds/rtps/common/Guid.hpp
index 53ed949d6c9..77b080c1edc 100644
--- a/include/fastdds/rtps/common/Guid.h
+++ b/include/fastdds/rtps/common/Guid.hpp
@@ -13,14 +13,14 @@
 // limitations under the License.
 
 /**
- * @file Guid.h
+ * @file Guid.hpp
  */
 
-#ifndef _FASTDDS_RTPS_RTPS_GUID_H_
-#define _FASTDDS_RTPS_RTPS_GUID_H_
+#ifndef FASTDDS_RTPS_COMMON__GUID_HPP
+#define FASTDDS_RTPS_COMMON__GUID_HPP
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
 #include <fastdds/rtps/common/EntityId_t.hpp>
 
@@ -281,4 +281,4 @@ inline std::istream& operator >>(
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_RTPS_GUID_H_ */
+#endif // FASTDDS_RTPS_COMMON__GUID_HPP
diff --git a/include/fastdds/rtps/common/GuidPrefix_t.hpp b/include/fastdds/rtps/common/GuidPrefix_t.hpp
index e7bdcaf615e..39c3c768d74 100644
--- a/include/fastdds/rtps/common/GuidPrefix_t.hpp
+++ b/include/fastdds/rtps/common/GuidPrefix_t.hpp
@@ -16,11 +16,11 @@
  * @file GuidPrefix_t.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_GUIDPREFIX_T_HPP_
-#define _FASTDDS_RTPS_COMMON_GUIDPREFIX_T_HPP_
+#ifndef FASTDDS_RTPS_COMMON__GUIDPREFIX_T_HPP
+#define FASTDDS_RTPS_COMMON__GUIDPREFIX_T_HPP
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 
 #include <cstdint>
 #include <cstring>
@@ -212,4 +212,4 @@ inline std::istream& operator >>(
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_COMMON_GUIDPREFIX_T_HPP_ */
+#endif // FASTDDS_RTPS_COMMON__GUIDPREFIX_T_HPP
diff --git a/include/fastdds/rtps/common/InstanceHandle.h b/include/fastdds/rtps/common/InstanceHandle.hpp
similarity index 97%
rename from include/fastdds/rtps/common/InstanceHandle.h
rename to include/fastdds/rtps/common/InstanceHandle.hpp
index 5b0e08bdc4a..e59640d342d 100644
--- a/include/fastdds/rtps/common/InstanceHandle.h
+++ b/include/fastdds/rtps/common/InstanceHandle.hpp
@@ -13,17 +13,17 @@
 // limitations under the License.
 
 /**
- * @file InstanceHandle.h
+ * @file InstanceHandle.hpp
  */
 
-#ifndef _FASTDDS_RTPS_INSTANCEHANDLE_H_
-#define _FASTDDS_RTPS_INSTANCEHANDLE_H_
+#ifndef FASTDDS_RTPS_COMMON__INSTANCEHANDLE_HPP
+#define FASTDDS_RTPS_COMMON__INSTANCEHANDLE_HPP
 
 #include <array>
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -362,4 +362,4 @@ inline std::istream& operator >>(
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_INSTANCEHANDLE_H_ */
+#endif // FASTDDS_RTPS_COMMON__INSTANCEHANDLE_HPP
diff --git a/include/fastdds/rtps/common/Locator.h b/include/fastdds/rtps/common/Locator.hpp
similarity index 98%
rename from include/fastdds/rtps/common/Locator.h
rename to include/fastdds/rtps/common/Locator.hpp
index c203188b711..88651429434 100644
--- a/include/fastdds/rtps/common/Locator.h
+++ b/include/fastdds/rtps/common/Locator.hpp
@@ -13,16 +13,16 @@
 // limitations under the License.
 
 /**
- * @file Locator.h
+ * @file Locator.hpp
  */
 
-#ifndef _FASTDDS_RTPS_ELEM_LOCATOR_H_
-#define _FASTDDS_RTPS_ELEM_LOCATOR_H_
+#ifndef FASTDDS_RTPS_COMMON__LOCATOR_HPP
+#define FASTDDS_RTPS_COMMON__LOCATOR_HPP
 
 #include <fastdds/fastdds_dll.hpp>
 
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <fastdds/dds/log/Log.hpp>
 
@@ -523,4 +523,4 @@ using Locator = eprosima::fastdds::rtps::Locator_t;
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_ELEM_LOCATOR_H_ */
+#endif // FASTDDS_RTPS_COMMON__LOCATOR_HPP
diff --git a/include/fastdds/rtps/common/LocatorList.hpp b/include/fastdds/rtps/common/LocatorList.hpp
index 299d9686a30..a466f121d59 100644
--- a/include/fastdds/rtps/common/LocatorList.hpp
+++ b/include/fastdds/rtps/common/LocatorList.hpp
@@ -16,12 +16,12 @@
  * @file LocatorList.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_LOCATORLIST_HPP_
-#define _FASTDDS_RTPS_COMMON_LOCATORLIST_HPP_
+#ifndef FASTDDS_RTPS_COMMON__LOCATORLIST_HPP
+#define FASTDDS_RTPS_COMMON__LOCATORLIST_HPP
 
 #include <fastdds/fastdds_dll.hpp>
 
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/common/LocatorsIterator.hpp>
 
 #include <vector>
@@ -463,4 +463,4 @@ using LocatorList_t = eprosima::fastdds::rtps::LocatorList;
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_COMMON_LOCATORLIST_HPP_ */
+#endif // FASTDDS_RTPS_COMMON__LOCATORLIST_HPP
diff --git a/include/fastdds/rtps/common/LocatorListComparisons.hpp b/include/fastdds/rtps/common/LocatorListComparisons.hpp
index cb1740bf7d1..a3a140cfdcf 100644
--- a/include/fastdds/rtps/common/LocatorListComparisons.hpp
+++ b/include/fastdds/rtps/common/LocatorListComparisons.hpp
@@ -16,10 +16,10 @@
  * @file LocatorListComparisons.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_LOCATORLISTCOMPARISONS_HPP_
-#define _FASTDDS_RTPS_COMMON_LOCATORLISTCOMPARISONS_HPP_
+#ifndef FASTDDS_RTPS_COMMON__LOCATORLISTCOMPARISONS_HPP
+#define FASTDDS_RTPS_COMMON__LOCATORLISTCOMPARISONS_HPP
 
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 #include <algorithm>
 
@@ -55,8 +55,8 @@ static inline bool operator == (
     return false;
 }
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_COMMON_LOCATORLISTCOMPARISONS_HPP_ */
+#endif // FASTDDS_RTPS_COMMON__LOCATORLISTCOMPARISONS_HPP
diff --git a/include/fastdds/rtps/common/LocatorSelector.hpp b/include/fastdds/rtps/common/LocatorSelector.hpp
index 706035a9a0d..ef9944b008c 100644
--- a/include/fastdds/rtps/common/LocatorSelector.hpp
+++ b/include/fastdds/rtps/common/LocatorSelector.hpp
@@ -16,15 +16,15 @@
  * @file LocatorSelector.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_LOCATORSELECTOR_HPP_
-#define _FASTDDS_RTPS_COMMON_LOCATORSELECTOR_HPP_
+#ifndef FASTDDS_RTPS_COMMON__LOCATORSELECTOR_HPP
+#define FASTDDS_RTPS_COMMON__LOCATORSELECTOR_HPP
 
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/common/LocatorsIterator.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <algorithm>
 
@@ -472,8 +472,8 @@ class LocatorSelector
     ResourceLimitedVector<int> last_state_;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_COMMON_LOCATORSELECTOR_H_ */
+#endif // FASTDDS_RTPS_COMMON__LOCATORSELECTOR_HPP
diff --git a/include/fastdds/rtps/common/LocatorSelectorEntry.hpp b/include/fastdds/rtps/common/LocatorSelectorEntry.hpp
index d5aa401a78a..abe08d666b4 100644
--- a/include/fastdds/rtps/common/LocatorSelectorEntry.hpp
+++ b/include/fastdds/rtps/common/LocatorSelectorEntry.hpp
@@ -16,13 +16,13 @@
  * @file LocatorSelectorEntry.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_LOCATORSELECTORENTRY_HPP_
-#define _FASTDDS_RTPS_COMMON_LOCATORSELECTORENTRY_HPP_
+#ifndef FASTDDS_RTPS_COMMON__LOCATORSELECTORENTRY_HPP
+#define FASTDDS_RTPS_COMMON__LOCATORSELECTORENTRY_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
@@ -137,9 +137,9 @@ struct LocatorSelectorEntry
     bool transport_should_process;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* DOXYGEN_SHOULD_SKIP_THIS_PUBLIC */
-#endif /* _FASTDDS_RTPS_COMMON_LOCATORSELECTORENTRY_HPP_ */
+#endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
+#endif // FASTDDS_RTPS_COMMON__LOCATORSELECTORENTRY_HPP
diff --git a/include/fastdds/rtps/common/LocatorWithMask.hpp b/include/fastdds/rtps/common/LocatorWithMask.hpp
index acba981f778..790be3f9552 100644
--- a/include/fastdds/rtps/common/LocatorWithMask.hpp
+++ b/include/fastdds/rtps/common/LocatorWithMask.hpp
@@ -16,13 +16,13 @@
  * @file LocatorWithMask.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_LOCATORWITHMASK_HPP_
-#define _FASTDDS_RTPS_COMMON_LOCATORWITHMASK_HPP_
+#ifndef FASTDDS_RTPS_COMMON__LOCATORWITHMASK_HPP
+#define FASTDDS_RTPS_COMMON__LOCATORWITHMASK_HPP
 
 #include <sstream>
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -77,4 +77,4 @@ FASTDDS_EXPORTED_API std::ostream& operator <<(
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_COMMON_LOCATORWITHMASK_HPP_ */
+#endif // FASTDDS_RTPS_COMMON__LOCATORWITHMASK_HPP
diff --git a/include/fastdds/rtps/common/LocatorsIterator.hpp b/include/fastdds/rtps/common/LocatorsIterator.hpp
index 88b80050863..40ff748c87c 100644
--- a/include/fastdds/rtps/common/LocatorsIterator.hpp
+++ b/include/fastdds/rtps/common/LocatorsIterator.hpp
@@ -16,10 +16,10 @@
  * @file LocatorsIterator.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_LOCATORSITERATOR_HPP_
-#define _FASTDDS_RTPS_COMMON_LOCATORSITERATOR_HPP_
+#ifndef FASTDDS_RTPS_COMMON__LOCATORSITERATOR_HPP
+#define FASTDDS_RTPS_COMMON__LOCATORSITERATOR_HPP
 
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -69,4 +69,4 @@ using LocatorsIterator = eprosima::fastdds::rtps::LocatorsIterator;
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_COMMON_LOCATORSITERATOR_HPP_ */
+#endif // FASTDDS_RTPS_COMMON__LOCATORSITERATOR_HPP
diff --git a/include/fastdds/rtps/common/MatchingInfo.h b/include/fastdds/rtps/common/MatchingInfo.hpp
similarity index 90%
rename from include/fastdds/rtps/common/MatchingInfo.h
rename to include/fastdds/rtps/common/MatchingInfo.hpp
index 2849de12db4..0fe91666ea5 100644
--- a/include/fastdds/rtps/common/MatchingInfo.h
+++ b/include/fastdds/rtps/common/MatchingInfo.hpp
@@ -13,14 +13,14 @@
 // limitations under the License.
 
 /**
- * @file MatchingInfo.h
+ * @file MatchingInfo.hpp
  *
  */
 
-#ifndef _FASTDDS_RTPS_MATCHINGINFO_H_
-#define _FASTDDS_RTPS_MATCHINGINFO_H_
+#ifndef FASTDDS_RTPS_COMMON__MATCHINGINFO_HPP
+#define FASTDDS_RTPS_COMMON__MATCHINGINFO_HPP
 
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -82,4 +82,4 @@ class FASTDDS_EXPORTED_API MatchingInfo
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_MATCHINGINFO_H_ */
+#endif // FASTDDS_RTPS_COMMON__MATCHINGINFO_HPP
diff --git a/include/fastdds/rtps/common/PortParameters.h b/include/fastdds/rtps/common/PortParameters.hpp
similarity index 93%
rename from include/fastdds/rtps/common/PortParameters.h
rename to include/fastdds/rtps/common/PortParameters.hpp
index 57eef8aa145..449d2400fd2 100644
--- a/include/fastdds/rtps/common/PortParameters.h
+++ b/include/fastdds/rtps/common/PortParameters.hpp
@@ -13,13 +13,13 @@
 // limitations under the License.
 
 /**
- * @file PortParameters.h
+ * @file PortParameters.hpp
  */
 
-#ifndef _FASTDDS_RTPS_PORT_PARAMETERS_H_
-#define _FASTDDS_RTPS_PORT_PARAMETERS_H_
+#ifndef FASTDDS_RTPS_COMMON__PORTPARAMETERS_HPP
+#define FASTDDS_RTPS_COMMON__PORTPARAMETERS_HPP
 
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/dds/log/Log.hpp>
 
 namespace eprosima {
@@ -130,7 +130,7 @@ class PortParameters
 };
 
 } // namespace rtps
-} /* namespace rtps */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_PORT_PARAMETERS_H_ */
+#endif // FASTDDS_RTPS_COMMON__PORTPARAMETERS_HPP
diff --git a/include/fastdds/rtps/common/Property.h b/include/fastdds/rtps/common/Property.hpp
similarity index 98%
rename from include/fastdds/rtps/common/Property.h
rename to include/fastdds/rtps/common/Property.hpp
index d03bae40842..6a6c293abdf 100644
--- a/include/fastdds/rtps/common/Property.h
+++ b/include/fastdds/rtps/common/Property.hpp
@@ -13,10 +13,10 @@
 // limitations under the License.
 
 /*!
- * @file Property.h
+ * @file Property.hpp
  */
-#ifndef _FASTDDS_RTPS_COMMON_PROPERTYQOS_H_
-#define _FASTDDS_RTPS_COMMON_PROPERTYQOS_H_
+#ifndef FASTDDS_RTPS_COMMON__PROPERTY_HPP
+#define FASTDDS_RTPS_COMMON__PROPERTY_HPP
 
 #include <functional>
 #include <stdexcept>
@@ -342,4 +342,4 @@ struct PropertyParser
 } //namespace fastdds
 } //namespace rtps
 
-#endif // _FASTDDS_RTPS_COMMON_PROPERTYQOS_H_
+#endif // FASTDDS_RTPS_COMMON__PROPERTY_HPP
diff --git a/include/fastdds/rtps/common/RemoteLocators.hpp b/include/fastdds/rtps/common/RemoteLocators.hpp
index bfe5ee3a7a0..8a06a223f9d 100644
--- a/include/fastdds/rtps/common/RemoteLocators.hpp
+++ b/include/fastdds/rtps/common/RemoteLocators.hpp
@@ -16,10 +16,10 @@
  * @file RemoteLocators.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_REMOTELOCATORS_HPP_
-#define _FASTDDS_RTPS_COMMON_REMOTELOCATORS_HPP_
+#ifndef FASTDDS_RTPS_COMMON__REMOTELOCATORS_HPP
+#define FASTDDS_RTPS_COMMON__REMOTELOCATORS_HPP
 
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 #include <fastdds/dds/log/Log.hpp>
 
@@ -233,8 +233,8 @@ inline std::istream& operator >>(
     return input;
 }
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_COMMON_REMOTELOCATORS_HPP_ */
+#endif // FASTDDS_RTPS_COMMON__REMOTELOCATORS_HPP
diff --git a/include/fastdds/rtps/common/SampleIdentity.h b/include/fastdds/rtps/common/SampleIdentity.hpp
similarity index 95%
rename from include/fastdds/rtps/common/SampleIdentity.h
rename to include/fastdds/rtps/common/SampleIdentity.hpp
index d0030a5c160..a0a8c0ab055 100644
--- a/include/fastdds/rtps/common/SampleIdentity.h
+++ b/include/fastdds/rtps/common/SampleIdentity.hpp
@@ -13,14 +13,14 @@
 // limitations under the License.
 
 /**
- * @file SampleIdentity.h
+ * @file SampleIdentity.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_SAMPLEIDENTITY_H_
-#define _FASTDDS_RTPS_COMMON_SAMPLEIDENTITY_H_
+#ifndef FASTDDS_RTPS_COMMON__SAMPLEIDENTITY_HPP
+#define FASTDDS_RTPS_COMMON__SAMPLEIDENTITY_HPP
 
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -247,4 +247,4 @@ inline std::ostream& operator <<(
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_RTPS_COMMON_SAMPLEIDENTITY_H_
+#endif // FASTDDS_RTPS_COMMON__SAMPLEIDENTITY_HPP
diff --git a/include/fastdds/rtps/common/SequenceNumber.h b/include/fastdds/rtps/common/SequenceNumber.hpp
similarity index 97%
rename from include/fastdds/rtps/common/SequenceNumber.h
rename to include/fastdds/rtps/common/SequenceNumber.hpp
index 4c82a286685..734d8f27713 100644
--- a/include/fastdds/rtps/common/SequenceNumber.h
+++ b/include/fastdds/rtps/common/SequenceNumber.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file SequenceNumber.h
+ * @file SequenceNumber.hpp
  */
 
-#ifndef _FASTDDS_RPTS_ELEM_SEQNUM_H_
-#define _FASTDDS_RPTS_ELEM_SEQNUM_H_
+#ifndef FASTDDS_RTPS_COMMON__SEQUENCENUMBER_HPP
+#define FASTDDS_RTPS_COMMON__SEQUENCENUMBER_HPP
 
 #include <algorithm>
 #include <cassert>
@@ -25,7 +25,7 @@
 #include <vector>
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/utils/fixed_size_bitmap.hpp>
 
 namespace eprosima {
@@ -418,4 +418,4 @@ inline std::istream& operator >>(
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_ELEM_SEQNUM_H_ */
+#endif // FASTDDS_RTPS_COMMON__SEQUENCENUMBER_HPP
diff --git a/include/fastdds/rtps/common/SerializedPayload.h b/include/fastdds/rtps/common/SerializedPayload.hpp
similarity index 92%
rename from include/fastdds/rtps/common/SerializedPayload.h
rename to include/fastdds/rtps/common/SerializedPayload.hpp
index 775a7286641..fcf1b3b1e8d 100644
--- a/include/fastdds/rtps/common/SerializedPayload.h
+++ b/include/fastdds/rtps/common/SerializedPayload.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file SerializedPayload.h
+ * @file SerializedPayload.hpp
  */
 
-#ifndef _FASTDDS_RTPS_SERIALIZEDPAYLOAD_H_
-#define _FASTDDS_RTPS_SERIALIZEDPAYLOAD_H_
+#ifndef FASTDDS_RTPS_COMMON__SERIALIZEDPAYLOAD_HPP
+#define FASTDDS_RTPS_COMMON__SERIALIZEDPAYLOAD_HPP
 
 #include <cstring>
 #include <new>
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 
 /*!
  * @brief Maximum payload is maximum of UDP packet size minus 536bytes (RTPSMESSAGE_COMMON_RTPS_PAYLOAD_SIZE)
@@ -149,8 +149,8 @@ struct FASTDDS_EXPORTED_API SerializedPayload_t
 
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_SERIALIZEDPAYLOAD_H_ */
+#endif // FASTDDS_RTPS_COMMON__SERIALIZEDPAYLOAD_HPP
diff --git a/include/fastdds/rtps/common/Time_t.h b/include/fastdds/rtps/common/Time_t.hpp
similarity index 99%
rename from include/fastdds/rtps/common/Time_t.h
rename to include/fastdds/rtps/common/Time_t.hpp
index 22369beed5b..aa3188019c0 100644
--- a/include/fastdds/rtps/common/Time_t.h
+++ b/include/fastdds/rtps/common/Time_t.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file Time_t.h
+ * @file Time_t.hpp
  */
 
-#ifndef _FASTDDS_RTPS_TIME_T_H_
-#define _FASTDDS_RTPS_TIME_T_H_
+#ifndef FASTDDS_RTPS_COMMON__TIME_T_HPP
+#define FASTDDS_RTPS_COMMON__TIME_T_HPP
 
 #include <fastdds/fastdds_dll.hpp>
 
@@ -694,4 +694,4 @@ const Time_t c_TimeInvalid{-1, Time_t::INFINITE_NANOSECONDS};
 #define TIME_T_INFINITE_SECONDS (eprosima::fastdds::Time_t::INFINITE_SECONDS)
 #define TIME_T_INFINITE_NANOSECONDS (eprosima::fastdds::Time_t::INFINITE_NANOSECONDS)
 
-#endif /* _FASTDDS_RTPS_TIME_T_H_ */
+#endif // FASTDDS_RTPS_COMMON__TIME_T_HPP
diff --git a/include/fastdds/rtps/common/Token.h b/include/fastdds/rtps/common/Token.hpp
similarity index 95%
rename from include/fastdds/rtps/common/Token.h
rename to include/fastdds/rtps/common/Token.hpp
index 9c7d15632be..dcf714f0654 100644
--- a/include/fastdds/rtps/common/Token.h
+++ b/include/fastdds/rtps/common/Token.hpp
@@ -13,14 +13,14 @@
 // limitations under the License.
 
 /*!
- * @file Token.h
+ * @file Token.hpp
  */
-#ifndef _FASTDDS_RTPS_COMMON_TOKEN_H_
-#define _FASTDDS_RTPS_COMMON_TOKEN_H_
+#ifndef FASTDDS_RTPS_COMMON__TOKEN_HPP
+#define FASTDDS_RTPS_COMMON__TOKEN_HPP
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/common/Property.h>
-#include <fastdds/rtps/common/BinaryProperty.h>
+#include <fastdds/rtps/common/Property.hpp>
+#include <fastdds/rtps/common/BinaryProperty.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -193,4 +193,4 @@ class DataHolderHelper
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_RTPS_COMMON_TOKEN_H_
+#endif // FASTDDS_RTPS_COMMON__TOKEN_HPP
diff --git a/include/fastdds/rtps/common/Types.h b/include/fastdds/rtps/common/Types.hpp
similarity index 96%
rename from include/fastdds/rtps/common/Types.h
rename to include/fastdds/rtps/common/Types.hpp
index aee2cb2892e..fc4c515b4c4 100644
--- a/include/fastdds/rtps/common/Types.h
+++ b/include/fastdds/rtps/common/Types.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file Types.h
+ * @file Types.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_TYPES_H_
-#define _FASTDDS_RTPS_COMMON_TYPES_H_
+#ifndef FASTDDS_RTPS_COMMON__TYPES_HPP
+#define FASTDDS_RTPS_COMMON__TYPES_HPP
 
 #include <stddef.h>
 #include <iostream>
@@ -170,4 +170,4 @@ using VendorId_t = eprosima::fastdds::rtps::VendorId_t;
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_COMMON_TYPES_H_ */
+#endif // FASTDDS_RTPS_COMMON__TYPES_HPP
diff --git a/include/fastdds/rtps/common/VendorId_t.hpp b/include/fastdds/rtps/common/VendorId_t.hpp
index 701f5c5ff01..1b6ec7464d8 100644
--- a/include/fastdds/rtps/common/VendorId_t.hpp
+++ b/include/fastdds/rtps/common/VendorId_t.hpp
@@ -16,8 +16,8 @@
  * @file VendorId_t.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_VENDORIDT_HPP_
-#define _FASTDDS_RTPS_COMMON_VENDORIDT_HPP_
+#ifndef FASTDDS_RTPS_COMMON__VENDORID_T_HPP
+#define FASTDDS_RTPS_COMMON__VENDORID_T_HPP
 
 #include <array>
 #include <cstdint>
@@ -54,4 +54,4 @@ inline std::ostream& operator <<(
     return output;
 }
 
-#endif /* _FASTDDS_RTPS_COMMON_VENDORIDT_HPP_ */
+#endif // FASTDDS_RTPS_COMMON__VENDORID_T_HPP
diff --git a/include/fastdds/rtps/common/WriteParams.h b/include/fastdds/rtps/common/WriteParams.hpp
similarity index 95%
rename from include/fastdds/rtps/common/WriteParams.h
rename to include/fastdds/rtps/common/WriteParams.hpp
index 8199448e781..3250991ce6d 100644
--- a/include/fastdds/rtps/common/WriteParams.h
+++ b/include/fastdds/rtps/common/WriteParams.hpp
@@ -13,13 +13,13 @@
 // limitations under the License.
 
 /**
- * @file WriteParams.h
+ * @file WriteParams.hpp
  */
-#ifndef _FASTDDS_RTPS_COMMON_WRITEPARAMS_H_
-#define _FASTDDS_RTPS_COMMON_WRITEPARAMS_H_
+#ifndef FASTDDS_RTPS_COMMON__WRITEPARAMS_HPP
+#define FASTDDS_RTPS_COMMON__WRITEPARAMS_HPP
 
-#include <fastdds/rtps/common/SampleIdentity.h>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/SampleIdentity.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -210,4 +210,4 @@ class FASTDDS_EXPORTED_API WriteParams
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif //_FASTDDS_RTPS_COMMON_WRITEPARAMS_H_
+#endif //FASTDDS_RTPS_COMMON__WRITEPARAMS_HPP
diff --git a/include/fastdds/rtps/flowcontrol/FlowControllerConsts.hpp b/include/fastdds/rtps/flowcontrol/FlowControllerConsts.hpp
index 37bd42941c0..cdc2623e02c 100644
--- a/include/fastdds/rtps/flowcontrol/FlowControllerConsts.hpp
+++ b/include/fastdds/rtps/flowcontrol/FlowControllerConsts.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_RTPS_FLOWCONTROL_FLOWCONTROLLERCONSTS_HPP
-#define FASTDDS_RTPS_FLOWCONTROL_FLOWCONTROLLERCONSTS_HPP
+#ifndef FASTDDS_RTPS_FLOWCONTROL__FLOWCONTROLLERCONSTS_HPP
+#define FASTDDS_RTPS_FLOWCONTROL__FLOWCONTROLLERCONSTS_HPP
 
 #include <fastdds/fastdds_dll.hpp>
 
@@ -30,4 +30,4 @@ extern FASTDDS_EXPORTED_API const char* const FASTDDS_STATISTICS_FLOW_CONTROLLER
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_RTPS_FLOWCONTROL_FLOWCONTROLLERCONSTS_HPP
+#endif // FASTDDS_RTPS_FLOWCONTROL__FLOWCONTROLLERCONSTS_HPP
diff --git a/include/fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp b/include/fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp
index 55d05780bf8..df67255fb03 100644
--- a/include/fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp
+++ b/include/fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_RTPS_FLOWCONTROL_FLOWCONTROLLERDESCRIPTOR_HPP
-#define FASTDDS_RTPS_FLOWCONTROL_FLOWCONTROLLERDESCRIPTOR_HPP
+#ifndef FASTDDS_RTPS_FLOWCONTROL__FLOWCONTROLLERDESCRIPTOR_HPP
+#define FASTDDS_RTPS_FLOWCONTROL__FLOWCONTROLLERDESCRIPTOR_HPP
 
 #include <string>
 
@@ -64,4 +64,4 @@ struct FlowControllerDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_RTPS_FLOWCONTROL_FLOWCONTROLLERDESCRIPTOR_HPP
+#endif // FASTDDS_RTPS_FLOWCONTROL__FLOWCONTROLLERDESCRIPTOR_HPP
diff --git a/include/fastdds/rtps/flowcontrol/FlowControllerSchedulerPolicy.hpp b/include/fastdds/rtps/flowcontrol/FlowControllerSchedulerPolicy.hpp
index 1e2f8c43744..957016297d2 100644
--- a/include/fastdds/rtps/flowcontrol/FlowControllerSchedulerPolicy.hpp
+++ b/include/fastdds/rtps/flowcontrol/FlowControllerSchedulerPolicy.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef FASTDDS_RTPS_FLOWCONTROL_FLOWCONTROLLERSCHEDULERPOLICY_HPP
-#define FASTDDS_RTPS_FLOWCONTROL_FLOWCONTROLLERSCHEDULERPOLICY_HPP
+#ifndef FASTDDS_RTPS_FLOWCONTROL__FLOWCONTROLLERSCHEDULERPOLICY_HPP
+#define FASTDDS_RTPS_FLOWCONTROL__FLOWCONTROLLERSCHEDULERPOLICY_HPP
 
 #include <cstdint>
 
@@ -44,4 +44,4 @@ enum class FlowControllerSchedulerPolicy : int32_t
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_RTPS_FLOWCONTROL_FLOWCONTROLLERSCHEDULERPOLICY_HPP
+#endif // FASTDDS_RTPS_FLOWCONTROL__FLOWCONTROLLERSCHEDULERPOLICY_HPP
diff --git a/include/fastdds/rtps/history/History.h b/include/fastdds/rtps/history/History.hpp
similarity index 95%
rename from include/fastdds/rtps/history/History.h
rename to include/fastdds/rtps/history/History.hpp
index fdf3773505e..7950976a6da 100644
--- a/include/fastdds/rtps/history/History.h
+++ b/include/fastdds/rtps/history/History.hpp
@@ -13,19 +13,19 @@
 // limitations under the License.
 
 /**
- * @file History.h
+ * @file History.hpp
  *
  */
 
-#ifndef _FASTDDS_RTPS_HISTORY_H_
-#define _FASTDDS_RTPS_HISTORY_H_
+#ifndef FASTDDS_RTPS_HISTORY__HISTORY_HPP
+#define FASTDDS_RTPS_HISTORY__HISTORY_HPP
 
 #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 <fastdds/rtps/history/IChangePool.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 
 #include <cassert>
@@ -296,4 +296,4 @@ class History
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_HISTORY_H_ */
+#endif // FASTDDS_RTPS_HISTORY__HISTORY_HPP
diff --git a/include/fastdds/rtps/history/IChangePool.h b/include/fastdds/rtps/history/IChangePool.hpp
similarity index 88%
rename from include/fastdds/rtps/history/IChangePool.h
rename to include/fastdds/rtps/history/IChangePool.hpp
index 313e31049b9..3942c48edc8 100644
--- a/include/fastdds/rtps/history/IChangePool.h
+++ b/include/fastdds/rtps/history/IChangePool.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file IChangePool.h
+ * @file IChangePool.hpp
  */
 
-#ifndef _FASTDDS_RTPS_HISTORY_ICHANGEPOOL_H_
-#define _FASTDDS_RTPS_HISTORY_ICHANGEPOOL_H_
+#ifndef FASTDDS_RTPS_HISTORY__ICHANGEPOOL_HPP
+#define FASTDDS_RTPS_HISTORY__ICHANGEPOOL_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -65,9 +65,9 @@ class IChangePool
             CacheChange_t* cache_change) = 0;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 
-#endif /* _FASTDDS_RTPS_HISTORY_ICHANGEPOOL_H_ */
+#endif // FASTDDS_RTPS_HISTORY__ICHANGEPOOL_HPP
diff --git a/include/fastdds/rtps/history/IPayloadPool.h b/include/fastdds/rtps/history/IPayloadPool.hpp
similarity index 93%
rename from include/fastdds/rtps/history/IPayloadPool.h
rename to include/fastdds/rtps/history/IPayloadPool.hpp
index a565ee54843..00e3833a6ba 100644
--- a/include/fastdds/rtps/history/IPayloadPool.h
+++ b/include/fastdds/rtps/history/IPayloadPool.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file IPayloadPool.h
+ * @file IPayloadPool.hpp
  */
 
-#ifndef _FASTDDS_RTPS_HISTORY_IPAYLOADPOOL_H_
-#define _FASTDDS_RTPS_HISTORY_IPAYLOADPOOL_H_
+#ifndef FASTDDS_RTPS_HISTORY__IPAYLOADPOOL_HPP
+#define FASTDDS_RTPS_HISTORY__IPAYLOADPOOL_HPP
 
 #include <cstdint>
 #include <memory>
@@ -103,9 +103,9 @@ class IPayloadPool
             SerializedPayload_t& payload) = 0;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 
-#endif /* _FASTDDS_RTPS_HISTORY_IPAYLOADPOOL_H_ */
+#endif // FASTDDS_RTPS_HISTORY__IPAYLOADPOOL_HPP
diff --git a/include/fastdds/rtps/history/ReaderHistory.h b/include/fastdds/rtps/history/ReaderHistory.hpp
similarity index 97%
rename from include/fastdds/rtps/history/ReaderHistory.h
rename to include/fastdds/rtps/history/ReaderHistory.hpp
index 606b3a0cbbe..cdc1286ad87 100644
--- a/include/fastdds/rtps/history/ReaderHistory.h
+++ b/include/fastdds/rtps/history/ReaderHistory.hpp
@@ -13,15 +13,15 @@
 // limitations under the License.
 
 /**
- * @file ReaderHistory.h
+ * @file ReaderHistory.hpp
  *
  */
 
-#ifndef _FASTDDS_RTPS_READERHISTORY_H_
-#define _FASTDDS_RTPS_READERHISTORY_H_
+#ifndef FASTDDS_RTPS_HISTORY__READERHISTORY_HPP
+#define FASTDDS_RTPS_HISTORY__READERHISTORY_HPP
 
-#include <fastdds/rtps/history/History.h>
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/history/History.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/dds/core/status/SampleRejectedStatus.hpp>
 
 namespace eprosima {
@@ -271,4 +271,4 @@ class ReaderHistory : public History
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_READERHISTORY_H_ */
+#endif // FASTDDS_RTPS_HISTORY__READERHISTORY_HPP
diff --git a/include/fastdds/rtps/history/WriterHistory.h b/include/fastdds/rtps/history/WriterHistory.hpp
similarity index 97%
rename from include/fastdds/rtps/history/WriterHistory.h
rename to include/fastdds/rtps/history/WriterHistory.hpp
index 2ca114720aa..5af83c16748 100644
--- a/include/fastdds/rtps/history/WriterHistory.h
+++ b/include/fastdds/rtps/history/WriterHistory.hpp
@@ -13,14 +13,14 @@
 // limitations under the License.
 
 /**
- * @file WriterHistory.h
+ * @file WriterHistory.hpp
  *
  */
 
-#ifndef _FASTDDS_RTPS_WRITERHISTORY_H_
-#define _FASTDDS_RTPS_WRITERHISTORY_H_
+#ifndef FASTDDS_RTPS_HISTORY__WRITERHISTORY_HPP
+#define FASTDDS_RTPS_HISTORY__WRITERHISTORY_HPP
 
-#include <fastdds/rtps/history/History.h>
+#include <fastdds/rtps/history/History.hpp>
 #include <fastdds/dds/log/Log.hpp>
 
 namespace eprosima {
@@ -251,7 +251,7 @@ class WriterHistory : public rtps::History
 };
 
 } // namespace rtps
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_WRITERHISTORY_H_ */
+#endif // FASTDDS_RTPS_HISTORY__WRITERHISTORY_HPP
diff --git a/include/fastdds/rtps/interfaces/IReaderDataFilter.hpp b/include/fastdds/rtps/interfaces/IReaderDataFilter.hpp
index 79cc7637140..2843c9ddf0e 100644
--- a/include/fastdds/rtps/interfaces/IReaderDataFilter.hpp
+++ b/include/fastdds/rtps/interfaces/IReaderDataFilter.hpp
@@ -17,11 +17,11 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_IREADERDATAFILTER_HPP_
-#define _FASTDDS_RTPS_IREADERDATAFILTER_HPP_
+#ifndef FASTDDS_RTPS_INTERFACES__IREADERDATAFILTER_HPP
+#define FASTDDS_RTPS_INTERFACES__IREADERDATAFILTER_HPP
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 
 
 namespace eprosima {
@@ -48,8 +48,8 @@ class IReaderDataFilter
             const fastdds::rtps::GUID_t& reader_guid) const = 0;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_IREADERDATAFILTER_HPP_ */
+#endif // FASTDDS_RTPS_INTERFACES__IREADERDATAFILTER_HPP
diff --git a/include/fastdds/rtps/messages/RTPSMessageSenderInterface.hpp b/include/fastdds/rtps/messages/RTPSMessageSenderInterface.hpp
index e8848117483..d33b7f668aa 100644
--- a/include/fastdds/rtps/messages/RTPSMessageSenderInterface.hpp
+++ b/include/fastdds/rtps/messages/RTPSMessageSenderInterface.hpp
@@ -17,15 +17,15 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_MESSAGES_RTPSMESSAGESENDERINTERFACE_HPP_
-#define _FASTDDS_RTPS_MESSAGES_RTPSMESSAGESENDERINTERFACE_HPP_
+#ifndef FASTDDS_RTPS_MESSAGES__RTPSMESSAGESENDERINTERFACE_HPP
+#define FASTDDS_RTPS_MESSAGES__RTPSMESSAGESENDERINTERFACE_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <chrono>
 #include <vector>
 
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/transport/NetworkBuffer.hpp>
 
 namespace eprosima {
@@ -98,10 +98,10 @@ class RTPSMessageSenderInterface
 
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif /* _FASTDDS_RTPS_MESSAGES_RTPSMESSAGESENDERINTERFACE_HPP_ */
+#endif // FASTDDS_RTPS_MESSAGES__RTPSMESSAGESENDERINTERFACE_HPP
diff --git a/include/fastdds/rtps/messages/RTPS_messages.h b/include/fastdds/rtps/messages/RTPS_messages.hpp
similarity index 92%
rename from include/fastdds/rtps/messages/RTPS_messages.h
rename to include/fastdds/rtps/messages/RTPS_messages.hpp
index 069f8184d2c..4043041c41c 100644
--- a/include/fastdds/rtps/messages/RTPS_messages.h
+++ b/include/fastdds/rtps/messages/RTPS_messages.hpp
@@ -13,18 +13,18 @@
 // limitations under the License.
 
 /**
- * @file RTPS_messages.h
+ * @file RTPS_messages.hpp
  */
 
-#ifndef _FASTDDS_RTPS_RTPS_MESSAGES_H_
-#define _FASTDDS_RTPS_RTPS_MESSAGES_H_
+#ifndef FASTDDS_RTPS_MESSAGES__RTPS_MESSAGES_HPP
+#define FASTDDS_RTPS_MESSAGES__RTPS_MESSAGES_HPP
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <iostream>
 #include <bitset>
 
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 
 namespace eprosima {
@@ -128,4 +128,4 @@ inline std::ostream& operator <<(
 
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_MESSAGES_H_ */
+#endif // FASTDDS_RTPS_MESSAGES__RTPS_MESSAGES_HPP
diff --git a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp
similarity index 92%
rename from include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h
rename to include/fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp
index 7e4405b745c..7cc875e6a4f 100644
--- a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h
+++ b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 /**
- * @file ParticipantDiscoveryInfo.h
+ * @file ParticipantDiscoveryInfo.hpp
  *
  */
 
-#ifndef _FASTDDS_RTPS_PARTICIPANT_PARTICIPANTDISCOVERYINFO_H__
-#define _FASTDDS_RTPS_PARTICIPANT_PARTICIPANTDISCOVERYINFO_H__
+#ifndef FASTDDS_RTPS_PARTICIPANT__PARTICIPANTDISCOVERYINFO_HPP
+#define FASTDDS_RTPS_PARTICIPANT__PARTICIPANTDISCOVERYINFO_HPP
 
 #include <fastdds/fastdds_dll.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
@@ -113,4 +113,4 @@ inline bool operator ==(
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_PARTICIPANT_PARTICIPANTDISCOVERYINFO_H__
+#endif // FASTDDS_RTPS_PARTICIPANT__PARTICIPANTDISCOVERYINFO_HPP
diff --git a/include/fastdds/rtps/participant/RTPSParticipant.h b/include/fastdds/rtps/participant/RTPSParticipant.hpp
similarity index 97%
rename from include/fastdds/rtps/participant/RTPSParticipant.h
rename to include/fastdds/rtps/participant/RTPSParticipant.hpp
index 91a179c747b..8d37303823a 100644
--- a/include/fastdds/rtps/participant/RTPSParticipant.h
+++ b/include/fastdds/rtps/participant/RTPSParticipant.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file RTPSParticipant.h
+ * @file RTPSParticipant.hpp
  */
 
-#ifndef _FASTDDS_RTPS_RTPSParticipant_H_
-#define _FASTDDS_RTPS_RTPSParticipant_H_
+#ifndef FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANT_HPP
+#define FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANT_HPP
 
 #include <cstdint>
 #include <cstdlib>
@@ -25,9 +25,9 @@
 
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/statistics/IListeners.hpp>
 #include <fastdds/fastdds_dll.hpp>
 
@@ -440,7 +440,7 @@ class FASTDDS_EXPORTED_API RTPSParticipant
 };
 
 } // namespace rtps
-} /* namespace rtps */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_RTPSParticipant_H_ */
+#endif // FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANT_HPP
diff --git a/include/fastdds/rtps/participant/RTPSParticipantListener.h b/include/fastdds/rtps/participant/RTPSParticipantListener.hpp
similarity index 90%
rename from include/fastdds/rtps/participant/RTPSParticipantListener.h
rename to include/fastdds/rtps/participant/RTPSParticipantListener.hpp
index 54a9d67b6e4..f0a4fac72ef 100644
--- a/include/fastdds/rtps/participant/RTPSParticipantListener.h
+++ b/include/fastdds/rtps/participant/RTPSParticipantListener.hpp
@@ -13,16 +13,16 @@
 // limitations under the License.
 
 /**
- * @file RTPSParticipantListener.h
+ * @file RTPSParticipantListener.hpp
  *
  */
 
-#ifndef _FASTDDS_RTPS_PARTICIPANT_RTPSPARTICIPANTLISTENER_H__
-#define _FASTDDS_RTPS_PARTICIPANT_RTPSPARTICIPANTLISTENER_H__
+#ifndef FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANTLISTENER_HPP
+#define FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANTLISTENER_HPP
 
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
-#include <fastdds/rtps/reader/ReaderDiscoveryInfo.h>
-#include <fastdds/rtps/writer/WriterDiscoveryInfo.h>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
+#include <fastdds/rtps/reader/ReaderDiscoveryInfo.hpp>
+#include <fastdds/rtps/writer/WriterDiscoveryInfo.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -118,4 +118,4 @@ class FASTDDS_EXPORTED_API RTPSParticipantListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif //_FASTDDS_RTPS_PARTICIPANT_RTPSPARTICIPANTLISTENER_H__
+#endif //FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANTLISTENER_HPP
diff --git a/include/fastdds/rtps/reader/RTPSReader.h b/include/fastdds/rtps/reader/RTPSReader.hpp
similarity index 94%
rename from include/fastdds/rtps/reader/RTPSReader.h
rename to include/fastdds/rtps/reader/RTPSReader.hpp
index ee0cfe4cf84..4f8ec70bdb0 100644
--- a/include/fastdds/rtps/reader/RTPSReader.h
+++ b/include/fastdds/rtps/reader/RTPSReader.hpp
@@ -13,22 +13,22 @@
 // limitations under the License.
 
 /**
- * @file RTPSReader.h
+ * @file RTPSReader.hpp
  */
 
-#ifndef _FASTDDS_RTPS_READER_RTPSREADER_H_
-#define _FASTDDS_RTPS_READER_RTPSREADER_H_
+#ifndef FASTDDS_RTPS_READER__RTPSREADER_HPP
+#define FASTDDS_RTPS_READER__RTPSREADER_HPP
 
 #include <cstdint>
 #include <memory>
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/Endpoint.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/Endpoint.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
 #include <fastdds/statistics/IListeners.hpp>
 #include <fastdds/statistics/rtps/monitor_service/connections_fwd.hpp>
@@ -254,8 +254,8 @@ class RTPSReader : public Endpoint
 
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_READER_RTPSREADER_H_ */
+#endif // FASTDDS_RTPS_READER__RTPSREADER_HPP
diff --git a/include/fastdds/rtps/reader/ReaderDiscoveryInfo.h b/include/fastdds/rtps/reader/ReaderDiscoveryInfo.hpp
similarity index 87%
rename from include/fastdds/rtps/reader/ReaderDiscoveryInfo.h
rename to include/fastdds/rtps/reader/ReaderDiscoveryInfo.hpp
index 3305016a8e3..79b9a44297b 100644
--- a/include/fastdds/rtps/reader/ReaderDiscoveryInfo.h
+++ b/include/fastdds/rtps/reader/ReaderDiscoveryInfo.hpp
@@ -13,15 +13,15 @@
 // limitations under the License.
 
 /**
- * @file ReaderDiscoveryInfo.h
+ * @file ReaderDiscoveryInfo.hpp
  *
  */
 
-#ifndef _FASTDDS_RTPS_READER_READERDISCOVERYINFO_H__
-#define _FASTDDS_RTPS_READER_READERDISCOVERYINFO_H__
+#ifndef FASTDDS_RTPS_READER__READERDISCOVERYINFO_HPP
+#define FASTDDS_RTPS_READER__READERDISCOVERYINFO_HPP
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -73,4 +73,4 @@ struct ReaderDiscoveryInfo
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_READER_READERDISCOVERYINFO_H__
+#endif // FASTDDS_RTPS_READER__READERDISCOVERYINFO_HPP
diff --git a/include/fastdds/rtps/reader/ReaderListener.h b/include/fastdds/rtps/reader/ReaderListener.hpp
similarity index 95%
rename from include/fastdds/rtps/reader/ReaderListener.h
rename to include/fastdds/rtps/reader/ReaderListener.hpp
index 3a7ef7c67d3..325e3f40070 100644
--- a/include/fastdds/rtps/reader/ReaderListener.h
+++ b/include/fastdds/rtps/reader/ReaderListener.hpp
@@ -13,20 +13,20 @@
 // limitations under the License.
 
 /**
- * @file ReaderListener.h
+ * @file ReaderListener.hpp
  *
  */
 
-#ifndef _FASTDDS_RTPS_READERLISTENER_H_
-#define _FASTDDS_RTPS_READERLISTENER_H_
+#ifndef FASTDDS_RTPS_READER__READERLISTENER_HPP
+#define FASTDDS_RTPS_READER__READERLISTENER_HPP
 
 #include <fastdds/dds/core/status/LivelinessChangedStatus.hpp>
 #include <fastdds/dds/core/status/SubscriptionMatchedStatus.hpp>
 #include <fastdds/dds/core/status/SampleRejectedStatus.hpp>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/MatchingInfo.h>
-#include <fastdds/rtps/writer/WriterDiscoveryInfo.h>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/MatchingInfo.hpp>
+#include <fastdds/rtps/writer/WriterDiscoveryInfo.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -203,4 +203,4 @@ class FASTDDS_EXPORTED_API ReaderListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_READERLISTENER_H_ */
+#endif // FASTDDS_RTPS_READER__READERLISTENER_HPP
diff --git a/include/fastdds/rtps/transport/ChainingTransport.h b/include/fastdds/rtps/transport/ChainingTransport.hpp
similarity index 98%
rename from include/fastdds/rtps/transport/ChainingTransport.h
rename to include/fastdds/rtps/transport/ChainingTransport.hpp
index bcfb681fbec..5b84b159bf1 100644
--- a/include/fastdds/rtps/transport/ChainingTransport.h
+++ b/include/fastdds/rtps/transport/ChainingTransport.hpp
@@ -12,14 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_RTPS_TRANSPORT_CHAININGTRANSPORT_H_
-#define _FASTDDS_RTPS_TRANSPORT_CHAININGTRANSPORT_H_
+/**
+ * @file ChainingTransport.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__CHAININGTRANSPORT_HPP
+#define FASTDDS_RTPS_TRANSPORT__CHAININGTRANSPORT_HPP
 
 #include <map>
 #include <memory>
 
-#include "TransportInterface.h"
-#include "ChainingTransportDescriptor.h"
+#include "TransportInterface.hpp"
+#include "ChainingTransportDescriptor.hpp"
 
 namespace eprosima {
 namespace fastdds {
@@ -397,4 +402,4 @@ class ChainingTransport : public TransportInterface
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_TRANSPORT_CHAININGTRANSPORT_H_
+#endif // FASTDDS_RTPS_TRANSPORT__CHAININGTRANSPORT_HPP
diff --git a/include/fastdds/rtps/transport/ChainingTransportDescriptor.h b/include/fastdds/rtps/transport/ChainingTransportDescriptor.hpp
similarity index 89%
rename from include/fastdds/rtps/transport/ChainingTransportDescriptor.h
rename to include/fastdds/rtps/transport/ChainingTransportDescriptor.hpp
index 8cfddb57638..dffff0b56de 100644
--- a/include/fastdds/rtps/transport/ChainingTransportDescriptor.h
+++ b/include/fastdds/rtps/transport/ChainingTransportDescriptor.hpp
@@ -12,13 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_RTPS_TRANSPORT_CHAININGTRANSPORTDESCRIPTOR_H_
-#define _FASTDDS_RTPS_TRANSPORT_CHAININGTRANSPORTDESCRIPTOR_H_
+/**
+ * @file ChainingTransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__CHAININGTRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__CHAININGTRANSPORTDESCRIPTOR_HPP
 
 #include <memory>
 #include <vector>
 
-#include "TransportInterface.h"
+#include "TransportInterface.hpp"
 
 namespace eprosima {
 namespace fastdds {
@@ -72,4 +77,4 @@ typedef struct ChainingTransportDescriptor : public TransportDescriptorInterface
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_TRANSPORT_CHAININGTRANSPORTDESCRIPTOR_H_
+#endif // FASTDDS_RTPS_TRANSPORT__CHAININGTRANSPORTDESCRIPTOR_HPP
diff --git a/include/fastdds/rtps/transport/NetworkBuffer.hpp b/include/fastdds/rtps/transport/NetworkBuffer.hpp
index 7ad62012bb7..eb447036afb 100644
--- a/include/fastdds/rtps/transport/NetworkBuffer.hpp
+++ b/include/fastdds/rtps/transport/NetworkBuffer.hpp
@@ -16,8 +16,8 @@
  * @file NetworkBuffer.hpp
  */
 
-#ifndef _FASTDDS_RTPS_NETWORK_NETWORKBUFFER_HPP
-#define _FASTDDS_RTPS_NETWORK_NETWORKBUFFER_HPP
+#ifndef FASTDDS_RTPS_TRANSPORT__NETWORKBUFFER_HPP
+#define FASTDDS_RTPS_TRANSPORT__NETWORKBUFFER_HPP
 
 #include <cstdint>
 
@@ -59,4 +59,4 @@ struct NetworkBuffer final
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // _FASTDDS_RTPS_NETWORK_NETWORKBUFFER_HPP
+#endif  // FASTDDS_RTPS_TRANSPORT__NETWORKBUFFER_HPP
diff --git a/include/fastdds/rtps/transport/PortBasedTransportDescriptor.hpp b/include/fastdds/rtps/transport/PortBasedTransportDescriptor.hpp
index fa3714d9c52..99103b65f57 100644
--- a/include/fastdds/rtps/transport/PortBasedTransportDescriptor.hpp
+++ b/include/fastdds/rtps/transport/PortBasedTransportDescriptor.hpp
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_PORT_BASED_TRANSPORT_DESCRIPTOR_H_
-#define _FASTDDS_PORT_BASED_TRANSPORT_DESCRIPTOR_H_
+#ifndef FASTDDS_RTPS_TRANSPORT__PORTBASEDTRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__PORTBASEDTRANSPORTDESCRIPTOR_HPP
 
 #include <cstdint>
 #include <map>
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/transport/TransportDescriptorInterface.h>
+#include <fastdds/rtps/transport/TransportDescriptorInterface.hpp>
 #include <fastdds/fastdds_dll.hpp>
 
 namespace eprosima {
@@ -110,4 +110,4 @@ class PortBasedTransportDescriptor : public TransportDescriptorInterface
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // ifndef _FASTDDS_PORT_BASED_TRANSPORT_DESCRIPTOR_H_
+#endif // FASTDDS_RTPS_TRANSPORT__PORTBASEDTRANSPORTDESCRIPTOR_HPP
diff --git a/include/fastdds/rtps/transport/SenderResource.h b/include/fastdds/rtps/transport/SenderResource.hpp
similarity index 94%
rename from include/fastdds/rtps/transport/SenderResource.h
rename to include/fastdds/rtps/transport/SenderResource.hpp
index 0670d442c5e..91939446c54 100644
--- a/include/fastdds/rtps/transport/SenderResource.h
+++ b/include/fastdds/rtps/transport/SenderResource.hpp
@@ -12,10 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_RTPS_TRANSPORT_SENDERRESOURCE_H_
-#define _FASTDDS_RTPS_TRANSPORT_SENDERRESOURCE_H_
+/**
+ * @file SenderResource.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__SENDERRESOURCE_HPP
+#define FASTDDS_RTPS_TRANSPORT__SENDERRESOURCE_HPP
 
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 
 #include <functional>
 #include <vector>
@@ -128,4 +133,4 @@ class SenderResource
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_TRANSPORT_SENDERRESOURCE_H_ */
+#endif // FASTDDS_RTPS_TRANSPORT__SENDERRESOURCE_HPP
diff --git a/include/fastdds/rtps/transport/SocketTransportDescriptor.h b/include/fastdds/rtps/transport/SocketTransportDescriptor.hpp
similarity index 94%
rename from include/fastdds/rtps/transport/SocketTransportDescriptor.h
rename to include/fastdds/rtps/transport/SocketTransportDescriptor.hpp
index 421fde9f8be..0065ed0eaca 100644
--- a/include/fastdds/rtps/transport/SocketTransportDescriptor.h
+++ b/include/fastdds/rtps/transport/SocketTransportDescriptor.hpp
@@ -12,8 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_SOCKET_TRANSPORT_DESCRIPTOR_H_
-#define _FASTDDS_SOCKET_TRANSPORT_DESCRIPTOR_H_
+/**
+ * @file SocketTransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__SOCKETTRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__SOCKETTRANSPORTDESCRIPTOR_HPP
 
 #include <cstdint>
 #include <vector>
@@ -108,4 +113,4 @@ struct SocketTransportDescriptor : public PortBasedTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif //_FASTDDS_SOCKET_TRANSPORT_DESCRIPTOR_H_
+#endif //FASTDDS_RTPS_TRANSPORT__SOCKETTRANSPORTDESCRIPTOR_HPP
diff --git a/include/fastdds/rtps/transport/TCPTransportDescriptor.h b/include/fastdds/rtps/transport/TCPTransportDescriptor.hpp
similarity index 97%
rename from include/fastdds/rtps/transport/TCPTransportDescriptor.h
rename to include/fastdds/rtps/transport/TCPTransportDescriptor.hpp
index c5cee7ae0b0..9c05c038829 100644
--- a/include/fastdds/rtps/transport/TCPTransportDescriptor.h
+++ b/include/fastdds/rtps/transport/TCPTransportDescriptor.hpp
@@ -12,8 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_TCP_TRANSPORT_DESCRIPTOR_H_
-#define _FASTDDS_TCP_TRANSPORT_DESCRIPTOR_H_
+/**
+ * @file TCPTransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__TCPTRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__TCPTRANSPORTDESCRIPTOR_HPP
 
 #include <cstdint>
 #include <iostream>
@@ -21,7 +26,7 @@
 #include <vector>
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/transport/SocketTransportDescriptor.h>
+#include <fastdds/rtps/transport/SocketTransportDescriptor.hpp>
 #include <fastdds/fastdds_dll.hpp>
 
 namespace eprosima {
@@ -326,4 +331,4 @@ struct TCPTransportDescriptor : public SocketTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TCP_TRANSPORT_DESCRIPTOR_H_
+#endif // FASTDDS_RTPS_TRANSPORT__TCPTRANSPORTDESCRIPTOR_HPP
diff --git a/include/fastdds/rtps/transport/TCPv4TransportDescriptor.h b/include/fastdds/rtps/transport/TCPv4TransportDescriptor.hpp
similarity index 89%
rename from include/fastdds/rtps/transport/TCPv4TransportDescriptor.h
rename to include/fastdds/rtps/transport/TCPv4TransportDescriptor.hpp
index b2c43629b77..e3313f1b6a9 100644
--- a/include/fastdds/rtps/transport/TCPv4TransportDescriptor.h
+++ b/include/fastdds/rtps/transport/TCPv4TransportDescriptor.hpp
@@ -12,13 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_TCPV4_TRANSPORT_DESCRIPTOR_
-#define _FASTDDS_TCPV4_TRANSPORT_DESCRIPTOR_
+/**
+ * @file TCPv4TransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__TCPV4TRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__TCPV4TRANSPORTDESCRIPTOR_HPP
 
 #include <sstream>
 
-#include <fastdds/rtps/transport/TCPTransportDescriptor.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/transport/TCPTransportDescriptor.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -100,4 +105,4 @@ struct TCPv4TransportDescriptor : public TCPTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TCPV4_TRANSPORT_DESCRIPTOR_
+#endif // FASTDDS_RTPS_TRANSPORT__TCPV4TRANSPORTDESCRIPTOR_HPP
diff --git a/include/fastdds/rtps/transport/TCPv6TransportDescriptor.h b/include/fastdds/rtps/transport/TCPv6TransportDescriptor.hpp
similarity index 84%
rename from include/fastdds/rtps/transport/TCPv6TransportDescriptor.h
rename to include/fastdds/rtps/transport/TCPv6TransportDescriptor.hpp
index a490f6715f2..2b5fd2fdbe5 100644
--- a/include/fastdds/rtps/transport/TCPv6TransportDescriptor.h
+++ b/include/fastdds/rtps/transport/TCPv6TransportDescriptor.hpp
@@ -12,10 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_TCPV6_TRANSPORT_DESCRIPTOR_
-#define _FASTDDS_TCPV6_TRANSPORT_DESCRIPTOR_
+/**
+ * @file TCPv6TransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__TCPV6TRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__TCPV6TRANSPORTDESCRIPTOR_HPP
 
-#include <fastdds/rtps/transport/TCPTransportDescriptor.h>
+#include <fastdds/rtps/transport/TCPTransportDescriptor.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -54,4 +59,4 @@ struct TCPv6TransportDescriptor : public TCPTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TCPV6_TRANSPORT_DESCRIPTOR_
+#endif // FASTDDS_RTPS_TRANSPORT__TCPV6TRANSPORTDESCRIPTOR_HPP
diff --git a/include/fastdds/rtps/transport/TransportDescriptorInterface.h b/include/fastdds/rtps/transport/TransportDescriptorInterface.hpp
similarity index 94%
rename from include/fastdds/rtps/transport/TransportDescriptorInterface.h
rename to include/fastdds/rtps/transport/TransportDescriptorInterface.hpp
index 2327566808c..24679fefb05 100644
--- a/include/fastdds/rtps/transport/TransportDescriptorInterface.h
+++ b/include/fastdds/rtps/transport/TransportDescriptorInterface.hpp
@@ -12,8 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_TRANSPORT_DESCRIPTOR_INTERFACE_H_
-#define _FASTDDS_TRANSPORT_DESCRIPTOR_INTERFACE_H_
+/**
+ * @file TransportDescriptorInterface.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__TRANSPORTDESCRIPTORINTERFACE_HPP
+#define FASTDDS_RTPS_TRANSPORT__TRANSPORTDESCRIPTORINTERFACE_HPP
 
 #include <cstdint>
 #include <mutex>
@@ -129,4 +134,4 @@ struct TransportDescriptorInterface
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TRANSPORT_DESCRIPTOR_INTERFACE_H_
+#endif // FASTDDS_RTPS_TRANSPORT__TRANSPORTDESCRIPTORINTERFACE_HPP
diff --git a/include/fastdds/rtps/transport/TransportInterface.h b/include/fastdds/rtps/transport/TransportInterface.hpp
similarity index 95%
rename from include/fastdds/rtps/transport/TransportInterface.h
rename to include/fastdds/rtps/transport/TransportInterface.hpp
index 641c096c076..7f2e6329b8f 100644
--- a/include/fastdds/rtps/transport/TransportInterface.h
+++ b/include/fastdds/rtps/transport/TransportInterface.hpp
@@ -12,24 +12,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_TRANSPORT_INTERFACE_H
-#define _FASTDDS_TRANSPORT_INTERFACE_H
+/**
+ * @file TransportInterface.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__TRANSPORTINTERFACE_HPP
+#define FASTDDS_RTPS_TRANSPORT__TRANSPORTINTERFACE_HPP
 
 #include <memory>
 #include <vector>
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/LocatorSelector.hpp>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 #include <fastdds/rtps/common/LocatorWithMask.hpp>
-#include <fastdds/rtps/common/PortParameters.h>
+#include <fastdds/rtps/common/PortParameters.hpp>
 #include <fastdds/rtps/transport/network/AllowedNetworkInterface.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
-#include <fastdds/rtps/transport/SenderResource.h>
-#include <fastdds/rtps/transport/TransportDescriptorInterface.h>
-#include <fastdds/rtps/transport/TransportReceiverInterface.h>
+#include <fastdds/rtps/transport/SenderResource.hpp>
+#include <fastdds/rtps/transport/TransportDescriptorInterface.hpp>
+#include <fastdds/rtps/transport/TransportReceiverInterface.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -327,4 +332,4 @@ class FASTDDS_EXPORTED_API TransportInterface
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TRANSPORT_INTERFACE_H
+#endif // FASTDDS_RTPS_TRANSPORT__TRANSPORTINTERFACE_HPP
diff --git a/include/fastdds/rtps/transport/TransportReceiverInterface.h b/include/fastdds/rtps/transport/TransportReceiverInterface.hpp
similarity index 84%
rename from include/fastdds/rtps/transport/TransportReceiverInterface.h
rename to include/fastdds/rtps/transport/TransportReceiverInterface.hpp
index f6066a98d61..458bbf7be3a 100644
--- a/include/fastdds/rtps/transport/TransportReceiverInterface.h
+++ b/include/fastdds/rtps/transport/TransportReceiverInterface.hpp
@@ -12,10 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_TRANSPORT_RECEIVER_INTERFACE_H
-#define _FASTDDS_TRANSPORT_RECEIVER_INTERFACE_H
+/**
+ * @file TransportReceiverInterface.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__TRANSPORTRECEIVERINTERFACE_HPP
+#define FASTDDS_RTPS_TRANSPORT__TRANSPORTRECEIVERINTERFACE_HPP
 
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -50,4 +55,4 @@ class FASTDDS_EXPORTED_API TransportReceiverInterface
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TRANSPORT_RECEIVER_INTERFACE_H
+#endif // FASTDDS_RTPS_TRANSPORT__TRANSPORTRECEIVERINTERFACE_HPP
diff --git a/include/fastdds/rtps/transport/UDPTransportDescriptor.h b/include/fastdds/rtps/transport/UDPTransportDescriptor.hpp
similarity index 89%
rename from include/fastdds/rtps/transport/UDPTransportDescriptor.h
rename to include/fastdds/rtps/transport/UDPTransportDescriptor.hpp
index c06ae15d22a..37743c8df81 100644
--- a/include/fastdds/rtps/transport/UDPTransportDescriptor.h
+++ b/include/fastdds/rtps/transport/UDPTransportDescriptor.hpp
@@ -12,10 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_UDP_TRANSPORT_DESCRIPTOR_
-#define _FASTDDS_UDP_TRANSPORT_DESCRIPTOR_
+/**
+ * @file UDPTransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__UDPTRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__UDPTRANSPORTDESCRIPTOR_HPP
 
-#include <fastdds/rtps/transport/SocketTransportDescriptor.h>
+#include <fastdds/rtps/transport/SocketTransportDescriptor.hpp>
 #include <fastdds/fastdds_dll.hpp>
 
 namespace eprosima {
@@ -74,4 +79,4 @@ struct UDPTransportDescriptor : public SocketTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_UDP_TRANSPORT_DESCRIPTOR_
+#endif // FASTDDS_RTPS_TRANSPORT__UDPTRANSPORTDESCRIPTOR_HPP
diff --git a/include/fastdds/rtps/transport/UDPv4TransportDescriptor.h b/include/fastdds/rtps/transport/UDPv4TransportDescriptor.hpp
similarity index 84%
rename from include/fastdds/rtps/transport/UDPv4TransportDescriptor.h
rename to include/fastdds/rtps/transport/UDPv4TransportDescriptor.hpp
index b715f357e62..e76d168173a 100644
--- a/include/fastdds/rtps/transport/UDPv4TransportDescriptor.h
+++ b/include/fastdds/rtps/transport/UDPv4TransportDescriptor.hpp
@@ -12,10 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_UDPV4_TRANSPORT_DESCRIPTOR
-#define _FASTDDS_UDPV4_TRANSPORT_DESCRIPTOR
+/**
+ * @file UDPv4TransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__UDPV4TRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__UDPV4TRANSPORTDESCRIPTOR_HPP
 
-#include <fastdds/rtps/transport/UDPTransportDescriptor.h>
+#include <fastdds/rtps/transport/UDPTransportDescriptor.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -53,4 +58,4 @@ struct UDPv4TransportDescriptor : public UDPTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_UDPV4_TRANSPORT_DESCRIPTOR
+#endif // FASTDDS_RTPS_TRANSPORT__UDPV4TRANSPORTDESCRIPTOR_HPP
diff --git a/include/fastdds/rtps/transport/UDPv6TransportDescriptor.h b/include/fastdds/rtps/transport/UDPv6TransportDescriptor.hpp
similarity index 84%
rename from include/fastdds/rtps/transport/UDPv6TransportDescriptor.h
rename to include/fastdds/rtps/transport/UDPv6TransportDescriptor.hpp
index 69a4ac414c4..07aeb3f94d4 100644
--- a/include/fastdds/rtps/transport/UDPv6TransportDescriptor.h
+++ b/include/fastdds/rtps/transport/UDPv6TransportDescriptor.hpp
@@ -12,10 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_UDPV6_TRANSPORT_DESCRIPTOR_
-#define _FASTDDS_UDPV6_TRANSPORT_DESCRIPTOR_
+/**
+ * @file UDPv6TransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__UDPV6TRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__UDPV6TRANSPORTDESCRIPTOR_HPP
 
-#include <fastdds/rtps/transport/UDPTransportDescriptor.h>
+#include <fastdds/rtps/transport/UDPTransportDescriptor.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -55,4 +60,4 @@ struct UDPv6TransportDescriptor : public UDPTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_UDPV6_TRANSPORT_DESCRIPTOR_
+#endif // FASTDDS_RTPS_TRANSPORT__UDPV6TRANSPORTDESCRIPTOR_HPP
diff --git a/include/fastdds/rtps/transport/network/AllowedNetworkInterface.hpp b/include/fastdds/rtps/transport/network/AllowedNetworkInterface.hpp
index fee25c4e869..5c091574a8e 100644
--- a/include/fastdds/rtps/transport/network/AllowedNetworkInterface.hpp
+++ b/include/fastdds/rtps/transport/network/AllowedNetworkInterface.hpp
@@ -16,8 +16,8 @@
  * @file AllowedNetworkInterface.hpp
  */
 
-#ifndef _FASTDDS_RTPS_TRANSPORT_NETWORK_ALLOWEDNETWORKINTERFACE_HPP_
-#define _FASTDDS_RTPS_TRANSPORT_NETWORK_ALLOWEDNETWORKINTERFACE_HPP_
+#ifndef FASTDDS_RTPS_TRANSPORT_NETWORK__ALLOWEDNETWORKINTERFACE_HPP
+#define FASTDDS_RTPS_TRANSPORT_NETWORK__ALLOWEDNETWORKINTERFACE_HPP
 
 #include <fastdds/rtps/transport/network/NetworkInterfaceWithFilter.hpp>
 #include <fastdds/fastdds_dll.hpp>
@@ -60,4 +60,4 @@ struct AllowedNetworkInterface : public NetworkInterfaceWithFilter
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_TRANSPORT_NETWORK_ALLOWEDNETWORKINTERFACE_HPP_
+#endif // FASTDDS_RTPS_TRANSPORT_NETWORK__ALLOWEDNETWORKINTERFACE_HPP
diff --git a/include/fastdds/rtps/transport/network/BlockedNetworkInterface.hpp b/include/fastdds/rtps/transport/network/BlockedNetworkInterface.hpp
index 559bea4da90..79156cfa53f 100644
--- a/include/fastdds/rtps/transport/network/BlockedNetworkInterface.hpp
+++ b/include/fastdds/rtps/transport/network/BlockedNetworkInterface.hpp
@@ -16,8 +16,8 @@
  * @file BlockedNetworkInterface.hpp
  */
 
-#ifndef _FASTDDS_RTPS_TRANSPORT_NETWORK_BLOCKEDNETWORKINTERFACE_HPP_
-#define _FASTDDS_RTPS_TRANSPORT_NETWORK_BLOCKEDNETWORKINTERFACE_HPP_
+#ifndef FASTDDS_RTPS_TRANSPORT_NETWORK__BLOCKEDNETWORKINTERFACE_HPP
+#define FASTDDS_RTPS_TRANSPORT_NETWORK__BLOCKEDNETWORKINTERFACE_HPP
 
 #include <fastdds/rtps/transport/network/NetworkInterface.hpp>
 #include <fastdds/fastdds_dll.hpp>
@@ -60,4 +60,4 @@ struct BlockedNetworkInterface : public NetworkInterface
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_TRANSPORT_NETWORK_BLOCKEDNETWORKINTERFACE_HPP_
+#endif // FASTDDS_RTPS_TRANSPORT_NETWORK__BLOCKEDNETWORKINTERFACE_HPP
diff --git a/include/fastdds/rtps/transport/network/NetmaskFilterKind.hpp b/include/fastdds/rtps/transport/network/NetmaskFilterKind.hpp
index 09d0d8926cd..2278681006d 100644
--- a/include/fastdds/rtps/transport/network/NetmaskFilterKind.hpp
+++ b/include/fastdds/rtps/transport/network/NetmaskFilterKind.hpp
@@ -16,8 +16,8 @@
  * @file NetmaskFilterKind.hpp
  */
 
-#ifndef _FASTDDS_RTPS_TRANSPORT_NETWORK_NETMASKFILTER_HPP_
-#define _FASTDDS_RTPS_TRANSPORT_NETWORK_NETMASKFILTER_HPP_
+#ifndef FASTDDS_RTPS_TRANSPORT_NETWORK__NETMASKFILTERKIND_HPP
+#define FASTDDS_RTPS_TRANSPORT_NETWORK__NETMASKFILTERKIND_HPP
 
 #include <ostream>
 
@@ -42,4 +42,4 @@ FASTDDS_EXPORTED_API std::ostream& operator <<(
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_TRANSPORT_NETWORK_NETMASKFILTER_HPP_
+#endif // FASTDDS_RTPS_TRANSPORT_NETWORK__NETMASKFILTERKIND_HPP
diff --git a/include/fastdds/rtps/transport/network/NetworkInterface.hpp b/include/fastdds/rtps/transport/network/NetworkInterface.hpp
index be7c9c3cdf2..dbac8fc4564 100644
--- a/include/fastdds/rtps/transport/network/NetworkInterface.hpp
+++ b/include/fastdds/rtps/transport/network/NetworkInterface.hpp
@@ -16,8 +16,8 @@
  * @file NetworkInterface.hpp
  */
 
-#ifndef _FASTDDS_RTPS_TRANSPORT_NETWORK_NETWORKINTERFACE_HPP_
-#define _FASTDDS_RTPS_TRANSPORT_NETWORK_NETWORKINTERFACE_HPP_
+#ifndef FASTDDS_RTPS_TRANSPORT_NETWORK__NETWORKINTERFACE_HPP
+#define FASTDDS_RTPS_TRANSPORT_NETWORK__NETWORKINTERFACE_HPP
 
 #include <string>
 
@@ -84,4 +84,4 @@ struct NetworkInterface
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_TRANSPORT_NETWORK_NETWORKINTERFACE_HPP_
+#endif // FASTDDS_RTPS_TRANSPORT_NETWORK__NETWORKINTERFACE_HPP
diff --git a/include/fastdds/rtps/transport/network/NetworkInterfaceWithFilter.hpp b/include/fastdds/rtps/transport/network/NetworkInterfaceWithFilter.hpp
index bb428b58c3a..6972214b059 100644
--- a/include/fastdds/rtps/transport/network/NetworkInterfaceWithFilter.hpp
+++ b/include/fastdds/rtps/transport/network/NetworkInterfaceWithFilter.hpp
@@ -16,8 +16,8 @@
  * @file NetworkInterfaceWithFilter.hpp
  */
 
-#ifndef _FASTDDS_RTPS_TRANSPORT_NETWORK_NETWORKINTERFACEWITHFILTER_HPP_
-#define _FASTDDS_RTPS_TRANSPORT_NETWORK_NETWORKINTERFACEWITHFILTER_HPP_
+#ifndef FASTDDS_RTPS_TRANSPORT_NETWORK__NETWORKINTERFACEWITHFILTER_HPP
+#define FASTDDS_RTPS_TRANSPORT_NETWORK__NETWORKINTERFACEWITHFILTER_HPP
 
 #include <string>
 
@@ -90,4 +90,4 @@ struct NetworkInterfaceWithFilter : public NetworkInterface
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_TRANSPORT_NETWORK_NETWORKINTERFACEWITHFILTER_HPP_
+#endif // FASTDDS_RTPS_TRANSPORT_NETWORK__NETWORKINTERFACEWITHFILTER_HPP
diff --git a/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h b/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp
similarity index 94%
rename from include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h
rename to include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp
index 930a5a9909e..1f9c40fd089 100644
--- a/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h
+++ b/include/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp
@@ -12,8 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_SHAREDMEM_TRANSPORT_DESCRIPTOR_
-#define _FASTDDS_SHAREDMEM_TRANSPORT_DESCRIPTOR_
+/**
+ * @file SharedMemTransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT_SHARED_MEM__SHAREDMEMTRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT_SHARED_MEM__SHAREDMEMTRANSPORTDESCRIPTOR_HPP
 
 #include <string>
 
@@ -163,4 +168,4 @@ struct SharedMemTransportDescriptor : public PortBasedTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_SHAREDMEM_TRANSPORT_DESCRIPTOR_
+#endif // FASTDDS_RTPS_TRANSPORT_SHARED_MEM__SHAREDMEMTRANSPORTDESCRIPTOR_HPP
diff --git a/include/fastdds/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.h b/include/fastdds/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.hpp
similarity index 82%
rename from include/fastdds/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.h
rename to include/fastdds/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.hpp
index f0576c700d4..ecb74b56548 100644
--- a/include/fastdds/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.h
+++ b/include/fastdds/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.hpp
@@ -12,10 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_TEST_SHAREDMEM_TRANSPORT_DESCRIPTOR_
-#define _FASTDDS_TEST_SHAREDMEM_TRANSPORT_DESCRIPTOR_
+/**
+ * @file test_SharedMemTransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT_SHARED_MEM__TEST_SHAREDMEMTRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT_SHARED_MEM__TEST_SHAREDMEMTRANSPORTDESCRIPTOR_HPP
 
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -48,4 +53,4 @@ typedef struct test_SharedMemTransportDescriptor : public SharedMemTransportDesc
 } // namespace fastdds
 } // namespace eprosima
 
-#endif //_FASTDDS_TEST_SHAREDMEM_TRANSPORT_DESCRIPTOR_
+#endif //FASTDDS_RTPS_TRANSPORT_SHARED_MEM__TEST_SHAREDMEMTRANSPORTDESCRIPTOR_HPP
diff --git a/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h b/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp
similarity index 94%
rename from include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h
rename to include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp
index 7402ec91f87..868389e0bbd 100644
--- a/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.h
+++ b/include/fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp
@@ -12,14 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_TEST_UDPV4_TRANSPORT_DESCRIPTOR_
-#define _FASTDDS_TEST_UDPV4_TRANSPORT_DESCRIPTOR_
+/**
+ * @file test_UDPv4TransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__TEST_UDPV4TRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__TEST_UDPV4TRANSPORTDESCRIPTOR_HPP
 
 #include <functional>
 #include <atomic>
 
-#include <fastdds/rtps/transport/SocketTransportDescriptor.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
+#include <fastdds/rtps/transport/SocketTransportDescriptor.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -173,4 +178,4 @@ struct TestUDPv4TransportOptions
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_TEST_UDPV4_TRANSPORT_DESCRIPTOR_
+#endif // FASTDDS_RTPS_TRANSPORT__TEST_UDPV4TRANSPORTDESCRIPTOR_HPP
diff --git a/include/fastdds/rtps/writer/DeliveryRetCode.hpp b/include/fastdds/rtps/writer/DeliveryRetCode.hpp
index 4140ce501b1..e80fe69daac 100644
--- a/include/fastdds/rtps/writer/DeliveryRetCode.hpp
+++ b/include/fastdds/rtps/writer/DeliveryRetCode.hpp
@@ -1,5 +1,19 @@
-#ifndef _FASTDDS_RTPS_WRITER_DELIVERYRETCODE_HPP_
-#define _FASTDDS_RTPS_WRITER_DELIVERYRETCODE_HPP_
+// Copyright 2021 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef FASTDDS_RTPS_WRITER_DELIVERYRETCODE_HPP
+#define FASTDDS_RTPS_WRITER_DELIVERYRETCODE_HPP
 
 #include <cstdint>
 
@@ -18,4 +32,4 @@ enum class DeliveryRetCode : uint32_t
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_WRITER_DELIVERYRETCODE_HPP_
+#endif // FASTDDS_RTPS_WRITER_DELIVERYRETCODE_HPP
diff --git a/include/fastdds/rtps/writer/LocatorSelectorSender.hpp b/include/fastdds/rtps/writer/LocatorSelectorSender.hpp
index 37b0a0b71e7..02c0428242a 100644
--- a/include/fastdds/rtps/writer/LocatorSelectorSender.hpp
+++ b/include/fastdds/rtps/writer/LocatorSelectorSender.hpp
@@ -1,5 +1,19 @@
-#ifndef _FASTDDS_RTPS_WRITER_LOCATORSELECTORSENDER_HPP_
-#define _FASTDDS_RTPS_WRITER_LOCATORSELECTORSENDER_HPP_
+// Copyright 2021 Proyectos y Sistemas de Mantenimiento SL (eProsima).
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef FASTDDS_RTPS_WRITER_LOCATORSELECTORSENDER_HPP
+#define FASTDDS_RTPS_WRITER_LOCATORSELECTORSENDER_HPP
 
 #include <vector>
 
@@ -126,4 +140,4 @@ class LocatorSelectorSender : public RTPSMessageSenderInterface
 } // namespace rtps
 } // namespace fastdds
 } // namespace eprosima
-#endif // _FASTDDS_RTPS_WRITER_LOCATORSELECTORSENDER_HPP_
+#endif // FASTDDS_RTPS_WRITER_LOCATORSELECTORSENDER_HPP
diff --git a/include/fastdds/rtps/writer/RTPSWriter.h b/include/fastdds/rtps/writer/RTPSWriter.hpp
similarity index 97%
rename from include/fastdds/rtps/writer/RTPSWriter.h
rename to include/fastdds/rtps/writer/RTPSWriter.hpp
index 23cfeece998..dfb6580da5b 100644
--- a/include/fastdds/rtps/writer/RTPSWriter.h
+++ b/include/fastdds/rtps/writer/RTPSWriter.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file RTPSWriter.h
+ * @file RTPSWriter.hpp
  */
 
-#ifndef _FASTDDS_RTPS_RTPSWRITER_H_
-#define _FASTDDS_RTPS_RTPSWRITER_H_
+#ifndef FASTDDS_RTPS_WRITER__RTPSWRITER_HPP
+#define FASTDDS_RTPS_WRITER__RTPSWRITER_HPP
 
 #include <chrono>
 #include <functional>
@@ -27,12 +27,12 @@
 #include <vector>
 
 #include <fastdds/dds/core/status/BaseStatus.hpp>
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastdds/rtps/Endpoint.h>
+#include <fastdds/rtps/Endpoint.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
 #include <fastdds/rtps/writer/DeliveryRetCode.hpp>
 #include <fastdds/rtps/writer/LocatorSelectorSender.hpp>
@@ -615,8 +615,8 @@ class RTPSWriter
     RTPSWriter* next_[2] = { nullptr, nullptr };
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_RTPSWRITER_H_ */
+#endif // FASTDDS_RTPS_WRITER__RTPSWRITER_HPP
diff --git a/include/fastdds/rtps/writer/WriterDiscoveryInfo.h b/include/fastdds/rtps/writer/WriterDiscoveryInfo.hpp
similarity index 87%
rename from include/fastdds/rtps/writer/WriterDiscoveryInfo.h
rename to include/fastdds/rtps/writer/WriterDiscoveryInfo.hpp
index 66ac46dacb9..38b8e68724f 100644
--- a/include/fastdds/rtps/writer/WriterDiscoveryInfo.h
+++ b/include/fastdds/rtps/writer/WriterDiscoveryInfo.hpp
@@ -13,13 +13,13 @@
 // limitations under the License.
 
 /**
- * @file WriterDiscoveryInfo.h
+ * @file WriterDiscoveryInfo.hpp
  */
-#ifndef _RTPS_WRITER_WRITERDISCOVERYINFO_H_
-#define _RTPS_WRITER_WRITERDISCOVERYINFO_H_
+#ifndef FASTDDS_RTPS_WRITER__WRITERDISCOVERYINFO_HPP
+#define FASTDDS_RTPS_WRITER__WRITERDISCOVERYINFO_HPP
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -71,4 +71,4 @@ struct WriterDiscoveryInfo
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _RTPS_WRITER_WRITERDISCOVERYINFO_H_
+#endif // FASTDDS_RTPS_WRITER__WRITERDISCOVERYINFO_HPP
diff --git a/include/fastdds/rtps/writer/WriterListener.h b/include/fastdds/rtps/writer/WriterListener.hpp
similarity index 91%
rename from include/fastdds/rtps/writer/WriterListener.h
rename to include/fastdds/rtps/writer/WriterListener.hpp
index 0e2d291c810..f9532dc2e0e 100644
--- a/include/fastdds/rtps/writer/WriterListener.h
+++ b/include/fastdds/rtps/writer/WriterListener.hpp
@@ -13,18 +13,18 @@
 // limitations under the License.
 
 /**
- * @file WriterListener.h
+ * @file WriterListener.hpp
  */
-#ifndef _FASTDDS_RTPS_WRITERLISTENER_H_
-#define _FASTDDS_RTPS_WRITERLISTENER_H_
+#ifndef FASTDDS_RTPS_WRITER__WRITERLISTENER_HPP
+#define FASTDDS_RTPS_WRITER__WRITERLISTENER_HPP
 
 #include <fastdds/dds/core/status/BaseStatus.hpp>
 #include <fastdds/dds/core/status/PublicationMatchedStatus.hpp>
 #include <fastdds/dds/core/status/IncompatibleQosStatus.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/MatchingInfo.h>
-#include <fastdds/rtps/reader/ReaderDiscoveryInfo.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/MatchingInfo.hpp>
+#include <fastdds/rtps/reader/ReaderDiscoveryInfo.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -148,10 +148,10 @@ class FASTDDS_EXPORTED_API WriterListener
 
 };
 
-}  /* namespace rtps */
-}  /* namespace fastdds */
-}  /* namespace eprosima */
+}  // namespace rtps
+}  // namespace fastdds
+}  // namespace eprosima
 
 
 
-#endif /* _FASTDDS_RTPS_WRITERLISTENER_H_ */
+#endif // FASTDDS_RTPS_WRITER__WRITERLISTENER_HPP
diff --git a/include/fastdds/statistics/IListeners.hpp b/include/fastdds/statistics/IListeners.hpp
index 09af7a39112..634949778cc 100644
--- a/include/fastdds/statistics/IListeners.hpp
+++ b/include/fastdds/statistics/IListeners.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_STATISTICS_ILISTENERS_HPP_
-#define _FASTDDS_STATISTICS_ILISTENERS_HPP_
+#ifndef FASTDDS_STATISTICS__ILISTENERS_HPP
+#define FASTDDS_STATISTICS__ILISTENERS_HPP
 
 #include <cstdint>
 
@@ -40,4 +40,4 @@ struct IListener
 } // fastdds
 } // eprosima
 
-#endif // _FASTDDS_STATISTICS_ILISTENERS_HPP_
+#endif // FASTDDS_STATISTICS__ILISTENERS_HPP
diff --git a/include/fastdds/statistics/dds/domain/DomainParticipant.hpp b/include/fastdds/statistics/dds/domain/DomainParticipant.hpp
index 05c829dc06b..c5bdc3a8c75 100644
--- a/include/fastdds/statistics/dds/domain/DomainParticipant.hpp
+++ b/include/fastdds/statistics/dds/domain/DomainParticipant.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_STATISTICS_DDS_DOMAIN_DOMAINPARTICIPANT_HPP_
-#define _FASTDDS_STATISTICS_DDS_DOMAIN_DOMAINPARTICIPANT_HPP_
+#ifndef FASTDDS_STATISTICS_DDS_DOMAIN__DOMAINPARTICIPANT_HPP
+#define FASTDDS_STATISTICS_DDS_DOMAIN__DOMAINPARTICIPANT_HPP
 
 #include <string>
 
@@ -219,4 +219,4 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_STATISTICS_DDS_DOMAIN_DOMAINPARTICIPANT_HPP_ */
+#endif // FASTDDS_STATISTICS_DDS_DOMAIN__DOMAINPARTICIPANT_HPP
diff --git a/include/fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp b/include/fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp
index d09696544d8..96b290c88ed 100644
--- a/include/fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp
+++ b/include/fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp
@@ -16,8 +16,8 @@
  * @file DataWriterQos.hpp
  */
 
-#ifndef _FASTDDS_STATISTICS_DDS_PUBLISHER_QOS_DATAWRITERQOS_HPP_
-#define _FASTDDS_STATISTICS_DDS_PUBLISHER_QOS_DATAWRITERQOS_HPP_
+#ifndef FASTDDS_STATISTICS_DDS_PUBLISHER_QOS__DATAWRITERQOS_HPP
+#define FASTDDS_STATISTICS_DDS_PUBLISHER_QOS__DATAWRITERQOS_HPP
 
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/fastdds_dll.hpp>
@@ -50,4 +50,4 @@ const eprosima::fastdds::statistics::dds::DataWriterQos STATISTICS_DATAWRITER_QO
 } // fastdds
 } // eprosima
 
-#endif /* _FASTDDS_STATISTICS_DDS_PUBLISHER_QOS_DATAWRITERQOS_HPP_ */
+#endif // FASTDDS_STATISTICS_DDS_PUBLISHER_QOS__DATAWRITERQOS_HPP
diff --git a/include/fastdds/statistics/dds/subscriber/qos/DataReaderQos.hpp b/include/fastdds/statistics/dds/subscriber/qos/DataReaderQos.hpp
index d5bcc23a3c6..bbf6e9bde78 100644
--- a/include/fastdds/statistics/dds/subscriber/qos/DataReaderQos.hpp
+++ b/include/fastdds/statistics/dds/subscriber/qos/DataReaderQos.hpp
@@ -16,8 +16,8 @@
  * @file DataReaderQos.hpp
  */
 
-#ifndef _FASTDDS_STATISTICS_DDS_SUBSCRIBER_QOS_DATAREADERQOS_HPP_
-#define _FASTDDS_STATISTICS_DDS_SUBSCRIBER_QOS_DATAREADERQOS_HPP_
+#ifndef FASTDDS_STATISTICS_DDS_SUBSCRIBER_QOS__DATAREADERQOS_HPP
+#define FASTDDS_STATISTICS_DDS_SUBSCRIBER_QOS__DATAREADERQOS_HPP
 
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 
@@ -67,4 +67,4 @@ const eprosima::fastdds::statistics::dds::MonitorServiceDataReaderQos MONITOR_SE
 } // fastdds
 } // eprosima
 
-#endif /* _FASTDDS_STATISTICS_DDS_SUBSCRIBER_QOS_DATAREADERQOS_HPP_ */
+#endif // FASTDDS_STATISTICS_DDS_SUBSCRIBER_QOS__DATAREADERQOS_HPP
diff --git a/include/fastdds/statistics/rtps/StatisticsCommon.hpp b/include/fastdds/statistics/rtps/StatisticsCommon.hpp
index aca1c23f106..8c668d950cc 100644
--- a/include/fastdds/statistics/rtps/StatisticsCommon.hpp
+++ b/include/fastdds/statistics/rtps/StatisticsCommon.hpp
@@ -16,15 +16,15 @@
  * @file StatisticsCommon.hpp
  */
 
-#ifndef _FASTDDS_STATISTICS_RTPS_STATISTICSCOMMON_HPP_
-#define _FASTDDS_STATISTICS_RTPS_STATISTICSCOMMON_HPP_
+#ifndef FASTDDS_STATISTICS_RTPS__STATISTICSCOMMON_HPP
+#define FASTDDS_STATISTICS_RTPS__STATISTICSCOMMON_HPP
 
 #include <memory>
 #include <type_traits>
 
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/SampleIdentity.h>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/SampleIdentity.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
 #include <fastdds/statistics/IListeners.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 
@@ -394,4 +394,4 @@ class StatisticsReaderImpl
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_STATISTICS_RTPS_STATISTICSCOMMON_HPP_
+#endif // FASTDDS_STATISTICS_RTPS__STATISTICSCOMMON_HPP
diff --git a/include/fastdds/statistics/rtps/monitor_service/connections_fwd.hpp b/include/fastdds/statistics/rtps/monitor_service/connections_fwd.hpp
index abea1e4cf1e..0820c62a331 100644
--- a/include/fastdds/statistics/rtps/monitor_service/connections_fwd.hpp
+++ b/include/fastdds/statistics/rtps/monitor_service/connections_fwd.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_STATISTICS_MONITOR_SERVICE_CONNECTION_FWD_HPP_
-#define _FASTDDS_STATISTICS_MONITOR_SERVICE_CONNECTION_FWD_HPP_
+#ifndef FASTDDS_STATISTICS_RTPS_MONITOR_SERVICE__CONNECTION_FWD_HPP
+#define FASTDDS_STATISTICS_RTPS_MONITOR_SERVICE__CONNECTION_FWD_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -35,4 +35,4 @@ using ConnectionList = std::vector<eprosima::fastdds::statistics::Connection>;
 } // fastdds
 } // eprosima
 
-#endif // _FASTDDS_STATISTICS_MONITOR_SERVICE_CONNECTION_FWD_HPP_
+#endif // FASTDDS_STATISTICS_RTPS_MONITOR_SERVICE__CONNECTION_FWD_HPP
diff --git a/include/fastdds/statistics/topic_names.hpp b/include/fastdds/statistics/topic_names.hpp
index a1af61f7774..31d6a0010e6 100644
--- a/include/fastdds/statistics/topic_names.hpp
+++ b/include/fastdds/statistics/topic_names.hpp
@@ -16,8 +16,8 @@
  * @file topic_names.hpp
  */
 
-#ifndef _FASTDDS_STATISTICS_TOPIC_NAMES_HPP_
-#define _FASTDDS_STATISTICS_TOPIC_NAMES_HPP_
+#ifndef FASTDDS_STATISTICS__TOPIC_NAMES_HPP
+#define FASTDDS_STATISTICS__TOPIC_NAMES_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -66,4 +66,4 @@ constexpr const char* MONITOR_SERVICE_TOPIC = "_fastdds_monitor_service_status";
 } // fastdds
 } // eprosima
 
-#endif /* _FASTDDS_STATISTICS_TOPIC_NAMES_HPP_ */
+#endif // FASTDDS_STATISTICS__TOPIC_NAMES_HPP
diff --git a/include/fastdds/utils/IPFinder.h b/include/fastdds/utils/IPFinder.hpp
similarity index 94%
rename from include/fastdds/utils/IPFinder.h
rename to include/fastdds/utils/IPFinder.hpp
index 51efa5c4901..f5cb2502f80 100644
--- a/include/fastdds/utils/IPFinder.h
+++ b/include/fastdds/utils/IPFinder.hpp
@@ -13,17 +13,17 @@
 // limitations under the License.
 
 /**
- * @file IPFinder.h
+ * @file IPFinder.hpp
  *
  */
 
-#ifndef IPFINDER_H_
-#define IPFINDER_H_
+#ifndef FASTDDS_UTILS__IPFINDER_HPP
+#define FASTDDS_UTILS__IPFINDER_HPP
 
 #include <string>
 #include <vector>
 
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/LocatorWithMask.hpp>
 
@@ -131,6 +131,6 @@ class IPFinder
 
 } // namespace rtps
 } // namespace fastdds
-} /* namespace eprosima */
+} // namespace eprosima
 
-#endif /* IPFINDER_H_ */
+#endif // FASTDDS_UTILS__IPFINDER_HPP
diff --git a/include/fastdds/utils/IPLocator.h b/include/fastdds/utils/IPLocator.hpp
similarity index 98%
rename from include/fastdds/utils/IPLocator.h
rename to include/fastdds/utils/IPLocator.hpp
index 2ad0209b219..f5b8fb4a1b0 100644
--- a/include/fastdds/utils/IPLocator.h
+++ b/include/fastdds/utils/IPLocator.hpp
@@ -13,14 +13,14 @@
 // limitations under the License.
 
 /**
- * @file IPLocator.h
+ * @file IPLocator.hpp
  *
  */
 
-#ifndef IP_LOCATOR_H_
-#define IP_LOCATOR_H_
+#ifndef FASTDDS_UTILS__IPLOCATOR_HPP
+#define FASTDDS_UTILS__IPLOCATOR_HPP
 
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/dds/log/Log.hpp>
 
 #include <regex>
@@ -301,6 +301,6 @@ class IPLocator
 
 } // namespace rtps
 } // namespace fastdds
-} /* namespace eprosima */
+} // namespace eprosima
 
-#endif /* IP_LOCATOR_H_ */
+#endif // FASTDDS_UTILS__IPLOCATOR_HPP
diff --git a/include/fastdds/utils/TimedConditionVariable.hpp b/include/fastdds/utils/TimedConditionVariable.hpp
index e5ddf4c5511..b68d3c70847 100644
--- a/include/fastdds/utils/TimedConditionVariable.hpp
+++ b/include/fastdds/utils/TimedConditionVariable.hpp
@@ -16,10 +16,10 @@
  * @file TimedConditionVariable.hpp
  */
 
-#ifndef _UTILS_TIMEDCONDITIONVARIABLE_HPP_
-#define _UTILS_TIMEDCONDITIONVARIABLE_HPP_
+#ifndef FASTDDS_UTILS__TIMEDCONDITIONVARIABLE_HPP
+#define FASTDDS_UTILS__TIMEDCONDITIONVARIABLE_HPP
 
-#include <fastdds/config.h>
+#include <fastdds/config.hpp>
 
 /*
    NOTE: Windows implementation temporary disabled due to aleatory high CPU consumption when
@@ -193,4 +193,4 @@ using TimedConditionVariable = std::condition_variable_any;
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif // _UTILS_TIMEDCONDITIONVARIABLE_HPP_
+#endif // FASTDDS_UTILS__TIMEDCONDITIONVARIABLE_HPP
diff --git a/include/fastdds/utils/TimedMutex.hpp b/include/fastdds/utils/TimedMutex.hpp
index 10aaf546251..2315e11eeff 100644
--- a/include/fastdds/utils/TimedMutex.hpp
+++ b/include/fastdds/utils/TimedMutex.hpp
@@ -16,8 +16,8 @@
  * @file TimedMutex.hpp
  */
 
-#ifndef _UTILS_TIMEDMUTEX_HPP_
-#define _UTILS_TIMEDMUTEX_HPP_
+#ifndef FASTDDS_UTILS__TIMEDMUTEX_HPP
+#define FASTDDS_UTILS__TIMEDMUTEX_HPP
 
 #include <chrono>
 #include <iostream>
@@ -341,4 +341,4 @@ class RecursiveTimedMutex
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _UTILS_TIMEDMUTEX_HPP_
+#endif // FASTDDS_UTILS__TIMEDMUTEX_HPP
diff --git a/include/fastdds/utils/collections/ResourceLimitedContainerConfig.hpp b/include/fastdds/utils/collections/ResourceLimitedContainerConfig.hpp
index b20c78acc45..dd04be0e4de 100644
--- a/include/fastdds/utils/collections/ResourceLimitedContainerConfig.hpp
+++ b/include/fastdds/utils/collections/ResourceLimitedContainerConfig.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_UTILS_COLLECTIONS_RESOURCELIMITEDCONTAINERCONFIG_HPP_
-#define FASTDDS_UTILS_COLLECTIONS_RESOURCELIMITEDCONTAINERCONFIG_HPP_
+#ifndef FASTDDS_UTILS_COLLECTIONS__RESOURCELIMITEDCONTAINERCONFIG_HPP
+#define FASTDDS_UTILS_COLLECTIONS__RESOURCELIMITEDCONTAINERCONFIG_HPP
 
 #include <cstddef>
 #include <limits>
@@ -90,4 +90,4 @@ inline bool operator == (
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif /* FASTDDS_UTILS_COLLECTIONS_RESOURCELIMITEDCONTAINERCONFIG_HPP_ */
+#endif // FASTDDS_UTILS_COLLECTIONS__RESOURCELIMITEDCONTAINERCONFIG_HPP
diff --git a/include/fastdds/utils/collections/ResourceLimitedVector.hpp b/include/fastdds/utils/collections/ResourceLimitedVector.hpp
index 1da769572b6..b5e82a2eddd 100644
--- a/include/fastdds/utils/collections/ResourceLimitedVector.hpp
+++ b/include/fastdds/utils/collections/ResourceLimitedVector.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_UTILS_COLLECTIONS_RESOURCELIMITEDVECTOR_HPP_
-#define FASTDDS_UTILS_COLLECTIONS_RESOURCELIMITEDVECTOR_HPP_
+#ifndef FASTDDS_UTILS_COLLECTIONS__RESOURCELIMITEDVECTOR_HPP
+#define FASTDDS_UTILS_COLLECTIONS__RESOURCELIMITEDVECTOR_HPP
 
 #include "ResourceLimitedContainerConfig.hpp"
 
@@ -619,4 +619,4 @@ class ResourceLimitedVector
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif /* FASTDDS_UTILS_COLLECTIONS_RESOURCELIMITEDVECTOR_HPP_ */
+#endif // FASTDDS_UTILS_COLLECTIONS__RESOURCELIMITEDVECTOR_HPP
diff --git a/include/fastdds/utils/fixed_size_bitmap.hpp b/include/fastdds/utils/fixed_size_bitmap.hpp
index d6577e80f6c..99c8816150b 100644
--- a/include/fastdds/utils/fixed_size_bitmap.hpp
+++ b/include/fastdds/utils/fixed_size_bitmap.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_UTILS_FIXED_SIZE_BITMAP_HPP_
-#define FASTDDS_UTILS_FIXED_SIZE_BITMAP_HPP_
+#ifndef FASTDDS_UTILS__FIXED_SIZE_BITMAP_HPP
+#define FASTDDS_UTILS__FIXED_SIZE_BITMAP_HPP
 
 #include <array>
 #include <cstdint>
@@ -634,4 +634,4 @@ class BitmapRange
 
 #endif // if _MSC_VER
 
-#endif   // FASTDDS_UTILS_FIXED_SIZE_BITMAP_HPP_
+#endif   // FASTDDS_UTILS__FIXED_SIZE_BITMAP_HPP
diff --git a/include/fastdds/utils/md5.h b/include/fastdds/utils/md5.hpp
similarity index 94%
rename from include/fastdds/utils/md5.h
rename to include/fastdds/utils/md5.hpp
index 20eda395745..44986fedc90 100644
--- a/include/fastdds/utils/md5.h
+++ b/include/fastdds/utils/md5.hpp
@@ -30,13 +30,22 @@
 
  */
 
-#ifndef BZF_MD5_H
-#define BZF_MD5_H
+/**
+ * @file md5.hpp
+ *
+ */
+
+#ifndef FASTDDS_UTILS__MD5_HPP
+#define FASTDDS_UTILS__MD5_HPP
 
 #include <cstring>
 #include <iostream>
 
 #include <fastdds/fastdds_dll.hpp>
+
+namespace eprosima {
+namespace fastdds {
+
 /**
  * Class MD5, for calculating MD5 hashes of strings or byte arrays
  * it is not meant to be fast or secure
@@ -156,5 +165,8 @@ class FASTDDS_EXPORTED_API MD5
 std::string md5(
         const std::string str);
 
-#endif // ifndef BZF_MD5_H
+} // namespace fastdds
+} // namespace eprosima
+
+#endif // FASTDDS_UTILS__MD5_HPP
 
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
index f66218305c8..0c00249b669 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -428,8 +428,8 @@ unset(SM_RUN_OUTPUT)
 unset(CMAKE_ATOMIC_LIB)
 
 # Generate the proper configure file
-configure_file(${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/config.h.in
-    ${PROJECT_BINARY_DIR}/include/${PROJECT_NAME}/config.h)
+configure_file(${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/config.hpp.in
+    ${PROJECT_BINARY_DIR}/include/${PROJECT_NAME}/config.hpp)
 
 #Create library
 add_library(${PROJECT_NAME} ${${PROJECT_NAME}_source_files})
@@ -595,8 +595,8 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}
     PATTERN "*.ipp"
     )
 
-# Install config.h header
-install(FILES ${PROJECT_BINARY_DIR}/include/${PROJECT_NAME}/config.h
+# Install config.hpp header
+install(FILES ${PROJECT_BINARY_DIR}/include/${PROJECT_NAME}/config.hpp
     DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}
     COMPONENT headers
     )
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
index 6f55d932247..a9f49af5965 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
@@ -23,18 +23,18 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp
index 981d796c018..25a87106c09 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp
@@ -17,19 +17,19 @@
  *
  */
 
-#ifndef _FASTDDS_BUILTIN_TYPE_LOOKUP_SERVICE_TYPE_LOOKUP_MANAGER_HPP_
-#define _FASTDDS_BUILTIN_TYPE_LOOKUP_SERVICE_TYPE_LOOKUP_MANAGER_HPP_
+#ifndef FASTDDS_FASTDDS_BUILTIN_TYPE_LOOKUP_SERVICE__TYPELOOKUPMANAGER_HPP
+#define FASTDDS_FASTDDS_BUILTIN_TYPE_LOOKUP_SERVICE__TYPELOOKUPMANAGER_HPP
 
 #include <cstdint>
 #include <mutex>
 #include <unordered_map>
 #include <vector>
 
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 
 #include <fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp>
-#include <fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.h>
+#include <fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp>
 #include <fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp>
 #include <fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp>
 #include <fastdds/xtypes/type_representation/TypeIdentifierWithSizeHashSpecialization.h>
@@ -440,8 +440,8 @@ class TypeLookupManager
     static constexpr uint32_t typelookup_data_max_size = 5000;
 };
 
-} /* namespace builtin */
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
-#endif /* _FASTDDS_BUILTIN_TYPE_LOOKUP_SERVICE_TYPE_LOOKUP_MANAGER_HPP_ */
+} // namespace builtin
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
+#endif // FASTDDS_FASTDDS_BUILTIN_TYPE_LOOKUP_SERVICE__TYPELOOKUPMANAGER_HPP
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp
index 7ff65fad1b8..4bd1c6109ed 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupReplyListener.hpp
@@ -28,8 +28,8 @@
 
 #include <fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp>
 #include <fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp>
-#include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 
 #include <utils/thread.hpp>
 #include <utils/threading.hpp>
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp
index a635da2be0b..cd6703438ba 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.hpp
@@ -27,8 +27,8 @@
 #include <unordered_set>
 
 #include <fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp>
-#include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 #include <fastdds/xtypes/type_representation/TypeIdentifierWithSizeHashSpecialization.h>
 
 #include <utils/thread.hpp>
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp
index 8d0ed3172fb..e61ded4c951 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPES_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPES_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPES_HPP
 
 #include <cstdint>
 #include <functional>
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesCdrAux.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesCdrAux.hpp
index 569f3b42958..aa93115eff9 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesCdrAux.hpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPESCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPESCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPESCDRAUX_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPESCDRAUX_HPP
 
 #include "TypeLookupTypes.hpp"
 
@@ -203,5 +203,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPESCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPESCDRAUX_HPP
 
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesCdrAux.ipp b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesCdrAux.ipp
index dfe0d74b994..bfaee43f433 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesCdrAux.ipp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPESCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPESCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPESCDRAUX_IPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPESCDRAUX_IPP
 
 #include "TypeLookupTypesCdrAux.hpp"
 
@@ -1084,5 +1084,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPESCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPESCDRAUX_IPP
 
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx
index 0b33ab4aff9..0aee636da07 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx
+++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "TypeLookupTypesPubSubTypes.h"
+#include "TypeLookupTypesPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.h b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp
similarity index 93%
rename from src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.h
rename to src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp
index ae04946cd65..7361e8a76da 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.h
+++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file TypeLookupTypesPubSubTypes.h
+ * @file TypeLookupTypesPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPES_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPES_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPES_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPES_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "TypeLookupTypes.hpp"
 
-#include "rpc_typesPubSubTypes.h"
+#include "rpc_typesPubSubTypes.hpp"
 #include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -118,7 +118,7 @@ namespace builtin
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -136,7 +136,7 @@ namespace builtin
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -209,7 +209,7 @@ namespace builtin
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -227,7 +227,7 @@ namespace builtin
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -301,7 +301,7 @@ namespace builtin
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -319,7 +319,7 @@ namespace builtin
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -392,7 +392,7 @@ namespace builtin
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -410,7 +410,7 @@ namespace builtin
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -485,7 +485,7 @@ namespace builtin
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -503,7 +503,7 @@ namespace builtin
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -577,7 +577,7 @@ namespace builtin
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -595,7 +595,7 @@ namespace builtin
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -608,5 +608,5 @@ namespace builtin
 } // namespace eprosima
 
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPES_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_BUILTIN_TYPELOOKUPTYPES_PUBSUBTYPES_HPP
 
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_types.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_types.hpp
index e6d3c72f81e..c443667a6f9 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_types.hpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_types.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPES_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPES_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPES_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesCdrAux.hpp b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesCdrAux.hpp
index 4cb04c42841..86baa22e15f 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesCdrAux.hpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPESCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPESCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPESCDRAUX_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPESCDRAUX_HPP
 
 #include "rpc_types.hpp"
 
@@ -82,5 +82,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPESCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPESCDRAUX_HPP
 
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesCdrAux.ipp b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesCdrAux.ipp
index 2f49369f96c..edb9f1a7968 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesCdrAux.ipp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPESCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPESCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPESCDRAUX_IPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPESCDRAUX_IPP
 
 #include "rpc_typesCdrAux.hpp"
 
@@ -590,5 +590,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPESCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPESCDRAUX_IPP
 
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx
index 4bf8c1ef81b..54d012fbc46 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx
+++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "rpc_typesPubSubTypes.h"
+#include "rpc_typesPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.h b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp
similarity index 94%
rename from src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.h
rename to src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp
index 8a26d4d15bb..e0cb336c659 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.h
+++ b/src/cpp/fastdds/builtin/type_lookup_service/detail/rpc_typesPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file rpc_typesPubSubTypes.h
+ * @file rpc_typesPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPES_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPES_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPES_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPES_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "rpc_types.hpp"
 
@@ -114,7 +114,7 @@ class EntityId_tPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -132,7 +132,7 @@ class EntityId_tPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -205,7 +205,7 @@ class GUID_tPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -223,7 +223,7 @@ class GUID_tPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -296,7 +296,7 @@ class SequenceNumber_tPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -314,7 +314,7 @@ class SequenceNumber_tPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -387,7 +387,7 @@ class SampleIdentityPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -405,7 +405,7 @@ class SampleIdentityPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -485,7 +485,7 @@ namespace rpc
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -503,7 +503,7 @@ namespace rpc
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -576,7 +576,7 @@ namespace rpc
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -594,7 +594,7 @@ namespace rpc
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -607,5 +607,5 @@ namespace rpc
 } // namespace eprosima
 
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPES_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_RPC_RPC_TYPES_PUBSUBTYPES_HPP
 
diff --git a/src/cpp/fastdds/core/condition/WaitSetImpl.cpp b/src/cpp/fastdds/core/condition/WaitSetImpl.cpp
index 9535fc10994..6538b985509 100644
--- a/src/cpp/fastdds/core/condition/WaitSetImpl.cpp
+++ b/src/cpp/fastdds/core/condition/WaitSetImpl.cpp
@@ -23,7 +23,7 @@
 
 #include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/core/condition/Condition.hpp>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 #include <fastdds/core/condition/ConditionNotifier.hpp>
 
diff --git a/src/cpp/fastdds/core/condition/WaitSetImpl.hpp b/src/cpp/fastdds/core/condition/WaitSetImpl.hpp
index 1120d765569..01ae1eb2640 100644
--- a/src/cpp/fastdds/core/condition/WaitSetImpl.hpp
+++ b/src/cpp/fastdds/core/condition/WaitSetImpl.hpp
@@ -24,7 +24,7 @@
 
 #include <fastdds/dds/core/condition/Condition.hpp>
 #include <fastdds/dds/core/ReturnCode.hpp>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 #include <utils/collections/unordered_vector.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/fastdds/core/policy/ParameterList.hpp b/src/cpp/fastdds/core/policy/ParameterList.hpp
index aa8934538c5..14ce285e049 100644
--- a/src/cpp/fastdds/core/policy/ParameterList.hpp
+++ b/src/cpp/fastdds/core/policy/ParameterList.hpp
@@ -23,8 +23,8 @@
 #include <functional>
 
 #include <fastdds/dds/core/policy/ParameterTypes.hpp>
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/messages/RTPS_messages.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/messages/RTPS_messages.hpp>
 
 #include <rtps/messages/CDRMessage.hpp>
 
diff --git a/src/cpp/fastdds/core/policy/ParameterSerializer.hpp b/src/cpp/fastdds/core/policy/ParameterSerializer.hpp
index 34e7d58d5c2..5f687bb7464 100644
--- a/src/cpp/fastdds/core/policy/ParameterSerializer.hpp
+++ b/src/cpp/fastdds/core/policy/ParameterSerializer.hpp
@@ -25,7 +25,7 @@
 #include <fastcdr/cdr/fixed_size_string.hpp>
 
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
-#include <fastdds/rtps/common/CDRMessage_t.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
 namespace eprosima {
 namespace fastdds {
 namespace dds {
diff --git a/src/cpp/fastdds/domain/DomainParticipantFactory.cpp b/src/cpp/fastdds/domain/DomainParticipantFactory.cpp
index ff832218032..b1fa449bc76 100644
--- a/src/cpp/fastdds/domain/DomainParticipantFactory.cpp
+++ b/src/cpp/fastdds/domain/DomainParticipantFactory.cpp
@@ -26,8 +26,8 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
 #include <fastdds/utils/QosConverters.hpp>
 
 #include <fastdds/domain/DomainParticipantImpl.hpp>
diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/fastdds/domain/DomainParticipantImpl.cpp
index 9e01e88b9e7..e9b72d13718 100644
--- a/src/cpp/fastdds/domain/DomainParticipantImpl.cpp
+++ b/src/cpp/fastdds/domain/DomainParticipantImpl.cpp
@@ -39,15 +39,15 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicType.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/reader/ReaderDiscoveryInfo.h>
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/writer/WriterDiscoveryInfo.h>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/reader/ReaderDiscoveryInfo.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/writer/WriterDiscoveryInfo.hpp>
 
 #include <fastdds/core/policy/QosPolicyUtils.hpp>
 #include <fastdds/publisher/DataWriterImpl.hpp>
diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
index 1516a4e14eb..2a061e0c8f2 100644
--- a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
+++ b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_PARTICIPANTIMPL_HPP_
-#define _FASTDDS_PARTICIPANTIMPL_HPP_
+#ifndef FASTDDS_DOMAIN__DOMAINPARTICIPANTIMPL_HPP
+#define FASTDDS_DOMAIN__DOMAINPARTICIPANTIMPL_HPP
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <atomic>
@@ -37,8 +37,8 @@
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/participant/RTPSParticipantListener.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
 #include "fastdds/topic/DDSSQLFilter/DDSFilterFactory.hpp"
 #include <fastdds/topic/TopicProxyFactory.hpp>
 #include <rtps/reader/StatefulReader.hpp>
@@ -701,8 +701,8 @@ class DomainParticipantImpl
             const DomainParticipantQos& from);
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_PARTICIPANTIMPL_HPP_ */
+#endif // FASTDDS_DOMAIN__DOMAINPARTICIPANTIMPL_HPP
diff --git a/src/cpp/fastdds/domain/qos/DomainParticipantQos.cpp b/src/cpp/fastdds/domain/qos/DomainParticipantQos.cpp
index 48740b90a3c..90c94e159d3 100644
--- a/src/cpp/fastdds/domain/qos/DomainParticipantQos.cpp
+++ b/src/cpp/fastdds/domain/qos/DomainParticipantQos.cpp
@@ -20,7 +20,7 @@
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
 
 #include <fastdds/rtps/attributes/BuiltinTransports.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/utils/QosConverters.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/fastdds/publisher/DataWriterHistory.cpp b/src/cpp/fastdds/publisher/DataWriterHistory.cpp
index 5cf8f0d4fa7..47c3578ed22 100644
--- a/src/cpp/fastdds/publisher/DataWriterHistory.cpp
+++ b/src/cpp/fastdds/publisher/DataWriterHistory.cpp
@@ -23,8 +23,8 @@
 
 #include <fastdds/dds/common/InstanceHandle.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/fastdds/publisher/DataWriterHistory.hpp b/src/cpp/fastdds/publisher/DataWriterHistory.hpp
index d826f494a92..bcbc125bf84 100644
--- a/src/cpp/fastdds/publisher/DataWriterHistory.hpp
+++ b/src/cpp/fastdds/publisher/DataWriterHistory.hpp
@@ -16,18 +16,18 @@
  * @file DataWriterHistory.hpp
  */
 
-#ifndef _FASTDDS_PUBLISHER_DATAWRITERHISTORY_HPP_
-#define _FASTDDS_PUBLISHER_DATAWRITERHISTORY_HPP_
+#ifndef FASTDDS_PUBLISHER__DATAWRITERHISTORY_HPP
+#define FASTDDS_PUBLISHER__DATAWRITERHISTORY_HPP
 
 #include <chrono>
 #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/attributes/ResourceManagement.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <fastdds/publisher/history/DataWriterInstance.hpp>
 
@@ -293,4 +293,4 @@ class DataWriterHistory : public rtps::WriterHistory
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif // _FASTDDS_PUBLISHER_DATAWRITERHISTORY_HPP_
+#endif // FASTDDS_PUBLISHER__DATAWRITERHISTORY_HPP
diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.cpp b/src/cpp/fastdds/publisher/DataWriterImpl.cpp
index 831e91620dc..77732e1e805 100644
--- a/src/cpp/fastdds/publisher/DataWriterImpl.cpp
+++ b/src/cpp/fastdds/publisher/DataWriterImpl.cpp
@@ -21,7 +21,7 @@
 #include <functional>
 #include <iostream>
 
-#include <fastdds/config.h>
+#include <fastdds/config.hpp>
 #include <fastdds/core/condition/StatusConditionImpl.hpp>
 #include <fastdds/core/policy/ParameterSerializer.hpp>
 #include <fastdds/core/policy/QosPolicyUtils.hpp>
@@ -35,10 +35,10 @@
 #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/participant/RTPSParticipant.h>
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <rtps/builtin/liveliness/WLP.hpp>
 #include <rtps/DataSharing/DataSharingPayloadPool.hpp>
diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.hpp b/src/cpp/fastdds/publisher/DataWriterImpl.hpp
index caf1226898c..d5b4310c138 100644
--- a/src/cpp/fastdds/publisher/DataWriterImpl.hpp
+++ b/src/cpp/fastdds/publisher/DataWriterImpl.hpp
@@ -30,18 +30,18 @@
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/common/WriteParams.h>
-#include <fastdds/rtps/history/IChangePool.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
+#include <fastdds/rtps/common/WriteParams.hpp>
+#include <fastdds/rtps/history/IChangePool.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 
 #include <fastdds/publisher/DataWriterHistory.hpp>
 #include <fastdds/publisher/filtering/ReaderFilterCollection.hpp>
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 #include <rtps/DataSharing/DataSharingPayloadPool.hpp>
 #include <rtps/history/ITopicPayloadPool.h>
 
diff --git a/src/cpp/fastdds/publisher/PublisherImpl.cpp b/src/cpp/fastdds/publisher/PublisherImpl.cpp
index 93718e51c72..2f3bd76f6dd 100644
--- a/src/cpp/fastdds/publisher/PublisherImpl.cpp
+++ b/src/cpp/fastdds/publisher/PublisherImpl.cpp
@@ -30,7 +30,7 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/domain/DomainParticipantImpl.hpp>
 #include <fastdds/publisher/DataWriterImpl.hpp>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
 #include <fastdds/topic/TopicDescriptionImpl.hpp>
 #include <fastdds/utils/QosConverters.hpp>
 
diff --git a/src/cpp/fastdds/publisher/PublisherImpl.hpp b/src/cpp/fastdds/publisher/PublisherImpl.hpp
index c361d48351e..85ba9e9cfb0 100644
--- a/src/cpp/fastdds/publisher/PublisherImpl.hpp
+++ b/src/cpp/fastdds/publisher/PublisherImpl.hpp
@@ -18,8 +18,8 @@
 
 
 
-#ifndef _FASTDDS_PUBLISHERIMPL_HPP_
-#define _FASTDDS_PUBLISHERIMPL_HPP_
+#ifndef FASTDDS_PUBLISHER_PUBLISHERIMPL_HPP
+#define FASTDDS_PUBLISHER_PUBLISHERIMPL_HPP
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 
@@ -278,8 +278,8 @@ class PublisherImpl
 
 };
 
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_PUBLISHER_HPP_ */
+#endif // FASTDDS_PUBLISHER_PUBLISHERIMPL_HPP
diff --git a/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChange.hpp b/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChange.hpp
index 302e4d55ff6..55e35a47eef 100644
--- a/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChange.hpp
+++ b/src/cpp/fastdds/publisher/filtering/DataWriterFilteredChange.hpp
@@ -19,7 +19,7 @@
 #ifndef _FASTDDS_PUBLISHER_FILTERING_DATAWRITERFILTEREDCHANGE_HPP_
 #define _FASTDDS_PUBLISHER_FILTERING_DATAWRITERFILTEREDCHANGE_HPP_
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 
 #include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
diff --git a/src/cpp/fastdds/publisher/filtering/ReaderFilterCollection.hpp b/src/cpp/fastdds/publisher/filtering/ReaderFilterCollection.hpp
index dd52012d3ae..75a2cc47b97 100644
--- a/src/cpp/fastdds/publisher/filtering/ReaderFilterCollection.hpp
+++ b/src/cpp/fastdds/publisher/filtering/ReaderFilterCollection.hpp
@@ -26,7 +26,7 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 
 #include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
 
diff --git a/src/cpp/fastdds/publisher/history/DataWriterInstance.hpp b/src/cpp/fastdds/publisher/history/DataWriterInstance.hpp
index 48e90910d62..a1bc8ac84f9 100644
--- a/src/cpp/fastdds/publisher/history/DataWriterInstance.hpp
+++ b/src/cpp/fastdds/publisher/history/DataWriterInstance.hpp
@@ -21,9 +21,9 @@
 
 #include <chrono>
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/rtps/common/ChangeKind_t.hpp>
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 
 #include <utils/constructor_macros.hpp>
 
diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp b/src/cpp/fastdds/subscriber/DataReaderImpl.cpp
index fa864c546b3..4d0e5020aa6 100644
--- a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp
+++ b/src/cpp/fastdds/subscriber/DataReaderImpl.cpp
@@ -23,7 +23,7 @@
 #   include <version>
 #endif // if defined(__has_include) && __has_include(<version>)
 
-#include <fastdds/config.h>
+#include <fastdds/config.hpp>
 #include <fastdds/core/condition/StatusConditionImpl.hpp>
 #include <fastdds/core/policy/QosPolicyUtils.hpp>
 #include <fastdds/dds/core/StackAllocatedSequence.hpp>
@@ -36,9 +36,9 @@
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/domain/DomainParticipantImpl.hpp>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
 #include <fastdds/subscriber/DataReaderImpl.hpp>
 #include <fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp>
 #include <fastdds/subscriber/DataReaderImpl/StateFilter.hpp>
diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl.hpp
index d8c1f35779c..8308b98f3c3 100644
--- a/src/cpp/fastdds/subscriber/DataReaderImpl.hpp
+++ b/src/cpp/fastdds/subscriber/DataReaderImpl.hpp
@@ -33,12 +33,12 @@
 #include <fastdds/dds/subscriber/ReadCondition.hpp>
 #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/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/history/IPayloadPool.h>
-#include <fastdds/rtps/reader/ReaderListener.h>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
 
 #include <fastdds/subscriber/DataReaderImpl/DataReaderLoanManager.hpp>
 #include <fastdds/subscriber/DataReaderImpl/SampleInfoPool.hpp>
diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp
index ce539ae5efc..3ce1d7be02f 100644
--- a/src/cpp/fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp
+++ b/src/cpp/fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp
@@ -35,8 +35,8 @@
 #include <fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp>
 #include <fastdds/subscriber/history/DataReaderHistory.hpp>
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <rtps/reader/BaseReader.hpp>
 #include <rtps/reader/WriterProxy.h>
diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp
index af9f9d84f67..c77200b0db4 100644
--- a/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp
+++ b/src/cpp/fastdds/subscriber/DataReaderImpl/SampleLoanManager.hpp
@@ -25,9 +25,9 @@
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 
 #include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
diff --git a/src/cpp/fastdds/subscriber/SubscriberImpl.cpp b/src/cpp/fastdds/subscriber/SubscriberImpl.cpp
index 81ff756b712..14f106b914a 100644
--- a/src/cpp/fastdds/subscriber/SubscriberImpl.cpp
+++ b/src/cpp/fastdds/subscriber/SubscriberImpl.cpp
@@ -28,8 +28,8 @@
 #include <fastdds/dds/subscriber/SubscriberListener.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/domain/DomainParticipantImpl.hpp>
-#include <fastdds/rtps/common/Property.h>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
+#include <fastdds/rtps/common/Property.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
 #include <fastdds/subscriber/DataReaderImpl.hpp>
 #include <fastdds/topic/TopicDescriptionImpl.hpp>
 #include <fastdds/utils/QosConverters.hpp>
diff --git a/src/cpp/fastdds/subscriber/history/DataReaderCacheChange.hpp b/src/cpp/fastdds/subscriber/history/DataReaderCacheChange.hpp
index c3ff994f38c..306ea4bcaac 100644
--- a/src/cpp/fastdds/subscriber/history/DataReaderCacheChange.hpp
+++ b/src/cpp/fastdds/subscriber/history/DataReaderCacheChange.hpp
@@ -21,7 +21,7 @@
 
 #include <cstdint>
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp b/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp
index 6ed2111e228..c28801583ad 100644
--- a/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp
+++ b/src/cpp/fastdds/subscriber/history/DataReaderHistory.cpp
@@ -26,7 +26,7 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp>
 
diff --git a/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp b/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp
index d0c3ce2263e..e8bec446c45 100644
--- a/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp
+++ b/src/cpp/fastdds/subscriber/history/DataReaderHistory.hpp
@@ -35,12 +35,12 @@
 #include <fastdds/dds/topic/TopicDescription.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/attributes/ResourceManagement.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
 
 #include <fastdds/subscriber/DataReaderImpl/StateFilter.hpp>
 
diff --git a/src/cpp/fastdds/topic/ContentFilterInfo.hpp b/src/cpp/fastdds/topic/ContentFilterInfo.hpp
index 661c04f4e4d..e9456086f3a 100644
--- a/src/cpp/fastdds/topic/ContentFilterInfo.hpp
+++ b/src/cpp/fastdds/topic/ContentFilterInfo.hpp
@@ -24,8 +24,8 @@
 #include <limits>
 
 #include <fastdds/dds/core/policy/ParameterTypes.hpp>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/rtps/common/CDRMessage_t.h>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
 #include <rtps/messages/CDRMessage.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp b/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp
index 38d1473ba47..f58f918c6c6 100644
--- a/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp
+++ b/src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp
@@ -28,7 +28,7 @@
 #include <fastdds/subscriber/DataReaderImpl.hpp>
 #include <fastdds/topic/ContentFilterUtils.hpp>
 #include <fastdds/topic/TopicProxy.hpp>
-#include <fastdds/utils/md5.h>
+#include <fastdds/utils/md5.hpp>
 #include <rtps/messages/CDRMessage.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp
index ebc52441fc6..b3dc98f6baf 100644
--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp
+++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.cpp
@@ -25,7 +25,7 @@
 #include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 
 #include "DDSFilterPredicate.hpp"
 #include "DDSFilterValue.hpp"
diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.hpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.hpp
index 668ba47d9c8..d088f08e6c6 100644
--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.hpp
+++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterField.hpp
@@ -26,7 +26,7 @@
 #include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 
 #include "DDSFilterPredicate.hpp"
 #include "DDSFilterValue.hpp"
diff --git a/src/cpp/fastdds/topic/TopicDataType.cpp b/src/cpp/fastdds/topic/TopicDataType.cpp
index d95bec5407c..53125b55a20 100644
--- a/src/cpp/fastdds/topic/TopicDataType.cpp
+++ b/src/cpp/fastdds/topic/TopicDataType.cpp
@@ -24,8 +24,8 @@
 
 #include <fastdds/fastdds_dll.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/fastdds/utils/QosConverters.cpp b/src/cpp/fastdds/utils/QosConverters.cpp
index fdb778bd94d..6877d5fad9d 100644
--- a/src/cpp/fastdds/utils/QosConverters.cpp
+++ b/src/cpp/fastdds/utils/QosConverters.cpp
@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include <fastdds/rtps/common/Property.h>
+#include <fastdds/rtps/common/Property.hpp>
 #include <fastdds/utils/QosConverters.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/fastdds/utils/QosConverters.hpp b/src/cpp/fastdds/utils/QosConverters.hpp
index a71ec4bc1cb..34e6f06aeca 100644
--- a/src/cpp/fastdds/utils/QosConverters.hpp
+++ b/src/cpp/fastdds/utils/QosConverters.hpp
@@ -27,8 +27,8 @@
 #include <fastdds/dds/domain/qos/RequesterQos.hpp>
 #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 <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
 
 #include <xmlparser/attributes/ParticipantAttributes.hpp>
 #include <xmlparser/attributes/PublisherAttributes.hpp>
diff --git a/src/cpp/fastdds/xtypes/CMakeLists.txt b/src/cpp/fastdds/xtypes/CMakeLists.txt
index 79f2199205e..8df0bec2121 100644
--- a/src/cpp/fastdds/xtypes/CMakeLists.txt
+++ b/src/cpp/fastdds/xtypes/CMakeLists.txt
@@ -100,7 +100,7 @@ target_sources(fastdds-xtypes-type-representation INTERFACE
 
     ${PROJECT_SOURCE_DIR}/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject.hpp
     ${PROJECT_SOURCE_DIR}/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectCdrAux.hpp
-    ${PROJECT_SOURCE_DIR}/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.h
+    ${PROJECT_SOURCE_DIR}/include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp
 
     exception/Exception.cpp
     type_representation/dds_xtypes_typeobjectCdrAux.ipp
diff --git a/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp b/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp
index 320e157f5a4..fb64b11be5b 100644
--- a/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp
+++ b/src/cpp/fastdds/xtypes/dynamic_types/DynamicPubSubType.cpp
@@ -20,8 +20,8 @@
 #include <fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicType.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicTypeMember.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 
 #include "common.hpp"
 #include "DynamicDataImpl.hpp"
diff --git a/src/cpp/fastdds/xtypes/dynamic_types/TypeForKind.hpp b/src/cpp/fastdds/xtypes/dynamic_types/TypeForKind.hpp
index 86b3f8029a4..29789872930 100644
--- a/src/cpp/fastdds/xtypes/dynamic_types/TypeForKind.hpp
+++ b/src/cpp/fastdds/xtypes/dynamic_types/TypeForKind.hpp
@@ -18,7 +18,7 @@
 #include <type_traits>
 
 #include <fastdds/dds/xtypes/dynamic_types/detail/dynamic_language_binding.hpp>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.cpp b/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.cpp
index c3f6e6ed692..2ea3fb04af0 100644
--- a/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.cpp
+++ b/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.cpp
@@ -33,7 +33,7 @@
 #include <fastdds/dds/xtypes/dynamic_types/VerbatimTextDescriptor.hpp>
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 #include <fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp>
-#include <fastdds/utils/md5.h>
+#include <fastdds/utils/md5.hpp>
 
 #include <fastdds/xtypes/dynamic_types/AnnotationDescriptorImpl.hpp>
 #include <fastdds/xtypes/dynamic_types/DynamicTypeImpl.hpp>
diff --git a/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.hpp b/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.hpp
index e60c9ec2a91..4fa0aca46d3 100644
--- a/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.hpp
+++ b/src/cpp/fastdds/xtypes/type_representation/TypeObjectRegistry.hpp
@@ -17,8 +17,8 @@
  * This file contains the required classes to keep a TypeObject/TypeIdentifier registry.
  */
 
-#ifndef _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTREGISTRY_HPP_
-#define _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTREGISTRY_HPP_
+#ifndef FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECTREGISTRY_HPP
+#define FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECTREGISTRY_HPP
 
 #include <mutex>
 #include <string>
@@ -1106,9 +1106,9 @@ class TypeObjectRegistry : public ITypeObjectRegistry
 
 };
 
-} // xtypes
-} // dds
-} // fastdds
-} // eprosima
+} // namespace xtypes
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif // _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTREGISTRY_HPP_
+#endif // FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECTREGISTRY_HPP
diff --git a/src/cpp/fastdds/xtypes/type_representation/TypeObjectUtils.cpp b/src/cpp/fastdds/xtypes/type_representation/TypeObjectUtils.cpp
index 97d3e0a49dc..16c90b60a5f 100644
--- a/src/cpp/fastdds/xtypes/type_representation/TypeObjectUtils.cpp
+++ b/src/cpp/fastdds/xtypes/type_representation/TypeObjectUtils.cpp
@@ -26,7 +26,7 @@
 #include <fastdds/dds/xtypes/exception/Exception.hpp>
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/utils/md5.h>
+#include <fastdds/utils/md5.hpp>
 
 #include <fastdds/xtypes/type_representation/TypeObjectRegistry.hpp>
 #include <rtps/RTPSDomainImpl.hpp>
diff --git a/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectCdrAux.ipp b/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectCdrAux.ipp
index 811667c8fbc..f64af01a538 100644
--- a/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectCdrAux.ipp
+++ b/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECTCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECTCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECTCDRAUX_IPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECTCDRAUX_IPP
 
 #include <fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectCdrAux.hpp>
 
@@ -10708,5 +10708,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECTCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_DDS_XTYPES_DDS_XTYPES_TYPEOBJECTCDRAUX_IPP
 
diff --git a/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx b/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx
index 49cc84247c3..544a0507e3f 100644
--- a/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx
+++ b/src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include <fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.h>
+#include <fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp>
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/src/cpp/rtps/DataSharing/DataSharingNotification.cpp b/src/cpp/rtps/DataSharing/DataSharingNotification.cpp
index 3895bc33046..a2427a47492 100644
--- a/src/cpp/rtps/DataSharing/DataSharingNotification.cpp
+++ b/src/cpp/rtps/DataSharing/DataSharingNotification.cpp
@@ -17,7 +17,7 @@
  */
 
 #include <rtps/DataSharing/DataSharingNotification.hpp>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 #include <memory>
 #include <mutex>
diff --git a/src/cpp/rtps/DataSharing/DataSharingNotification.hpp b/src/cpp/rtps/DataSharing/DataSharingNotification.hpp
index a35a1a51c7d..1760ac4bfc9 100644
--- a/src/cpp/rtps/DataSharing/DataSharingNotification.hpp
+++ b/src/cpp/rtps/DataSharing/DataSharingNotification.hpp
@@ -23,7 +23,7 @@
 #include <rtps/history/PoolConfig.h>
 #include <utils/shared_memory/SharedMemSegment.hpp>
 #include <utils/shared_memory/SharedDir.hpp>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 
 #include <memory>
 #include <vector>
diff --git a/src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp b/src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp
index 99716ff68e9..cd97ec6ef1c 100644
--- a/src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp
+++ b/src/cpp/rtps/DataSharing/DataSharingPayloadPool.hpp
@@ -16,11 +16,11 @@
  * @file DataSharingPayloadPool.hpp
  */
 
-#ifndef RTPS_DATASHARING_DATASHARINGPAYLOADPOOL_HPP
-#define RTPS_DATASHARING_DATASHARINGPAYLOADPOOL_HPP
+#ifndef FASTDDS_RTPS_DATASHARING__DATASHARINGPAYLOADPOOL_HPP
+#define FASTDDS_RTPS_DATASHARING__DATASHARINGPAYLOADPOOL_HPP
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <rtps/history/PoolConfig.h>
 #include <utils/shared_memory/SharedDir.hpp>
@@ -383,4 +383,4 @@ class DataSharingPayloadPool : public IPayloadPool
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // RTPS_DATASHARING_DATASHARINGPAYLOADPOOL_HPP
+#endif  // FASTDDS_RTPS_DATASHARING__DATASHARINGPAYLOADPOOL_HPP
diff --git a/src/cpp/rtps/DataSharing/ReaderPool.hpp b/src/cpp/rtps/DataSharing/ReaderPool.hpp
index eb0dbcc62ce..062be422a18 100644
--- a/src/cpp/rtps/DataSharing/ReaderPool.hpp
+++ b/src/cpp/rtps/DataSharing/ReaderPool.hpp
@@ -16,11 +16,11 @@
  * @file ReaderPool.hpp
  */
 
-#ifndef RTPS_DATASHARING_READERPOOL_HPP
-#define RTPS_DATASHARING_READERPOOL_HPP
+#ifndef FASTDDS_RTPS_DATASHARING__READERPOOL_HPP
+#define FASTDDS_RTPS_DATASHARING__READERPOOL_HPP
 
-#include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/attributes/ResourceManagement.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <rtps/DataSharing/DataSharingPayloadPool.hpp>
 
@@ -311,4 +311,4 @@ class ReaderPool : public DataSharingPayloadPool
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // RTPS_DATASHARING_DATASHARINGPAYLOADPOOLIMPL_READERPOOL_HPP
+#endif  // FASTDDS_RTPS_DATASHARING__READERPOOL_HPP
diff --git a/src/cpp/rtps/DataSharing/WriterPool.hpp b/src/cpp/rtps/DataSharing/WriterPool.hpp
index 65ce8370aba..2ab24f65fa8 100644
--- a/src/cpp/rtps/DataSharing/WriterPool.hpp
+++ b/src/cpp/rtps/DataSharing/WriterPool.hpp
@@ -19,9 +19,9 @@
 #ifndef RTPS_DATASHARING_WRITERPOOL_HPP
 #define RTPS_DATASHARING_WRITERPOOL_HPP
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/rtps/attributes/ResourceManagement.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <rtps/DataSharing/DataSharingPayloadPool.hpp>
 #include <utils/collections/FixedSizeQueue.hpp>
diff --git a/src/cpp/rtps/RTPSDomain.cpp b/src/cpp/rtps/RTPSDomain.cpp
index f572be5653e..07c6b2d21ab 100644
--- a/src/cpp/rtps/RTPSDomain.cpp
+++ b/src/cpp/rtps/RTPSDomain.cpp
@@ -16,7 +16,7 @@
  * @file RTPSDomain.cpp
  */
 
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
 
 #include <chrono>
 #include <cstdlib>
@@ -28,13 +28,13 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastdds/utils/IPFinder.h>
-#include <fastdds/utils/IPLocator.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
+#include <fastdds/utils/IPFinder.hpp>
+#include <fastdds/utils/IPLocator.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include <rtps/common/GuidUtils.hpp>
 #include <rtps/network/utils/external_locators.hpp>
diff --git a/src/cpp/rtps/RTPSDomainImpl.hpp b/src/cpp/rtps/RTPSDomainImpl.hpp
index bd9b1891030..9643b601fab 100644
--- a/src/cpp/rtps/RTPSDomainImpl.hpp
+++ b/src/cpp/rtps/RTPSDomainImpl.hpp
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 
-#ifndef _RTPS_RTPSDOMAINIMPL_HPP_
-#define _RTPS_RTPSDOMAINIMPL_HPP_
+#ifndef FASTDDS_RTPS__RTPSDOMAINIMPL_HPP
+#define FASTDDS_RTPS__RTPSDOMAINIMPL_HPP
 
 #include <chrono>
 #include <memory>
@@ -25,9 +25,9 @@
 #endif // defined(_WIN32) || defined(__unix__)
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <rtps/reader/BaseReader.hpp>
 #include <utils/shared_memory/BoostAtExitRegistry.hpp>
@@ -325,4 +325,4 @@ class RTPSDomainImpl
 } // namespace fastdds
 } // namespace eprosima
 
-#endif  // _RTPS_RTPSDOMAINIMPL_HPP_
+#endif  // FASTDDS_RTPS__RTPSDOMAINIMPL_HPP
diff --git a/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp b/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp
index 8747c5a07ce..ecbbf2e3ec4 100644
--- a/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp
+++ b/src/cpp/rtps/attributes/EndpointSecurityAttributes.cpp
@@ -16,7 +16,7 @@
  * @file EndpointSecurityAttributes.cpp
  */
 
-#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.hpp>
 
 #include <rtps/security/accesscontrol/SecurityMaskUtilities.h>
 
diff --git a/src/cpp/rtps/attributes/PropertyPolicy.cpp b/src/cpp/rtps/attributes/PropertyPolicy.cpp
index 08c15b9039b..58b9f88f093 100644
--- a/src/cpp/rtps/attributes/PropertyPolicy.cpp
+++ b/src/cpp/rtps/attributes/PropertyPolicy.cpp
@@ -16,7 +16,7 @@
  * @file PropertyPolicy.cpp
  */
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 
 #include <algorithm>
 
diff --git a/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp b/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
index 34577a50815..d60e1281b87 100644
--- a/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
+++ b/src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 
 #include <algorithm>
 #include <memory>
@@ -20,13 +20,13 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/LibrarySettings.hpp>
 #include <fastdds/rtps/attributes/BuiltinTransports.hpp>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #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 d05bb5fe4d0..8652e5e6c2c 100644
--- a/src/cpp/rtps/attributes/TopicAttributes.cpp
+++ b/src/cpp/rtps/attributes/TopicAttributes.cpp
@@ -16,7 +16,7 @@
  * @file TopicAttributes.cpp
  */
 
-#include <fastdds/rtps/attributes/TopicAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
 #include <fastdds/dds/log/Log.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/builtin/BuiltinProtocols.cpp b/src/cpp/rtps/builtin/BuiltinProtocols.cpp
index 46d251f8e26..289f8951b02 100644
--- a/src/cpp/rtps/builtin/BuiltinProtocols.cpp
+++ b/src/cpp/rtps/builtin/BuiltinProtocols.cpp
@@ -23,8 +23,8 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/utils/IPFinder.h>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/utils/IPFinder.hpp>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <rtps/builtin/discovery/endpoint/EDP.h>
diff --git a/src/cpp/rtps/builtin/BuiltinProtocols.h b/src/cpp/rtps/builtin/BuiltinProtocols.h
index db8fd3d957a..8efd402314d 100644
--- a/src/cpp/rtps/builtin/BuiltinProtocols.h
+++ b/src/cpp/rtps/builtin/BuiltinProtocols.h
@@ -17,13 +17,13 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_BUILTINPROTOCOLS_H_
-#define _FASTDDS_RTPS_BUILTINPROTOCOLS_H_
+#ifndef FASTDDS_RTPS_BUILTIN__BUILTINPROTOCOLS_H
+#define FASTDDS_RTPS_BUILTIN__BUILTINPROTOCOLS_H
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <list>
 
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
 
 #include <utils/shared_mutex.hpp>
@@ -208,7 +208,7 @@ class BuiltinProtocols
 };
 
 } // namespace rtps
-} /* namespace rtps */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace eprosima
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_BUILTINPROTOCOLS_H_ */
+#endif // FASTDDS_RTPS_BUILTIN__BUILTINPROTOCOLS_H
diff --git a/src/cpp/rtps/builtin/BuiltinReader.hpp b/src/cpp/rtps/builtin/BuiltinReader.hpp
index d40dace9abc..9fa50ed3503 100644
--- a/src/cpp/rtps/builtin/BuiltinReader.hpp
+++ b/src/cpp/rtps/builtin/BuiltinReader.hpp
@@ -21,8 +21,8 @@
 
 #include <memory>
 
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/reader/ReaderListener.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
 
 #include <rtps/history/ITopicPayloadPool.h>
 #include <rtps/history/PoolConfig.h>
diff --git a/src/cpp/rtps/builtin/BuiltinWriter.hpp b/src/cpp/rtps/builtin/BuiltinWriter.hpp
index 1fa1679a779..f00b8815e43 100644
--- a/src/cpp/rtps/builtin/BuiltinWriter.hpp
+++ b/src/cpp/rtps/builtin/BuiltinWriter.hpp
@@ -21,7 +21,7 @@
 
 #include <memory>
 
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <rtps/history/ITopicPayloadPool.h>
 #include <rtps/history/PoolConfig.h>
diff --git a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
index c94f6f36621..bd5528e8a83 100644
--- a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
+++ b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
@@ -25,8 +25,8 @@
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/core/policy/QosPoliciesSerializer.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
diff --git a/src/cpp/rtps/builtin/data/ProxyHashTables.hpp b/src/cpp/rtps/builtin/data/ProxyHashTables.hpp
index 9b866d554d7..46c14ec7049 100644
--- a/src/cpp/rtps/builtin/data/ProxyHashTables.hpp
+++ b/src/cpp/rtps/builtin/data/ProxyHashTables.hpp
@@ -20,7 +20,7 @@
 #ifndef _FASTDDS_RTPS_BUILTIN_DATA_PROXYHASHTABLES_HPP_
 #define _FASTDDS_RTPS_BUILTIN_DATA_PROXYHASHTABLES_HPP_
 
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 
 #include <foonathan/memory/container.hpp>
 #include <foonathan/memory/memory_pool.hpp>
diff --git a/src/cpp/rtps/builtin/data/ReaderProxyData.cpp b/src/cpp/rtps/builtin/data/ReaderProxyData.cpp
index 8a14bdc2e27..337ae71ff50 100644
--- a/src/cpp/rtps/builtin/data/ReaderProxyData.cpp
+++ b/src/cpp/rtps/builtin/data/ReaderProxyData.cpp
@@ -20,8 +20,8 @@
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/core/policy/QosPoliciesSerializer.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/common/CDRMessage_t.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 
 #include <rtps/network/NetworkFactory.h>
diff --git a/src/cpp/rtps/builtin/data/WriterProxyData.cpp b/src/cpp/rtps/builtin/data/WriterProxyData.cpp
index 38c7d1cfaf6..6e7c4f2cbe3 100644
--- a/src/cpp/rtps/builtin/data/WriterProxyData.cpp
+++ b/src/cpp/rtps/builtin/data/WriterProxyData.cpp
@@ -20,7 +20,7 @@
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/core/policy/QosPoliciesSerializer.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 
 #include <rtps/network/NetworkFactory.h>
diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
index 63740915936..4ff9249dbca 100644
--- a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
+++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
@@ -29,8 +29,8 @@
 
 #include <nlohmann/json.hpp>
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <rtps/builtin/discovery/database/DiscoveryDataFilter.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryDataQueueInfo.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataQueueInfo.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataQueueInfo.hpp
index 98792ab66c4..9c28060831f 100644
--- a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataQueueInfo.hpp
+++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataQueueInfo.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 
 #include <rtps/builtin/discovery/database/DiscoveryParticipantChangeData.hpp>
 
diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryEndpointInfo.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryEndpointInfo.hpp
index f26277f16c1..3050023f39b 100644
--- a/src/cpp/rtps/builtin/discovery/database/DiscoveryEndpointInfo.hpp
+++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryEndpointInfo.hpp
@@ -24,7 +24,7 @@
 
 #include <fastcdr/cdr/fixed_size_string.hpp>
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
 
 #include <nlohmann/json.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.cpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.cpp
index 42dadce3cbc..aceb6fa7857 100644
--- a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.cpp
+++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.cpp
@@ -19,7 +19,7 @@
 
 #include <vector>
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
 
 #include <rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp
index c07d9349fa1..c0a6bf60dbb 100644
--- a/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp
+++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp
@@ -22,7 +22,7 @@
 
 #include <vector>
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
 
 #include <rtps/builtin/discovery/database/DiscoverySharedInfo.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.cpp b/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.cpp
index 7f249618e2b..cd1d0abfca3 100644
--- a/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.cpp
+++ b/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
 
 #include <rtps/builtin/discovery/database/DiscoverySharedInfo.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.hpp
index a0455a5c868..9765e62dffd 100644
--- a/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.hpp
+++ b/src/cpp/rtps/builtin/discovery/database/DiscoverySharedInfo.hpp
@@ -20,7 +20,7 @@
 #ifndef _FASTDDS_RTPS_DISCOVERY_SHARED_INFO_H_
 #define _FASTDDS_RTPS_DISCOVERY_SHARED_INFO_H_
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
 #include <fastdds/dds/log/Log.hpp>
 
diff --git a/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.cpp b/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.cpp
index e961e3dde66..c5bbcbc6ebd 100644
--- a/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.cpp
+++ b/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.cpp
@@ -19,7 +19,7 @@
 
 #include <nlohmann/json.hpp>
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <rtps/builtin/discovery/database/backup/SharedBackupFunctions.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.hpp b/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.hpp
index ab446f539cd..42c8135faef 100644
--- a/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.hpp
+++ b/src/cpp/rtps/builtin/discovery/database/backup/SharedBackupFunctions.hpp
@@ -21,7 +21,7 @@
 #define _SHARED_DUMP_FUNCTIONS_H_
 
 #include <nlohmann/json.hpp>
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
index f12e266d326..13032630a22 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
@@ -26,14 +26,14 @@
 
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/attributes/TopicAttributes.h>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.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 <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 
 #include <rtps/builtin/data/ProxyHashTables.hpp>
 #include <rtps/builtin/discovery/participant/PDP.h>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDP.h b/src/cpp/rtps/builtin/discovery/endpoint/EDP.h
index ebcd7be315b..740ac2f6cb4 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDP.h
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDP.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_EDP_H_
-#define _FASTDDS_RTPS_EDP_H_
+#ifndef FASTDDS_RTPS_BUILTIN_DISCOVERY_ENDPOINT_EDP_H
+#define FASTDDS_RTPS_BUILTIN_DISCOVERY_ENDPOINT_EDP_H
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <foonathan/memory/container.hpp>
@@ -27,11 +27,11 @@
 #include <fastdds/dds/core/status/IncompatibleQosStatus.hpp>
 #include <fastdds/dds/core/status/PublicationMatchedStatus.hpp>
 #include <fastdds/dds/core/status/SubscriptionMatchedStatus.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 
 #include <utils/ProxyPool.hpp>
 
@@ -401,9 +401,9 @@ class EDP
     foonathan::memory::map<GUID_t, fastdds::dds::PublicationMatchedStatus, pool_allocator_t> writer_status_;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_EDP_H_ */
+#endif // FASTDDS_RTPS_BUILTIN_DISCOVERY_ENDPOINT_EDP_H
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp
index f0e52d3089b..ad32ae88f86 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp
@@ -23,10 +23,10 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <rtps/builtin/discovery/participant/PDP.h>
 #if HAVE_SECURITY
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp
index ee738274d2c..8386a4a6027 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp
@@ -20,9 +20,9 @@
 #include <rtps/builtin/discovery/endpoint/EDPServerListeners.hpp>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <rtps/reader/StatefulReader.hpp>
 #include <rtps/writer/StatefulWriter.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp
index 780874b730b..c818c69632f 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp
@@ -22,7 +22,7 @@
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 
 #include <rtps/builtin/discovery/database/DiscoveryDataBase.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryDataFilter.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp
index 954d59a0259..68b1f47ddb3 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp
@@ -19,9 +19,9 @@
 #include <rtps/builtin/discovery/endpoint/EDPServerListeners.hpp>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <rtps/builtin/discovery/endpoint/EDPServer.hpp>
 #include <rtps/builtin/discovery/participant/PDPServer.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
index c33742343c9..b5474d76de5 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
@@ -25,16 +25,16 @@
 
 #include <fastdds/core/policy/ParameterSerializer.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/discovery/endpoint/EDPSimpleListeners.h>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.h b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.h
index 4a2250c7515..231acb52de8 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.h
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.h
@@ -21,8 +21,8 @@
 #define _FASTDDS_RTPS_EDPSIMPLE_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
index 2362a8f4546..b49e53647d3 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
@@ -24,11 +24,11 @@
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPSimple.h>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h
index dc8725430eb..19e352fb967 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.h
@@ -21,10 +21,10 @@
 #define EDPSIMPLELISTENER_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 
 #include <rtps/builtin/discovery/endpoint/EDPSimple.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp
index c655a8b938e..bebf22239fa 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp
@@ -26,10 +26,10 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <rtps/builtin/discovery/participant/PDPSimple.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp
index a71c583bc74..f11861dcc39 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp
@@ -22,12 +22,12 @@
 #include <memory>
 #include <string>
 
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
 #include <fastdds/rtps/common/EntityId_t.hpp>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <rtps/history/ITopicPayloadPool.h>
 #include <rtps/history/PoolConfig.h>
diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/FakeWriter.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/FakeWriter.hpp
index feb1b9ae26d..f0f2d444000 100644
--- a/src/cpp/rtps/builtin/discovery/participant/DS/FakeWriter.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/DS/FakeWriter.hpp
@@ -19,7 +19,7 @@
 #ifndef FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_DS__FAKEWRITER_HPP_
 #define FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_DS__FAKEWRITER_HPP_
 
-#include <fastdds/rtps/Endpoint.h>
+#include <fastdds/rtps/Endpoint.hpp>
 
 #include <rtps/participant/RTPSParticipantImpl.h>
 
diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp
index 4db57655f2a..133f77bd127 100644
--- a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp
@@ -23,10 +23,10 @@
 
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
-#include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
+#include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
diff --git a/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp b/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp
index d5171445b7f..2fdcabd570d 100644
--- a/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/DirectMessageSender.cpp
@@ -20,8 +20,8 @@
 #include <rtps/builtin/discovery/participant/DirectMessageSender.hpp>
 
 
-#include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <rtps/participant/RTPSParticipantImpl.h>
 
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
index 33cb3f331fb..b6939588de9 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -28,15 +28,15 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/participant/RTPSParticipantListener.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/data/ProxyHashTables.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPSimple.h>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.h b/src/cpp/rtps/builtin/discovery/participant/PDP.h
index 5ad4488e91d..17f5a53ef25 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDP.h
+++ b/src/cpp/rtps/builtin/discovery/participant/PDP.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_PDP_H_
-#define _FASTDDS_RTPS_PDP_H_
+#ifndef FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDP_H
+#define FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDP_H
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <atomic>
@@ -27,14 +27,14 @@
 #include <mutex>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/WriteParams.h>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
-#include <fastdds/rtps/reader/ReaderDiscoveryInfo.h>
-#include <fastdds/rtps/writer/WriterDiscoveryInfo.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/WriteParams.hpp>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
+#include <fastdds/rtps/reader/ReaderDiscoveryInfo.hpp>
+#include <fastdds/rtps/writer/WriterDiscoveryInfo.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 #include <statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp>
@@ -666,9 +666,9 @@ extern const Duration_t pdp_heartbeat_response_delay;
 
 extern const int32_t pdp_initial_reserved_caches;
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_PDP_H_ */
+#endif // FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDP_H
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
index d786b645430..cfcf1873718 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
@@ -29,10 +29,10 @@
 #include <vector>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/participant/RTPSParticipantListener.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp
index cd5fb3d7f11..aadee679a77 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp
@@ -23,10 +23,10 @@
 
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
-#include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
+#include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPEndpoints.hpp b/src/cpp/rtps/builtin/discovery/participant/PDPEndpoints.hpp
index e8b08e2aab9..395c3767876 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPEndpoints.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPEndpoints.hpp
@@ -19,7 +19,7 @@
 #ifndef FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDPENDPOINTS_HPP_
 #define FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDPENDPOINTS_HPP_
 
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 
 #include <rtps/participant/RTPSParticipantImpl.h>
 
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
index e515a1bef9a..afe06616a79 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
@@ -23,10 +23,10 @@
 
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
-#include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
+#include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPListener.h b/src/cpp/rtps/builtin/discovery/participant/PDPListener.h
index f685c91b7dc..380d9a8c6c0 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPListener.h
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPListener.h
@@ -21,7 +21,7 @@
 #define _FASTDDS_RTPS_PDPLISTENER_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/reader/ReaderListener.h>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 
 #include <mutex>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
index 8972676be3e..ab3fe13bbb2 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
@@ -24,10 +24,10 @@
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/history/History.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/participant/RTPSParticipantListener.h>
+#include <fastdds/rtps/history/History.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp
index 12def1ba732..792b2b64f52 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp
@@ -28,8 +28,8 @@
 #include <string>
 #include <vector>
 
-#include <fastdds/rtps/attributes/ServerAttributes.h>
-#include <fastdds/rtps/history/History.h>
+#include <fastdds/rtps/attributes/ServerAttributes.hpp>
+#include <fastdds/rtps/history/History.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryDataBase.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryDataFilter.hpp>
 #include <rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp
index 83a878df986..d9950664818 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp
@@ -22,9 +22,9 @@
 #include <memory>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <rtps/builtin/discovery/database/DiscoveryParticipantChangeData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDP.h>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
index b24cc23f5c8..d7d1c08395c 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -23,14 +23,14 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/participant/RTPSParticipantListener.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/data/NetworkConfiguration.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPSimple.h>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.h b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.h
index c6d77a5657b..4462505a698 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.h
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDPSIMPLE_H_
-#define _FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDPSIMPLE_H_
+#ifndef FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDPSIMPLE_H
+#define FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDPSIMPLE_H
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <rtps/builtin/discovery/participant/PDP.h>
@@ -163,9 +163,9 @@ class PDPSimple : public PDP
 
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif //_FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDPSIMPLE_H_
+#endif //FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDPSIMPLE_H
diff --git a/src/cpp/rtps/builtin/discovery/participant/ServerAttributes.cpp b/src/cpp/rtps/builtin/discovery/participant/ServerAttributes.cpp
index 67ad154610c..7d4ed3cb1a3 100644
--- a/src/cpp/rtps/builtin/discovery/participant/ServerAttributes.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/ServerAttributes.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/attributes/ServerAttributes.h>
+#include <fastdds/rtps/attributes/ServerAttributes.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/liveliness/WLP.cpp b/src/cpp/rtps/builtin/liveliness/WLP.cpp
index 980a88678af..972b988fbe6 100644
--- a/src/cpp/rtps/builtin/liveliness/WLP.cpp
+++ b/src/cpp/rtps/builtin/liveliness/WLP.cpp
@@ -25,10 +25,10 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/discovery/participant/PDPSimple.h>
diff --git a/src/cpp/rtps/builtin/liveliness/WLP.hpp b/src/cpp/rtps/builtin/liveliness/WLP.hpp
index 3de497f3c0b..58e68634413 100644
--- a/src/cpp/rtps/builtin/liveliness/WLP.hpp
+++ b/src/cpp/rtps/builtin/liveliness/WLP.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_WLP_HPP_
-#define _FASTDDS_RTPS_WLP_HPP_
+#ifndef FASTDDS_RTPS_BUILTIN_LIVELINESS__WLP_HPP
+#define FASTDDS_RTPS_BUILTIN_LIVELINESS__WLP_HPP
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <cstdint>
@@ -26,11 +26,11 @@
 #include <vector>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 namespace eprosima {
 
@@ -324,4 +324,4 @@ class WLP
 } /* namespace eprosima */
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_WLP_HPP_ */
+#endif /* FASTDDS_RTPS_BUILTIN_LIVELINESS__WLP_HPP */
diff --git a/src/cpp/rtps/builtin/liveliness/WLPListener.cpp b/src/cpp/rtps/builtin/liveliness/WLPListener.cpp
index cca36fcfc93..a21d4aca049 100644
--- a/src/cpp/rtps/builtin/liveliness/WLPListener.cpp
+++ b/src/cpp/rtps/builtin/liveliness/WLPListener.cpp
@@ -25,14 +25,14 @@
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/common/CDRMessage_t.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/discovery/participant/PDPSimple.h>
diff --git a/src/cpp/rtps/builtin/liveliness/WLPListener.h b/src/cpp/rtps/builtin/liveliness/WLPListener.h
index 80a67653c27..012934b2e27 100644
--- a/src/cpp/rtps/builtin/liveliness/WLPListener.h
+++ b/src/cpp/rtps/builtin/liveliness/WLPListener.h
@@ -23,9 +23,9 @@
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/reader/ReaderListener.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/common/ChangeComparison.hpp b/src/cpp/rtps/common/ChangeComparison.hpp
index 01843fadd3f..2ec63dd39b2 100644
--- a/src/cpp/rtps/common/ChangeComparison.hpp
+++ b/src/cpp/rtps/common/ChangeComparison.hpp
@@ -19,7 +19,7 @@
 #ifndef _RTPS_COMMON_CHANGECOMPARISON_HPP
 #define _RTPS_COMMON_CHANGECOMPARISON_HPP
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/common/LocatorWithMask.cpp b/src/cpp/rtps/common/LocatorWithMask.cpp
index 48de1780a6d..ec5871d1384 100644
--- a/src/cpp/rtps/common/LocatorWithMask.cpp
+++ b/src/cpp/rtps/common/LocatorWithMask.cpp
@@ -19,8 +19,8 @@
 #include <cassert>
 #include <string>
 
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 #include <rtps/network/utils/network.hpp>
 
 #include <fastdds/rtps/common/LocatorWithMask.hpp>
diff --git a/src/cpp/rtps/common/SerializedPayload.cpp b/src/cpp/rtps/common/SerializedPayload.cpp
index 7d5064766a9..7ea0b650f18 100644
--- a/src/cpp/rtps/common/SerializedPayload.cpp
+++ b/src/cpp/rtps/common/SerializedPayload.cpp
@@ -16,7 +16,7 @@
  * @file SerializedPayload.cpp
  */
 
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/common/Time_t.cpp b/src/cpp/rtps/common/Time_t.cpp
index 020f073953d..981fd0fc165 100644
--- a/src/cpp/rtps/common/Time_t.cpp
+++ b/src/cpp/rtps/common/Time_t.cpp
@@ -15,7 +15,7 @@
 /**
  * @file Time_t.cpp
  */
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 #include <cstdlib>
 #include <chrono>
diff --git a/src/cpp/rtps/common/Token.cpp b/src/cpp/rtps/common/Token.cpp
index d0e761dac5e..928703af973 100644
--- a/src/cpp/rtps/common/Token.cpp
+++ b/src/cpp/rtps/common/Token.cpp
@@ -16,7 +16,7 @@
  * @file Token.cpp
  */
 
-#include <fastdds/rtps/common/Token.h>
+#include <fastdds/rtps/common/Token.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/flowcontrol/FlowControllerFactory.hpp b/src/cpp/rtps/flowcontrol/FlowControllerFactory.hpp
index db8ca8a2883..760cf948263 100644
--- a/src/cpp/rtps/flowcontrol/FlowControllerFactory.hpp
+++ b/src/cpp/rtps/flowcontrol/FlowControllerFactory.hpp
@@ -2,7 +2,7 @@
 #define _RTPS_FLOWCONTROL_FLOWCONTROLLERFACTORY_HPP_
 
 #include <fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
 #include "FlowController.hpp"
 
 #include <string>
diff --git a/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp b/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp
index 6fe498e979c..4f607da7867 100644
--- a/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp
+++ b/src/cpp/rtps/flowcontrol/FlowControllerImpl.hpp
@@ -9,8 +9,8 @@
 
 #include "FlowController.hpp"
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 #include <fastdds/utils/TimedConditionVariable.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 
diff --git a/src/cpp/rtps/history/BasicPayloadPool.hpp b/src/cpp/rtps/history/BasicPayloadPool.hpp
index 4a86ec36496..479f931d2f8 100644
--- a/src/cpp/rtps/history/BasicPayloadPool.hpp
+++ b/src/cpp/rtps/history/BasicPayloadPool.hpp
@@ -19,8 +19,8 @@
 #ifndef RTPS_HISTORY_BASICPAYLOADPOOL_HPP
 #define RTPS_HISTORY_BASICPAYLOADPOOL_HPP
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 
 #include <rtps/history/CacheChangePool.h>
 #include <rtps/history/PoolConfig.h>
diff --git a/src/cpp/rtps/history/CacheChangePool.cpp b/src/cpp/rtps/history/CacheChangePool.cpp
index 1257f407e43..6992b838c0a 100644
--- a/src/cpp/rtps/history/CacheChangePool.cpp
+++ b/src/cpp/rtps/history/CacheChangePool.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/dds/log/Log.hpp>
 
 #include <rtps/history/CacheChangePool.h>
diff --git a/src/cpp/rtps/history/CacheChangePool.h b/src/cpp/rtps/history/CacheChangePool.h
index e532ce35eac..894a953b753 100644
--- a/src/cpp/rtps/history/CacheChangePool.h
+++ b/src/cpp/rtps/history/CacheChangePool.h
@@ -19,9 +19,9 @@
 #ifndef RTPS_HISTORY_CACHECHANGEPOOL_H_
 #define RTPS_HISTORY_CACHECHANGEPOOL_H_
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/history/IChangePool.h>
 #include <fastdds/rtps/attributes/ResourceManagement.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/history/IChangePool.hpp>
 
 #include <rtps/history/PoolConfig.h>
 
diff --git a/src/cpp/rtps/history/History.cpp b/src/cpp/rtps/history/History.cpp
index 14e2e5f0085..1e8462874f5 100644
--- a/src/cpp/rtps/history/History.cpp
+++ b/src/cpp/rtps/history/History.cpp
@@ -18,10 +18,10 @@
  */
 
 
-#include <fastdds/rtps/history/History.h>
+#include <fastdds/rtps/history/History.hpp>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 
 #include <rtps/history/BasicPayloadPool.hpp>
 #include <rtps/history/CacheChangePool.h>
diff --git a/src/cpp/rtps/history/HistoryAttributesExtension.hpp b/src/cpp/rtps/history/HistoryAttributesExtension.hpp
index 9043b93a056..44443207b6c 100644
--- a/src/cpp/rtps/history/HistoryAttributesExtension.hpp
+++ b/src/cpp/rtps/history/HistoryAttributesExtension.hpp
@@ -22,7 +22,7 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
 #include <fastdds/utils/collections/ResourceLimitedContainerConfig.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/history/ITopicPayloadPool.h b/src/cpp/rtps/history/ITopicPayloadPool.h
index c6679e99160..78d194137dd 100644
--- a/src/cpp/rtps/history/ITopicPayloadPool.h
+++ b/src/cpp/rtps/history/ITopicPayloadPool.h
@@ -19,7 +19,7 @@
 #ifndef RTPS_HISTORY_ITOPICPAYLOADPOOL_HPP
 #define RTPS_HISTORY_ITOPICPAYLOADPOOL_HPP
 
-#include <fastdds/rtps/history/IPayloadPool.h>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 #include <rtps/history/PoolConfig.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/history/PoolConfig.h b/src/cpp/rtps/history/PoolConfig.h
index dc87f6adae3..adb7533b1d3 100644
--- a/src/cpp/rtps/history/PoolConfig.h
+++ b/src/cpp/rtps/history/PoolConfig.h
@@ -19,7 +19,7 @@
 #ifndef RTPS_HISTORY_POOLCONFIG_H_
 #define RTPS_HISTORY_POOLCONFIG_H_
 
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
 #include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/history/ReaderHistory.cpp b/src/cpp/rtps/history/ReaderHistory.cpp
index d7dedb2dd04..43f05f13392 100644
--- a/src/cpp/rtps/history/ReaderHistory.cpp
+++ b/src/cpp/rtps/history/ReaderHistory.cpp
@@ -17,11 +17,11 @@
  *
  */
 
-#include <fastdds/rtps/history/ReaderHistory.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/reader/ReaderListener.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
 
 #include <rtps/common/ChangeComparison.hpp>
 #include <rtps/reader/BaseReader.hpp>
diff --git a/src/cpp/rtps/history/TopicPayloadPool.hpp b/src/cpp/rtps/history/TopicPayloadPool.hpp
index d9b32546b40..fea4700ef44 100644
--- a/src/cpp/rtps/history/TopicPayloadPool.hpp
+++ b/src/cpp/rtps/history/TopicPayloadPool.hpp
@@ -19,9 +19,9 @@
 #ifndef RTPS_HISTORY_TOPICPAYLOADPOOL_HPP
 #define RTPS_HISTORY_TOPICPAYLOADPOOL_HPP
 
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
 #include <fastdds/rtps/attributes/ResourceManagement.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <rtps/history/PoolConfig.h>
 #include <rtps/history/ITopicPayloadPool.h>
diff --git a/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp b/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp
index 7420d781a6c..ea3fef1b933 100644
--- a/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp
+++ b/src/cpp/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp
@@ -16,8 +16,8 @@
  * @file TopicPayloadPoolProxy.hpp
  */
 
-#ifndef RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL_TOPICPAYLOADPOOLPROXY_HPP
-#define RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL_TOPICPAYLOADPOOLPROXY_HPP
+#ifndef FASTDDS_RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL__TOPICPAYLOADPOOLPROXY_HPP
+#define FASTDDS_RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL__TOPICPAYLOADPOOLPROXY_HPP
 
 #include <memory>
 #include <string>
@@ -112,4 +112,4 @@ class TopicPayloadPoolProxy : public ITopicPayloadPool
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL_TOPICPAYLOADPOOLPROXY_HPP
+#endif  // FASTDDS_RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL__TOPICPAYLOADPOOLPROXY_HPP
diff --git a/src/cpp/rtps/history/WriterHistory.cpp b/src/cpp/rtps/history/WriterHistory.cpp
index f1e65d60613..363e5083f95 100644
--- a/src/cpp/rtps/history/WriterHistory.cpp
+++ b/src/cpp/rtps/history/WriterHistory.cpp
@@ -16,13 +16,13 @@
  *
  */
 
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <mutex>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastdds/rtps/common/WriteParams.h>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
+#include <fastdds/rtps/common/WriteParams.hpp>
 #include <fastdds/core/policy//ParameterSerializer.hpp>
 #include <rtps/messages/RTPSMessageGroup.hpp>
 
diff --git a/src/cpp/rtps/messages/CDRMessage.hpp b/src/cpp/rtps/messages/CDRMessage.hpp
index 1810280efd2..4a1e5f17c64 100644
--- a/src/cpp/rtps/messages/CDRMessage.hpp
+++ b/src/cpp/rtps/messages/CDRMessage.hpp
@@ -22,14 +22,14 @@
 
 #include <fastcdr/cdr/fixed_size_string.hpp>
 
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/common/Property.h>
-#include <fastdds/rtps/common/BinaryProperty.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/common/FragmentNumber.h>
-#include <fastdds/rtps/common/SampleIdentity.h>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/common/Property.hpp>
+#include <fastdds/rtps/common/BinaryProperty.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/common/FragmentNumber.hpp>
+#include <fastdds/rtps/common/SampleIdentity.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
 
 #include <rtps/security/common/ParticipantGenericMessage.h>
 
diff --git a/src/cpp/rtps/messages/MessageReceiver.cpp b/src/cpp/rtps/messages/MessageReceiver.cpp
index c751472b67f..9ac7af0e1e5 100644
--- a/src/cpp/rtps/messages/MessageReceiver.cpp
+++ b/src/cpp/rtps/messages/MessageReceiver.cpp
@@ -22,12 +22,12 @@
 #include <thread>
 
 #include <fastdds/rtps/common/EntityId_t.hpp>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <rtps/messages/MessageReceiver.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
diff --git a/src/cpp/rtps/messages/MessageReceiver.h b/src/cpp/rtps/messages/MessageReceiver.h
index 7c7ac1ec300..6fb44eefeba 100644
--- a/src/cpp/rtps/messages/MessageReceiver.h
+++ b/src/cpp/rtps/messages/MessageReceiver.h
@@ -16,19 +16,19 @@
  * @file MessageReceiver.h
  */
 
-#ifndef _FASTDDS_RTPS_MESSAGERECEIVER_H_
-#define _FASTDDS_RTPS_MESSAGERECEIVER_H_
+#ifndef FASTDDS_RTPS_MESSAGES__MESSAGERECEIVER_H
+#define FASTDDS_RTPS_MESSAGES__MESSAGERECEIVER_H
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <functional>
 #include <unordered_map>
 
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/common/MatchingInfo.h>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/common/MatchingInfo.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 
 #include <utils/shared_mutex.hpp>
@@ -301,9 +301,9 @@ class MessageReceiver
 
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_MESSAGERECEIVER_H_ */
+#endif // FASTDDS_RTPS_MESSAGES__MESSAGERECEIVER_H
diff --git a/src/cpp/rtps/messages/RTPSGapBuilder.hpp b/src/cpp/rtps/messages/RTPSGapBuilder.hpp
index 441c978a194..08bbfbdc22a 100644
--- a/src/cpp/rtps/messages/RTPSGapBuilder.hpp
+++ b/src/cpp/rtps/messages/RTPSGapBuilder.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef RTPSGAPBUILDER_HPP
-#define RTPSGAPBUILDER_HPP
+#ifndef FASTDDS_RTPS_MESSAGES__RTPSGAPBUILDER_HPP
+#define FASTDDS_RTPS_MESSAGES__RTPSGAPBUILDER_HPP
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include "RTPSMessageGroup.hpp"
@@ -99,9 +99,9 @@ class RTPSGapBuilder
     GUID_t reader_guid_;                      ///< Specific destination reader guid.
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* RTPSGAPBUILDER_HPP */
+#endif // FASTDDS_RTPS_MESSAGES__RTPSGAPBUILDER_HPP
diff --git a/src/cpp/rtps/messages/RTPSMessageCreator.hpp b/src/cpp/rtps/messages/RTPSMessageCreator.hpp
index 53ffbfe0a40..90f90c27abc 100644
--- a/src/cpp/rtps/messages/RTPSMessageCreator.hpp
+++ b/src/cpp/rtps/messages/RTPSMessageCreator.hpp
@@ -19,10 +19,10 @@
 #define _FASTDDS_RTPS_CDRMESSAGECREATOR_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/common/FragmentNumber.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/common/FragmentNumber.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #include <fastdds/rtps/transport/NetworkBuffer.hpp>
 
diff --git a/src/cpp/rtps/messages/RTPSMessageGroup.cpp b/src/cpp/rtps/messages/RTPSMessageGroup.cpp
index 1880aaeedcf..348a4844e9c 100644
--- a/src/cpp/rtps/messages/RTPSMessageGroup.cpp
+++ b/src/cpp/rtps/messages/RTPSMessageGroup.cpp
@@ -23,8 +23,8 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <rtps/messages/RTPSMessageCreator.hpp>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <rtps/messages/RTPSGapBuilder.hpp>
 #include <rtps/messages/RTPSMessageGroup_t.hpp>
diff --git a/src/cpp/rtps/messages/RTPSMessageGroup.hpp b/src/cpp/rtps/messages/RTPSMessageGroup.hpp
index 71a23f184db..62f40abbdd4 100644
--- a/src/cpp/rtps/messages/RTPSMessageGroup.hpp
+++ b/src/cpp/rtps/messages/RTPSMessageGroup.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_RTPSMESSAGEGROUP_H_
-#define _FASTDDS_RTPS_RTPSMESSAGEGROUP_H_
+#ifndef FASTDDS_RTPS_MESSAGES__RTPSMESSAGEGROUP_H
+#define FASTDDS_RTPS_MESSAGES__RTPSMESSAGEGROUP_H
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <vector>
@@ -27,7 +27,7 @@
 #include <memory>
 #include <list>
 
-#include <fastdds/rtps/common/FragmentNumber.h>
+#include <fastdds/rtps/common/FragmentNumber.hpp>
 #include <fastdds/rtps/messages/RTPSMessageSenderInterface.hpp>
 #include <fastdds/rtps/transport/NetworkBuffer.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
@@ -373,9 +373,9 @@ class RTPSMessageGroup
     const octet padding_[3] = {0, 0, 0};
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_RTPSMESSAGEGROUP_H_ */
+#endif // FASTDDS_RTPS_MESSAGES__RTPSMESSAGEGROUP_H
diff --git a/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp b/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp
index 5895ab57c8b..bee5c115952 100644
--- a/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp
+++ b/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp
@@ -21,7 +21,7 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/common/CDRMessage_t.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
 #include <rtps/messages/CDRMessage.hpp>
 #include <rtps/messages/RTPSMessageCreator.hpp>
 #include <fastdds/rtps/transport/NetworkBuffer.hpp>
diff --git a/src/cpp/rtps/network/NetworkFactory.cpp b/src/cpp/rtps/network/NetworkFactory.cpp
index 0ae1fdc03f5..fe1c9ce0674 100644
--- a/src/cpp/rtps/network/NetworkFactory.cpp
+++ b/src/cpp/rtps/network/NetworkFactory.cpp
@@ -17,12 +17,12 @@
 #include <limits>
 #include <utility>
 
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/transport/TransportDescriptorInterface.h>
-#include <fastdds/utils/IPFinder.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/transport/TransportDescriptorInterface.hpp>
+#include <fastdds/utils/IPFinder.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <rtps/transport/TCPTransportInterface.h>
 
diff --git a/src/cpp/rtps/network/NetworkFactory.h b/src/cpp/rtps/network/NetworkFactory.h
index 1ab878ff970..7288a8ef90e 100644
--- a/src/cpp/rtps/network/NetworkFactory.h
+++ b/src/cpp/rtps/network/NetworkFactory.h
@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _RTPS_NETWORK_NETWORKFACTORY_H_
-#define _RTPS_NETWORK_NETWORKFACTORY_H_
+#ifndef FASTDDS_RTPS_NETWORK__NETWORKFACTORY_H
+#define FASTDDS_RTPS_NETWORK__NETWORKFACTORY_H
 
 #include <vector>
 #include <memory>
 
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/LocatorSelector.hpp>
-#include <fastdds/rtps/transport/SenderResource.h>
-#include <fastdds/rtps/transport/TransportInterface.h>
+#include <fastdds/rtps/transport/SenderResource.hpp>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
 
 #include <rtps/messages/MessageReceiver.h>
 #include <rtps/network/ReceiverResource.h>
@@ -350,4 +350,4 @@ class NetworkFactory
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _RTPS_NETWORK_NETWORKFACTORY_H_ */
+#endif // FASTDDS_RTPS_NETWORK__NETWORKFACTORY_H
diff --git a/src/cpp/rtps/network/ReceiverResource.h b/src/cpp/rtps/network/ReceiverResource.h
index 7471bad7391..8b3ad95bf87 100644
--- a/src/cpp/rtps/network/ReceiverResource.h
+++ b/src/cpp/rtps/network/ReceiverResource.h
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _RTPS_NETWORK_RECEIVERRESOURCE_H_
-#define _RTPS_NETWORK_RECEIVERRESOURCE_H_
+#ifndef FASTDDS_RTPS_NETWORK__RECEIVERRESOURCE_H
+#define FASTDDS_RTPS_NETWORK__RECEIVERRESOURCE_H
 
 #include <condition_variable>
 #include <functional>
 #include <memory>
 #include <vector>
 
-#include <fastdds/rtps/transport/TransportInterface.h>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
 
 #include <rtps/messages/MessageReceiver.h>
 
@@ -124,4 +124,4 @@ class ReceiverResource : public fastdds::rtps::TransportReceiverInterface
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _RTPS_NETWORK_RECEIVERRESOURCE_H_ */
+#endif // FASTDDS_RTPS_NETWORK__RECEIVERRESOURCE_H
diff --git a/src/cpp/rtps/network/utils/external_locators.cpp b/src/cpp/rtps/network/utils/external_locators.cpp
index 52d9dc40e13..5266cf0e812 100644
--- a/src/cpp/rtps/network/utils/external_locators.cpp
+++ b/src/cpp/rtps/network/utils/external_locators.cpp
@@ -23,12 +23,12 @@
 
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 #include <fastdds/rtps/common/LocatorWithMask.hpp>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 #include <utils/SystemInfo.hpp>
 
 #include <rtps/network/utils/external_locators.hpp>
diff --git a/src/cpp/rtps/network/utils/external_locators.hpp b/src/cpp/rtps/network/utils/external_locators.hpp
index e56b1a38c43..7dd622bff9f 100644
--- a/src/cpp/rtps/network/utils/external_locators.hpp
+++ b/src/cpp/rtps/network/utils/external_locators.hpp
@@ -16,13 +16,13 @@
  * @file external_locators.hpp
  */
 
-#ifndef _RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP_
-#define _RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP_
+#ifndef FASTDDS_RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP
+#define FASTDDS_RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP
 
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 
@@ -123,4 +123,4 @@ void filter_remote_locators(
 } // namespace fastdds
 } // namespace eprosima
 
-#endif  // _RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP_
+#endif  // FASTDDS_RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP
diff --git a/src/cpp/rtps/network/utils/netmask_filter.hpp b/src/cpp/rtps/network/utils/netmask_filter.hpp
index c8624df9abf..f299c7753b8 100644
--- a/src/cpp/rtps/network/utils/netmask_filter.hpp
+++ b/src/cpp/rtps/network/utils/netmask_filter.hpp
@@ -24,7 +24,7 @@
 
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
-#include <fastdds/rtps/transport/TransportInterface.h>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/participant/RTPSParticipant.cpp b/src/cpp/rtps/participant/RTPSParticipant.cpp
index 71fda7a3537..a2a1265b7a9 100644
--- a/src/cpp/rtps/participant/RTPSParticipant.cpp
+++ b/src/cpp/rtps/participant/RTPSParticipant.cpp
@@ -17,8 +17,8 @@
  *
  */
 
-#include <fastdds/rtps/Endpoint.h>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
+#include <fastdds/rtps/Endpoint.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
index d2f5f62e2b4..3f4716b0838 100644
--- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
+++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -29,19 +29,19 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/LibrarySettings.hpp>
 #include <fastdds/rtps/attributes/BuiltinTransports.hpp>
-#include <fastdds/rtps/attributes/ServerAttributes.h>
+#include <fastdds/rtps/attributes/ServerAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/common/EntityId_t.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/utils/IPFinder.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/utils/IPFinder.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/discovery/endpoint/EDP.h>
diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.h b/src/cpp/rtps/participant/RTPSParticipantImpl.h
index f82757c7a33..a547da45750 100644
--- a/src/cpp/rtps/participant/RTPSParticipantImpl.h
+++ b/src/cpp/rtps/participant/RTPSParticipantImpl.h
@@ -16,8 +16,8 @@
  * @file RTPSParticipantImpl.h
  */
 
-#ifndef _RTPS_PARTICIPANT_RTPSPARTICIPANTIMPL_H_
-#define _RTPS_PARTICIPANT_RTPSPARTICIPANTIMPL_H_
+#ifndef FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANTIMPL_H
+#define FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANTIMPL_H
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <atomic>
@@ -37,15 +37,15 @@
 #include <unistd.h>
 #endif // if defined(_WIN32)
 
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/history/IChangePool.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
-#include <fastdds/rtps/transport/SenderResource.h>
+#include <fastdds/rtps/history/IChangePool.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
+#include <fastdds/rtps/transport/SenderResource.hpp>
 
 #include "../flowcontrol/FlowControllerFactory.hpp"
 #include <rtps/messages/MessageReceiver.h>
@@ -62,7 +62,7 @@
 #include <utils/Semaphore.hpp>
 
 #if HAVE_SECURITY
-#include <fastdds/rtps/Endpoint.h>
+#include <fastdds/rtps/Endpoint.hpp>
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
 #include <rtps/security/SecurityManager.h>
 #include <rtps/security/SecurityPluginFactory.h>
@@ -1317,4 +1317,4 @@ class RTPSParticipantImpl
 } /* namespace rtps */
 } /* namespace eprosima */
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif //_RTPS_PARTICIPANT_RTPSPARTICIPANTIMPL_H_
+#endif //FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANTIMPL_H
diff --git a/src/cpp/rtps/persistence/PersistenceFactory.cpp b/src/cpp/rtps/persistence/PersistenceFactory.cpp
index a1b8d3ee3c6..8fb07f648b4 100644
--- a/src/cpp/rtps/persistence/PersistenceFactory.cpp
+++ b/src/cpp/rtps/persistence/PersistenceFactory.cpp
@@ -23,8 +23,8 @@
 #include <rtps/persistence/SQLite3PersistenceService.h>
 #endif // if HAVE_SQLITE3
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/persistence/PersistenceService.h b/src/cpp/rtps/persistence/PersistenceService.h
index 3d05aa0fe2c..dddca8a2a97 100644
--- a/src/cpp/rtps/persistence/PersistenceService.h
+++ b/src/cpp/rtps/persistence/PersistenceService.h
@@ -19,11 +19,11 @@
 #ifndef PERSISTENCESERVICE_H_
 #define PERSISTENCESERVICE_H_
 
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/history/IChangePool.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/history/IChangePool.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 
 #include <foonathan/memory/container.hpp>
 #include <foonathan/memory/memory_pool.hpp>
diff --git a/src/cpp/rtps/persistence/SQLite3PersistenceService.cpp b/src/cpp/rtps/persistence/SQLite3PersistenceService.cpp
index e6f273d6d9d..1e4e1009581 100644
--- a/src/cpp/rtps/persistence/SQLite3PersistenceService.cpp
+++ b/src/cpp/rtps/persistence/SQLite3PersistenceService.cpp
@@ -20,7 +20,7 @@
 #include <rtps/persistence/SQLite3PersistenceService.h>
 #include <rtps/persistence/SQLite3PersistenceServiceStatements.h>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <rtps/persistence/sqlite3.h>
 
diff --git a/src/cpp/rtps/reader/BaseReader.cpp b/src/cpp/rtps/reader/BaseReader.cpp
index 4feaee1bbe7..05578e04113 100644
--- a/src/cpp/rtps/reader/BaseReader.cpp
+++ b/src/cpp/rtps/reader/BaseReader.cpp
@@ -23,17 +23,17 @@
 #include <mutex>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/Endpoint.h>
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/Endpoint.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/rtps/common/EntityId_t.hpp>
-#include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <rtps/DataSharing/DataSharingListener.hpp>
 #include <rtps/DataSharing/DataSharingNotification.hpp>
diff --git a/src/cpp/rtps/reader/BaseReader.hpp b/src/cpp/rtps/reader/BaseReader.hpp
index 7003e6eb33e..a542b421059 100644
--- a/src/cpp/rtps/reader/BaseReader.hpp
+++ b/src/cpp/rtps/reader/BaseReader.hpp
@@ -16,27 +16,27 @@
  * @file BaseReader.hpp
  */
 
-#ifndef RTPS_READER__BASEREADER_HPP
-#define RTPS_READER__BASEREADER_HPP
+#ifndef FASTDDS_RTPS_READER__BASEREADER_HPP
+#define FASTDDS_RTPS_READER__BASEREADER_HPP
 
 #include <cstdint>
 #include <memory>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/core/status/LivelinessChangedStatus.hpp>
-#include <fastdds/rtps/Endpoint.h>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
+#include <fastdds/rtps/Endpoint.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
 #include <fastdds/rtps/common/EntityId_t.hpp>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastdds/rtps/history/History.h>
-#include <fastdds/rtps/history/IChangePool.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
+#include <fastdds/rtps/history/History.hpp>
+#include <fastdds/rtps/history/IChangePool.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 #include <fastdds/statistics/IListeners.hpp>
 #include <fastdds/statistics/rtps/StatisticsCommon.hpp>
 #include <fastdds/utils/TimedConditionVariable.hpp>
@@ -465,4 +465,4 @@ class BaseReader
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif /* RTPS_READER__BASEREADER_HPP */
+#endif // FASTDDS_RTPS_READER__BASEREADER_HPP
diff --git a/src/cpp/rtps/reader/RTPSReader.cpp b/src/cpp/rtps/reader/RTPSReader.cpp
index e96d4e1244e..251ac675905 100644
--- a/src/cpp/rtps/reader/RTPSReader.cpp
+++ b/src/cpp/rtps/reader/RTPSReader.cpp
@@ -16,12 +16,12 @@
  * RTPSReader.cpp
  *
  */
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
-#include <fastdds/rtps/Endpoint.h>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
+#include <fastdds/rtps/Endpoint.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
 
 #include <rtps/participant/RTPSParticipantImpl.h>
 
diff --git a/src/cpp/rtps/reader/ReaderHistoryState.hpp b/src/cpp/rtps/reader/ReaderHistoryState.hpp
index 88ccf420305..3be3dbac92b 100644
--- a/src/cpp/rtps/reader/ReaderHistoryState.hpp
+++ b/src/cpp/rtps/reader/ReaderHistoryState.hpp
@@ -19,8 +19,8 @@
 #ifndef FASTDDS_RTPS_READER_READERHISTORYSTATE_HPP_
 #define FASTDDS_RTPS_READER_READERHISTORYSTATE_HPP_
 
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
 
 #include <foonathan/memory/container.hpp>
 #include <foonathan/memory/memory_pool.hpp>
diff --git a/src/cpp/rtps/reader/StatefulPersistentReader.cpp b/src/cpp/rtps/reader/StatefulPersistentReader.cpp
index 16172e064fd..aba8d887f8b 100644
--- a/src/cpp/rtps/reader/StatefulPersistentReader.cpp
+++ b/src/cpp/rtps/reader/StatefulPersistentReader.cpp
@@ -19,7 +19,7 @@
 
 #include <rtps/reader/StatefulPersistentReader.hpp>
 
-#include <fastdds/rtps/history/ReaderHistory.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
 
 #include <rtps/persistence/PersistenceService.h>
 #include <rtps/reader/ReaderHistoryState.hpp>
diff --git a/src/cpp/rtps/reader/StatefulReader.cpp b/src/cpp/rtps/reader/StatefulReader.cpp
index 7556f06475c..b39f5b45f0e 100644
--- a/src/cpp/rtps/reader/StatefulReader.cpp
+++ b/src/cpp/rtps/reader/StatefulReader.cpp
@@ -25,8 +25,8 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/reader/ReaderListener.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
 
 #include "reader_utils.hpp"
 #include "rtps/RTPSDomainImpl.hpp"
diff --git a/src/cpp/rtps/reader/StatefulReader.hpp b/src/cpp/rtps/reader/StatefulReader.hpp
index de2b73a0f11..1e106663373 100644
--- a/src/cpp/rtps/reader/StatefulReader.hpp
+++ b/src/cpp/rtps/reader/StatefulReader.hpp
@@ -16,17 +16,17 @@
  * @file StatefulReader.hpp
  */
 
-#ifndef RTPS_READER__STATEFULREADER_HPP
-#define RTPS_READER__STATEFULREADER_HPP
+#ifndef FASTDDS_RTPS_READER__STATEFULREADER_HPP
+#define FASTDDS_RTPS_READER__STATEFULREADER_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <mutex>
 #include <vector>
 
-#include <fastdds/rtps/common/CDRMessage_t.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 #include <rtps/reader/BaseReader.hpp>
@@ -368,10 +368,10 @@ class StatefulReader : public fastdds::rtps::BaseReader
     bool is_alive_;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // RTPS_READER__STATEFULREADER_HPP
+#endif // FASTDDS_RTPS_READER__STATEFULREADER_HPP
diff --git a/src/cpp/rtps/reader/StatelessPersistentReader.cpp b/src/cpp/rtps/reader/StatelessPersistentReader.cpp
index afd126eb815..085179efdd8 100644
--- a/src/cpp/rtps/reader/StatelessPersistentReader.cpp
+++ b/src/cpp/rtps/reader/StatelessPersistentReader.cpp
@@ -19,7 +19,7 @@
 
 #include <rtps/reader/StatelessPersistentReader.hpp>
 
-#include <fastdds/rtps/history/ReaderHistory.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
 
 #include <rtps/persistence/PersistenceService.h>
 #include <rtps/reader/ReaderHistoryState.hpp>
diff --git a/src/cpp/rtps/reader/StatelessReader.cpp b/src/cpp/rtps/reader/StatelessReader.cpp
index 86c07c2ff65..c11f09a3c59 100644
--- a/src/cpp/rtps/reader/StatelessReader.cpp
+++ b/src/cpp/rtps/reader/StatelessReader.cpp
@@ -22,10 +22,10 @@
 #include <thread>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/reader/ReaderListener.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
 
 #include "reader_utils.hpp"
 #include "rtps/RTPSDomainImpl.hpp"
diff --git a/src/cpp/rtps/reader/StatelessReader.hpp b/src/cpp/rtps/reader/StatelessReader.hpp
index 07d857b8f01..ae87b8c9826 100644
--- a/src/cpp/rtps/reader/StatelessReader.hpp
+++ b/src/cpp/rtps/reader/StatelessReader.hpp
@@ -17,8 +17,8 @@
  */
 
 
-#ifndef RTPS_READER__STATELESSREADER_HPP
-#define RTPS_READER__STATELESSREADER_HPP
+#ifndef FASTDDS_RTPS_READER__STATELESSREADER_HPP
+#define FASTDDS_RTPS_READER__STATELESSREADER_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -26,7 +26,7 @@
 #include <mutex>
 
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 #include <rtps/reader/BaseReader.hpp>
@@ -270,10 +270,10 @@ class StatelessReader : public fastdds::rtps::BaseReader
     ResourceLimitedVector<RemoteWriterInfo_t> matched_writers_;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif /* RTPS_READER__STATELESSREADER_HPP */
+#endif // FASTDDS_RTPS_READER__STATELESSREADER_HPP
diff --git a/src/cpp/rtps/reader/WriterProxy.cpp b/src/cpp/rtps/reader/WriterProxy.cpp
index e705ee791af..610356e5e1f 100644
--- a/src/cpp/rtps/reader/WriterProxy.cpp
+++ b/src/cpp/rtps/reader/WriterProxy.cpp
@@ -20,8 +20,8 @@
 #include <rtps/reader/WriterProxy.h>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include "rtps/RTPSDomainImpl.hpp"
 #include "utils/collections/node_size_helpers.hpp"
diff --git a/src/cpp/rtps/reader/WriterProxy.h b/src/cpp/rtps/reader/WriterProxy.h
index 3e00ea5a6aa..fcf0f9ec486 100644
--- a/src/cpp/rtps/reader/WriterProxy.h
+++ b/src/cpp/rtps/reader/WriterProxy.h
@@ -20,14 +20,14 @@
 #define FASTDDS_RTPS_READER_WRITERPROXY_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
 #include <fastdds/rtps/messages/RTPSMessageSenderInterface.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 
 #include <foonathan/memory/container.hpp>
diff --git a/src/cpp/rtps/reader/reader_utils.hpp b/src/cpp/rtps/reader/reader_utils.hpp
index 5df85633a88..1e21419c89e 100644
--- a/src/cpp/rtps/reader/reader_utils.hpp
+++ b/src/cpp/rtps/reader/reader_utils.hpp
@@ -19,8 +19,8 @@
 #ifndef _FASTDDS_RTPS_READER_READERUTILS_H_
 #define _FASTDDS_RTPS_READER_READERUTILS_H_
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
 #include <fastdds/rtps/common/ChangeKind_t.hpp>
 
diff --git a/src/cpp/rtps/resources/ResourceEvent.h b/src/cpp/rtps/resources/ResourceEvent.h
index 735e3725d19..2939961942a 100644
--- a/src/cpp/rtps/resources/ResourceEvent.h
+++ b/src/cpp/rtps/resources/ResourceEvent.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_RESOURCES_RESOURCEEVENT_H_
-#define _FASTDDS_RTPS_RESOURCES_RESOURCEEVENT_H_
+#ifndef FASTDDS_RTPS_RESOURCES__RESOURCEEVENT_H
+#define FASTDDS_RTPS_RESOURCES__RESOURCEEVENT_H
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -181,4 +181,4 @@ class ResourceEvent
 
 #endif //DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif //_FASTDDS_RTPS_RESOURCES_RESOURCEEVENT_H_
+#endif //FASTDDS_RTPS_RESOURCES__RESOURCEEVENT_H
diff --git a/src/cpp/rtps/resources/TimedEvent.h b/src/cpp/rtps/resources/TimedEvent.h
index 54951fb8ce0..67ec3152a90 100644
--- a/src/cpp/rtps/resources/TimedEvent.h
+++ b/src/cpp/rtps/resources/TimedEvent.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_RESOURCES_TIMEDEVENT_H_
-#define _FASTDDS_RTPS_RESOURCES_TIMEDEVENT_H_
+#ifndef FASTDDS_RTPS_RESOURCES__TIMEDEVENT_H
+#define FASTDDS_RTPS_RESOURCES__TIMEDEVENT_H
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -26,7 +26,7 @@
 #include <cstdint>
 #include <functional>
 
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -183,4 +183,4 @@ class TimedEvent
 
 #endif //DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif //_FASTDDS_RTPS_RESOURCES_TIMEDEVENT_H_
+#endif //FASTDDS_RTPS_RESOURCES__TIMEDEVENT_H
diff --git a/src/cpp/rtps/resources/TimedEventImpl.h b/src/cpp/rtps/resources/TimedEventImpl.h
index 2185731a885..a01bfcdab98 100644
--- a/src/cpp/rtps/resources/TimedEventImpl.h
+++ b/src/cpp/rtps/resources/TimedEventImpl.h
@@ -22,7 +22,7 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 #include <rtps/resources/TimedEvent.h>
 
 #include <atomic>
diff --git a/src/cpp/rtps/security/ISecurityPluginFactory.h b/src/cpp/rtps/security/ISecurityPluginFactory.h
index f5edda15400..36e3d656eae 100644
--- a/src/cpp/rtps/security/ISecurityPluginFactory.h
+++ b/src/cpp/rtps/security/ISecurityPluginFactory.h
@@ -18,7 +18,7 @@
 #ifndef _RTPS_SECURITY_ISECURITYPLUGINFACTORY_H_
 #define _RTPS_SECURITY_ISECURITYPLUGINFACTORY_H_
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 #include <rtps/security/accesscontrol/AccessControl.h>
 #include <rtps/security/authentication/Authentication.h>
 #include <rtps/security/cryptography/Cryptography.h>
diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp
index f1198114746..757fbecf1bb 100644
--- a/src/cpp/rtps/security/SecurityManager.cpp
+++ b/src/cpp/rtps/security/SecurityManager.cpp
@@ -24,14 +24,14 @@
 #include <thread>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.hpp>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/participant/RTPSParticipantListener.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
 
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
diff --git a/src/cpp/rtps/security/SecurityManager.h b/src/cpp/rtps/security/SecurityManager.h
index eb5b82cac07..7456ef7f57c 100644
--- a/src/cpp/rtps/security/SecurityManager.h
+++ b/src/cpp/rtps/security/SecurityManager.h
@@ -15,8 +15,8 @@
 /*!
  * @file SecurityManager.h
  */
-#ifndef _RTPS_SECURITY_SECURITYMANAGER_H_
-#define _RTPS_SECURITY_SECURITYMANAGER_H_
+#ifndef FASTDDS_RTPS_SECURITY__SECURITYMANAGER_H
+#define FASTDDS_RTPS_SECURITY__SECURITYMANAGER_H
 
 #include <atomic>
 #include <list>
@@ -25,14 +25,14 @@
 #include <mutex>
 #include <thread>
 
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 
 #include <rtps/resources/TimedEvent.h>
 #include <rtps/security/authentication/Handshake.h>
@@ -949,4 +949,4 @@ class SecurityManager : private WriterListener
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _RTPS_SECURITY_SECURITYMANAGER_H_
+#endif // FASTDDS_RTPS_SECURITY__SECURITYMANAGER_H
diff --git a/src/cpp/rtps/security/SecurityPluginFactory.h b/src/cpp/rtps/security/SecurityPluginFactory.h
index 7107d32dbe4..a8e9bb50cf1 100644
--- a/src/cpp/rtps/security/SecurityPluginFactory.h
+++ b/src/cpp/rtps/security/SecurityPluginFactory.h
@@ -18,7 +18,7 @@
 #ifndef _RTPS_SECURITY_SECURITYPLUGINFACTORY_H_
 #define _RTPS_SECURITY_SECURITYPLUGINFACTORY_H_
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 #include <rtps/security/accesscontrol/AccessControl.h>
 #include <rtps/security/authentication/Authentication.h>
 #include <rtps/security/cryptography/Cryptography.h>
diff --git a/src/cpp/rtps/security/accesscontrol/AccessControl.h b/src/cpp/rtps/security/accesscontrol/AccessControl.h
index 9df6715f458..7b6a83def4c 100644
--- a/src/cpp/rtps/security/accesscontrol/AccessControl.h
+++ b/src/cpp/rtps/security/accesscontrol/AccessControl.h
@@ -18,7 +18,7 @@
 #ifndef _FASTDDS_RTPS_SECURITY_ACCESSCONTROL_ACCESSCONTROL_H_
 #define _FASTDDS_RTPS_SECURITY_ACCESSCONTROL_ACCESSCONTROL_H_
 
-#include <fastdds/rtps/common/Token.h>
+#include <fastdds/rtps/common/Token.hpp>
 #include <rtps/security/common/Handle.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/security/authentication/Authentication.h b/src/cpp/rtps/security/authentication/Authentication.h
index 5efa5034dfd..6787e572e7a 100644
--- a/src/cpp/rtps/security/authentication/Authentication.h
+++ b/src/cpp/rtps/security/authentication/Authentication.h
@@ -18,10 +18,10 @@
 #ifndef _FASTDDS_RTPS_SECURITY_AUTHENTICATION_AUTHENTICATION_H_
 #define _FASTDDS_RTPS_SECURITY_AUTHENTICATION_AUTHENTICATION_H_
 
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Token.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Token.hpp>
 #include <rtps/security/authentication/Handshake.h>
 #include <rtps/security/common/Handle.h>
 #include <rtps/security/common/SharedSecretHandle.h>
diff --git a/src/cpp/rtps/security/authentication/Handshake.h b/src/cpp/rtps/security/authentication/Handshake.h
index 7b000e899ee..240da3a27b2 100644
--- a/src/cpp/rtps/security/authentication/Handshake.h
+++ b/src/cpp/rtps/security/authentication/Handshake.h
@@ -18,7 +18,7 @@
 #ifndef _FASTDDS_RTPS_SECURITY_AUTHENTICATION_HANDSHAKE_H_
 #define _FASTDDS_RTPS_SECURITY_AUTHENTICATION_HANDSHAKE_H_
 
-#include <fastdds/rtps/common/Token.h>
+#include <fastdds/rtps/common/Token.hpp>
 #include <rtps/security/common/Handle.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/security/common/ParticipantGenericMessage.h b/src/cpp/rtps/security/common/ParticipantGenericMessage.h
index 2effdaa0a7f..5747fb2068c 100644
--- a/src/cpp/rtps/security/common/ParticipantGenericMessage.h
+++ b/src/cpp/rtps/security/common/ParticipantGenericMessage.h
@@ -18,8 +18,8 @@
 #ifndef _FASTDDS_RTPS_SECURITY_COMMON_PARTICIPANTGENERICMESSAGE_H_
 #define _FASTDDS_RTPS_SECURITY_COMMON_PARTICIPANTGENERICMESSAGE_H_
 
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Token.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Token.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/security/cryptography/CryptoKeyFactory.h b/src/cpp/rtps/security/cryptography/CryptoKeyFactory.h
index 72e60f831ce..34371eeb03a 100644
--- a/src/cpp/rtps/security/cryptography/CryptoKeyFactory.h
+++ b/src/cpp/rtps/security/cryptography/CryptoKeyFactory.h
@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.hpp>
 
 #include <rtps/security/cryptography/CryptoTypes.h>
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
diff --git a/src/cpp/rtps/security/cryptography/CryptoTransform.h b/src/cpp/rtps/security/cryptography/CryptoTransform.h
index 0ca561a491a..1d193ad8c0f 100644
--- a/src/cpp/rtps/security/cryptography/CryptoTransform.h
+++ b/src/cpp/rtps/security/cryptography/CryptoTransform.h
@@ -21,8 +21,8 @@
 #include <memory>
 
 #include <rtps/security/cryptography/CryptoTypes.h>
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/security/cryptography/CryptoTypes.h b/src/cpp/rtps/security/cryptography/CryptoTypes.h
index 4e8056dd177..1df3079d1ca 100644
--- a/src/cpp/rtps/security/cryptography/CryptoTypes.h
+++ b/src/cpp/rtps/security/cryptography/CryptoTypes.h
@@ -18,7 +18,7 @@
 #ifndef _FASTDDS_RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOTYPES_H_
 #define _FASTDDS_RTPS_SECURITY_CRYPTOGRAPHY_CRYPTOTYPES_H_
 
-#include <fastdds/rtps/common/Token.h>
+#include <fastdds/rtps/common/Token.hpp>
 #include <rtps/security/common/Handle.h>
 #include <rtps/security/common/SharedSecretHandle.h>
 #include <rtps/security/exceptions/SecurityException.h>
diff --git a/src/cpp/rtps/security/logging/BuiltinLoggingType.h b/src/cpp/rtps/security/logging/BuiltinLoggingType.h
index c4d30b0a54e..6cdddbb812c 100644
--- a/src/cpp/rtps/security/logging/BuiltinLoggingType.h
+++ b/src/cpp/rtps/security/logging/BuiltinLoggingType.h
@@ -18,8 +18,8 @@
 #ifndef _FASTDDS_RTPS_SECURITY_LOGGING_BUILTINLOGGINGTYPE_H_
 #define _FASTDDS_RTPS_SECURITY_LOGGING_BUILTINLOGGINGTYPE_H_
 
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
 #include <rtps/security/logging/LoggingLevel.h>
 #include <rtps/security/logging/NameValuePair.h>
 
diff --git a/src/cpp/rtps/security/logging/Logging.h b/src/cpp/rtps/security/logging/Logging.h
index 77f63983aea..ff6ebb0758a 100644
--- a/src/cpp/rtps/security/logging/Logging.h
+++ b/src/cpp/rtps/security/logging/Logging.h
@@ -22,7 +22,7 @@
 #include <iomanip>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <rtps/security/logging/BuiltinLoggingType.h>
 #include <rtps/security/logging/LogOptions.h>
 #include <rtps/security/exceptions/SecurityException.h>
diff --git a/src/cpp/rtps/transport/ChainingReceiverResource.hpp b/src/cpp/rtps/transport/ChainingReceiverResource.hpp
index 1a60db12b30..f2cbd8bf25e 100644
--- a/src/cpp/rtps/transport/ChainingReceiverResource.hpp
+++ b/src/cpp/rtps/transport/ChainingReceiverResource.hpp
@@ -15,7 +15,7 @@
 #ifndef _RTPS_TRANSPORT_CHAININGRECEIVERRESOURCE_HPP_
 #define _RTPS_TRANSPORT_CHAININGRECEIVERRESOURCE_HPP_
 
-#include <fastdds/rtps/transport/TransportReceiverInterface.h>
+#include <fastdds/rtps/transport/TransportReceiverInterface.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/transport/ChainingSenderResource.hpp b/src/cpp/rtps/transport/ChainingSenderResource.hpp
index 6754ced617a..a54a4905e30 100644
--- a/src/cpp/rtps/transport/ChainingSenderResource.hpp
+++ b/src/cpp/rtps/transport/ChainingSenderResource.hpp
@@ -15,8 +15,8 @@
 #ifndef _RTPS_TRANSPORT_CHAININGSENDERRESOURCE_HPP_
 #define _RTPS_TRANSPORT_CHAININGSENDERRESOURCE_HPP_
 
-#include <fastdds/rtps/transport/ChainingTransport.h>
-#include <fastdds/rtps/transport/SenderResource.h>
+#include <fastdds/rtps/transport/ChainingTransport.hpp>
+#include <fastdds/rtps/transport/SenderResource.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/transport/ChainingTransport.cpp b/src/cpp/rtps/transport/ChainingTransport.cpp
index 3b7e7625b39..20eaf76583e 100644
--- a/src/cpp/rtps/transport/ChainingTransport.cpp
+++ b/src/cpp/rtps/transport/ChainingTransport.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <fastdds/rtps/transport/ChainingTransport.h>
+#include <fastdds/rtps/transport/ChainingTransport.hpp>
 #include "ChainingSenderResource.hpp"
 #include "ChainingReceiverResource.hpp"
 
diff --git a/src/cpp/rtps/transport/ChannelResource.h b/src/cpp/rtps/transport/ChannelResource.h
index cad309b1b58..ec0a657e22e 100644
--- a/src/cpp/rtps/transport/ChannelResource.h
+++ b/src/cpp/rtps/transport/ChannelResource.h
@@ -18,7 +18,7 @@
 #include <atomic>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/common/CDRMessage_t.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
 
 #include <utils/thread.hpp>
 
diff --git a/src/cpp/rtps/transport/PortBasedTransportDescriptor.cpp b/src/cpp/rtps/transport/PortBasedTransportDescriptor.cpp
index fa51945c801..d5c34996a74 100644
--- a/src/cpp/rtps/transport/PortBasedTransportDescriptor.cpp
+++ b/src/cpp/rtps/transport/PortBasedTransportDescriptor.cpp
@@ -14,7 +14,7 @@
 
 #include <fastdds/rtps/transport/PortBasedTransportDescriptor.hpp>
 
-#include <fastdds/rtps/transport/TransportDescriptorInterface.h>
+#include <fastdds/rtps/transport/TransportDescriptorInterface.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/transport/TCPAcceptor.cpp b/src/cpp/rtps/transport/TCPAcceptor.cpp
index d20146b2b73..69560443a0c 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 <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 #include <rtps/transport/TCPTransportInterface.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/transport/TCPAcceptor.h b/src/cpp/rtps/transport/TCPAcceptor.h
index 9b495df789b..fe0685f3ca7 100644
--- a/src/cpp/rtps/transport/TCPAcceptor.h
+++ b/src/cpp/rtps/transport/TCPAcceptor.h
@@ -16,7 +16,7 @@
 #define _FASTDDS_TCP_ACCEPTOR_BASE_
 
 #include <asio.hpp>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/transport/TCPAcceptorBasic.cpp b/src/cpp/rtps/transport/TCPAcceptorBasic.cpp
index 1a80f1a3936..f9c01a69cfc 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 <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 #include <rtps/transport/TCPTransportInterface.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/transport/TCPAcceptorSecure.cpp b/src/cpp/rtps/transport/TCPAcceptorSecure.cpp
index 58c2c8906d5..dbd84acffce 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 <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 #include <rtps/transport/TCPTransportInterface.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/transport/TCPChannelResource.cpp b/src/cpp/rtps/transport/TCPChannelResource.cpp
index 03598502afa..4354ced63ca 100644
--- a/src/cpp/rtps/transport/TCPChannelResource.cpp
+++ b/src/cpp/rtps/transport/TCPChannelResource.cpp
@@ -17,7 +17,7 @@
 #include <chrono>
 #include <thread>
 
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <rtps/transport/asio_helpers.hpp>
 #include <rtps/transport/TCPTransportInterface.h>
diff --git a/src/cpp/rtps/transport/TCPChannelResource.h b/src/cpp/rtps/transport/TCPChannelResource.h
index d3ac03bce17..c7f06cd9082 100644
--- a/src/cpp/rtps/transport/TCPChannelResource.h
+++ b/src/cpp/rtps/transport/TCPChannelResource.h
@@ -16,9 +16,9 @@
 #define _FASTDDS_TCP_CHANNEL_RESOURCE_BASE_
 
 #include <asio.hpp>
-#include <fastdds/rtps/transport/TCPTransportDescriptor.h>
-#include <fastdds/rtps/transport/TransportReceiverInterface.h>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/transport/TCPTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TransportReceiverInterface.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <rtps/transport/ChannelResource.h>
 #include <rtps/transport/tcp/RTCPMessageManager.h>
 
diff --git a/src/cpp/rtps/transport/TCPChannelResourceBasic.cpp b/src/cpp/rtps/transport/TCPChannelResourceBasic.cpp
index f00e38b698e..56f6eac6d5e 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 <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 #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 9967572724d..23c34fc14b0 100644
--- a/src/cpp/rtps/transport/TCPChannelResourceSecure.cpp
+++ b/src/cpp/rtps/transport/TCPChannelResourceSecure.cpp
@@ -18,7 +18,7 @@
 #include <future>
 #include <thread>
 
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 #include <rtps/transport/TCPTransportInterface.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/transport/TCPSenderResource.hpp b/src/cpp/rtps/transport/TCPSenderResource.hpp
index 7c903a6d153..3c7b943d84f 100644
--- a/src/cpp/rtps/transport/TCPSenderResource.hpp
+++ b/src/cpp/rtps/transport/TCPSenderResource.hpp
@@ -16,7 +16,7 @@
 #define __TRANSPORT_TCPSENDERRESOURCE_HPP__
 
 #include <fastdds/rtps/common/LocatorsIterator.hpp>
-#include <fastdds/rtps/transport/SenderResource.h>
+#include <fastdds/rtps/transport/SenderResource.hpp>
 
 #include <rtps/transport/ChainingSenderResource.hpp>
 #include <rtps/transport/TCPChannelResource.h>
diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp
index 1116ef0f4c4..1500cec0af1 100644
--- a/src/cpp/rtps/transport/TCPTransportInterface.cpp
+++ b/src/cpp/rtps/transport/TCPTransportInterface.cpp
@@ -38,20 +38,20 @@
 #include <asio/ssl/verify_context.hpp>
 #endif // if TLS_FOUND
 
-#include <fastdds/config.h>
+#include <fastdds/config.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/common/CDRMessage_t.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
 #include <fastdds/rtps/common/LocatorSelector.hpp>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
-#include <fastdds/rtps/common/PortParameters.h>
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/transport/SenderResource.h>
-#include <fastdds/rtps/transport/SocketTransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPTransportDescriptor.h>
-#include <fastdds/rtps/transport/TransportReceiverInterface.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/common/PortParameters.hpp>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/transport/SenderResource.hpp>
+#include <fastdds/rtps/transport/SocketTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TransportReceiverInterface.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <rtps/transport/asio_helpers.hpp>
 #include <statistics/rtps/messages/RTPSStatisticsMessages.hpp>
diff --git a/src/cpp/rtps/transport/TCPTransportInterface.h b/src/cpp/rtps/transport/TCPTransportInterface.h
index b4649f1b872..1b291a1ea7d 100644
--- a/src/cpp/rtps/transport/TCPTransportInterface.h
+++ b/src/cpp/rtps/transport/TCPTransportInterface.h
@@ -26,9 +26,9 @@
 #include <fastdds/rtps/common/LocatorWithMask.hpp>
 #include <fastdds/rtps/transport/network/AllowedNetworkInterface.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
-#include <fastdds/rtps/transport/TCPTransportDescriptor.h>
-#include <fastdds/rtps/transport/TransportInterface.h>
-#include <fastdds/utils/IPFinder.h>
+#include <fastdds/rtps/transport/TCPTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
+#include <fastdds/utils/IPFinder.hpp>
 
 #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 ff1d1b36dc9..6552edf7a56 100644
--- a/src/cpp/rtps/transport/TCPv4Transport.cpp
+++ b/src/cpp/rtps/transport/TCPv4Transport.cpp
@@ -20,8 +20,8 @@
 
 #include <asio.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #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 579aff6d64a..190b4d8302d 100644
--- a/src/cpp/rtps/transport/TCPv4Transport.h
+++ b/src/cpp/rtps/transport/TCPv4Transport.h
@@ -20,8 +20,8 @@
 #include <mutex>
 
 #include <asio.hpp>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/utils/IPFinder.h>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/utils/IPFinder.hpp>
 #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 0fc2acdbb84..5c9d727d894 100644
--- a/src/cpp/rtps/transport/TCPv6Transport.cpp
+++ b/src/cpp/rtps/transport/TCPv6Transport.cpp
@@ -20,8 +20,8 @@
 
 #include <asio.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #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 11aec4d1dee..dd3d40b7ade 100644
--- a/src/cpp/rtps/transport/TCPv6Transport.h
+++ b/src/cpp/rtps/transport/TCPv6Transport.h
@@ -21,8 +21,8 @@
 
 #include <asio.hpp>
 
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/utils/IPFinder.h>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/utils/IPFinder.hpp>
 #include <rtps/transport/TCPTransportInterface.h>
 #include <rtps/transport/tcp/RTCPHeader.h>
 
diff --git a/src/cpp/rtps/transport/TransportInterface.cpp b/src/cpp/rtps/transport/TransportInterface.cpp
index c5a5c26c977..c5c66ebdd06 100644
--- a/src/cpp/rtps/transport/TransportInterface.cpp
+++ b/src/cpp/rtps/transport/TransportInterface.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <fastdds/rtps/transport/TransportInterface.h>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
 
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 
diff --git a/src/cpp/rtps/transport/UDPChannelResource.h b/src/cpp/rtps/transport/UDPChannelResource.h
index 0ee4d03dbdf..b49c18b697f 100644
--- a/src/cpp/rtps/transport/UDPChannelResource.h
+++ b/src/cpp/rtps/transport/UDPChannelResource.h
@@ -18,7 +18,7 @@
 #include <asio.hpp>
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/common/LocatorWithMask.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
 
diff --git a/src/cpp/rtps/transport/UDPSenderResource.hpp b/src/cpp/rtps/transport/UDPSenderResource.hpp
index b656a5c47bb..0d7a76622fe 100644
--- a/src/cpp/rtps/transport/UDPSenderResource.hpp
+++ b/src/cpp/rtps/transport/UDPSenderResource.hpp
@@ -15,8 +15,8 @@
 #ifndef __TRANSPORT_UDPSENDERRESOURCE_HPP__
 #define __TRANSPORT_UDPSENDERRESOURCE_HPP__
 
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/transport/SenderResource.h>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/transport/SenderResource.hpp>
 
 #include <rtps/transport/ChainingSenderResource.hpp>
 #include <rtps/transport/UDPTransportInterface.h>
diff --git a/src/cpp/rtps/transport/UDPTransportInterface.cpp b/src/cpp/rtps/transport/UDPTransportInterface.cpp
index 228d075bcae..95105eeb855 100644
--- a/src/cpp/rtps/transport/UDPTransportInterface.cpp
+++ b/src/cpp/rtps/transport/UDPTransportInterface.cpp
@@ -21,8 +21,8 @@
 #include <utility>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/transport/TransportInterface.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 #include <rtps/messages/CDRMessage.hpp>
 #include <rtps/transport/asio_helpers.hpp>
 #include <rtps/transport/UDPSenderResource.hpp>
diff --git a/src/cpp/rtps/transport/UDPTransportInterface.h b/src/cpp/rtps/transport/UDPTransportInterface.h
index c74c8d0e6ed..40cae43ab3c 100644
--- a/src/cpp/rtps/transport/UDPTransportInterface.h
+++ b/src/cpp/rtps/transport/UDPTransportInterface.h
@@ -25,9 +25,9 @@
 #include <fastdds/rtps/common/LocatorWithMask.hpp>
 #include <fastdds/rtps/transport/network/AllowedNetworkInterface.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
-#include <fastdds/rtps/transport/TransportInterface.h>
-#include <fastdds/rtps/transport/UDPTransportDescriptor.h>
-#include <fastdds/utils/IPFinder.h>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
+#include <fastdds/rtps/transport/UDPTransportDescriptor.hpp>
+#include <fastdds/utils/IPFinder.hpp>
 
 #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 e961ed9bd6b..dd24c2b97f7 100644
--- a/src/cpp/rtps/transport/UDPv4Transport.cpp
+++ b/src/cpp/rtps/transport/UDPv4Transport.cpp
@@ -19,9 +19,9 @@
 #include <utility>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/transport/SenderResource.h>
-#include <fastdds/rtps/transport/TransportInterface.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/SenderResource.hpp>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <rtps/messages/CDRMessage.hpp>
 #include <rtps/messages/MessageReceiver.h>
diff --git a/src/cpp/rtps/transport/UDPv4Transport.h b/src/cpp/rtps/transport/UDPv4Transport.h
index 132941bb4fe..8f1d2c37f33 100644
--- a/src/cpp/rtps/transport/UDPv4Transport.h
+++ b/src/cpp/rtps/transport/UDPv4Transport.h
@@ -15,7 +15,7 @@
 #ifndef _FASTDDS_UDPV4_TRANSPORT_H
 #define _FASTDDS_UDPV4_TRANSPORT_H
 
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 #include <rtps/transport/UDPTransportInterface.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/transport/UDPv6Transport.cpp b/src/cpp/rtps/transport/UDPv6Transport.cpp
index 04c32902c35..af9447cda39 100644
--- a/src/cpp/rtps/transport/UDPv6Transport.cpp
+++ b/src/cpp/rtps/transport/UDPv6Transport.cpp
@@ -19,9 +19,9 @@
 #include <utility>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/transport/SenderResource.h>
-#include <fastdds/rtps/transport/TransportInterface.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/SenderResource.hpp>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <rtps/messages/MessageReceiver.h>
 #include <rtps/network/utils/netmask_filter.hpp>
diff --git a/src/cpp/rtps/transport/UDPv6Transport.h b/src/cpp/rtps/transport/UDPv6Transport.h
index 97f7b6e86bd..a96071371e4 100644
--- a/src/cpp/rtps/transport/UDPv6Transport.h
+++ b/src/cpp/rtps/transport/UDPv6Transport.h
@@ -15,7 +15,7 @@
 #ifndef _FASTDDS_UDPV6_TRANSPORT_H_
 #define _FASTDDS_UDPV6_TRANSPORT_H_
 
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
 #include <rtps/transport/UDPTransportInterface.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/transport/shared_mem/SHMLocator.hpp b/src/cpp/rtps/transport/shared_mem/SHMLocator.hpp
index b2af35adc43..f13dd0002ec 100644
--- a/src/cpp/rtps/transport/shared_mem/SHMLocator.hpp
+++ b/src/cpp/rtps/transport/shared_mem/SHMLocator.hpp
@@ -15,7 +15,7 @@
 #ifndef _FASTDDS_SHMLOCATOR_H_
 #define _FASTDDS_SHMLOCATOR_H_
 
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <utils/Host.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemChannelResource.hpp b/src/cpp/rtps/transport/shared_mem/SharedMemChannelResource.hpp
index 86e6a3f9dd9..bd70ad08d06 100644
--- a/src/cpp/rtps/transport/shared_mem/SharedMemChannelResource.hpp
+++ b/src/cpp/rtps/transport/shared_mem/SharedMemChannelResource.hpp
@@ -16,7 +16,7 @@
 #define _FASTDDS_SHAREDMEM_CHANNEL_RESOURCE_
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 
 #include <rtps/messages/MessageReceiver.h>
 #include <rtps/transport/shared_mem/SharedMemManager.hpp>
diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemLog.hpp b/src/cpp/rtps/transport/shared_mem/SharedMemLog.hpp
index 80ccaa2b0c7..6746a0afa5b 100644
--- a/src/cpp/rtps/transport/shared_mem/SharedMemLog.hpp
+++ b/src/cpp/rtps/transport/shared_mem/SharedMemLog.hpp
@@ -18,7 +18,7 @@
 #include <thread>
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 
 #include <rtps/transport/shared_mem/SharedMemManager.hpp>
 #include <utils/DBQueue.hpp>
diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemSenderResource.hpp b/src/cpp/rtps/transport/shared_mem/SharedMemSenderResource.hpp
index 5bceef002c2..5dacc77e930 100644
--- a/src/cpp/rtps/transport/shared_mem/SharedMemSenderResource.hpp
+++ b/src/cpp/rtps/transport/shared_mem/SharedMemSenderResource.hpp
@@ -15,7 +15,7 @@
 #ifndef _FASTDDS_SHAREDMEM_SENDERRESOURCE_HPP_
 #define _FASTDDS_SHAREDMEM_SENDERRESOURCE_HPP_
 
-#include <fastdds/rtps/transport/SenderResource.h>
+#include <fastdds/rtps/transport/SenderResource.hpp>
 
 #include <rtps/transport/ChainingSenderResource.hpp>
 #include <rtps/transport/shared_mem/SharedMemTransport.h>
diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp b/src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp
index d8af79fe59b..6d78649f870 100644
--- a/src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp
+++ b/src/cpp/rtps/transport/shared_mem/SharedMemTransport.cpp
@@ -23,9 +23,9 @@
 #endif // ifdef ANDROID
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/transport/SenderResource.h>
-#include <fastdds/rtps/transport/TransportInterface.h>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/transport/SenderResource.hpp>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
 
 #include <rtps/messages/CDRMessage.hpp>
 #include <rtps/messages/MessageReceiver.h>
diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h b/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h
index 7a376de570e..28d2ea52035 100644
--- a/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h
+++ b/src/cpp/rtps/transport/shared_mem/SharedMemTransport.h
@@ -15,8 +15,8 @@
 #ifndef _FASTDDS_SHAREDMEM_TRANSPORT_H_
 #define _FASTDDS_SHAREDMEM_TRANSPORT_H_
 
-#include <fastdds/rtps/transport/TransportInterface.h>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
 
 #include <rtps/transport/shared_mem/SharedMemManager.hpp>
 #include <rtps/transport/shared_mem/SharedMemLog.hpp>
diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp b/src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp
index 922e9e03ee9..a5e413c3961 100644
--- a/src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp
+++ b/src/cpp/rtps/transport/shared_mem/SharedMemTransportDescriptor.cpp
@@ -14,10 +14,10 @@
 
 #include <cstdint>
 
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
 
 #include <fastdds/rtps/transport/PortBasedTransportDescriptor.hpp>
-#include <fastdds/rtps/transport/TransportInterface.h>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.h b/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.h
index 0a676caec18..3f43e8b0e9c 100644
--- a/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.h
+++ b/src/cpp/rtps/transport/shared_mem/test_SharedMemTransport.h
@@ -15,7 +15,7 @@
 #ifndef _FASTDDS_TEST_SHAREDMEM_TRANSPORT_H_
 #define _FASTDDS_TEST_SHAREDMEM_TRANSPORT_H_
 
-#include <fastdds/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.hpp>
 
 #include <rtps/transport/shared_mem/SharedMemTransport.h>
 
diff --git a/src/cpp/rtps/transport/tcp/RTCPHeader.h b/src/cpp/rtps/transport/tcp/RTCPHeader.h
index 376a6ea7029..4a0aa7239c1 100644
--- a/src/cpp/rtps/transport/tcp/RTCPHeader.h
+++ b/src/cpp/rtps/transport/tcp/RTCPHeader.h
@@ -15,7 +15,7 @@
 #ifndef _FASTDDS_RTCP_HEADER_H_
 #define _FASTDDS_RTCP_HEADER_H_
 
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 #include <cstring>
 #include <fastcdr/FastCdr.h>
 #include <fastcdr/Cdr.h>
diff --git a/src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp b/src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp
index 925a159d259..8813440fd39 100644
--- a/src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp
+++ b/src/cpp/rtps/transport/tcp/RTCPMessageManager.cpp
@@ -21,10 +21,10 @@
 
 #include <thread>
 
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 #include <rtps/transport/tcp/RTCPHeader.h>
 #include <rtps/transport/TCPChannelResource.h>
 #include <rtps/transport/TCPTransportInterface.h>
diff --git a/src/cpp/rtps/transport/tcp/TCPControlMessage.cpp b/src/cpp/rtps/transport/tcp/TCPControlMessage.cpp
index 25d9f689c7e..ac5c1cd04ff 100644
--- a/src/cpp/rtps/transport/tcp/TCPControlMessage.cpp
+++ b/src/cpp/rtps/transport/tcp/TCPControlMessage.cpp
@@ -27,7 +27,7 @@ char dummy;
 #endif // ifdef _WIN32
 
 #include <fastdds/rtps/common/CdrSerialization.hpp>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 
 #include <rtps/transport/tcp/TCPControlMessage.h>
diff --git a/src/cpp/rtps/transport/tcp/TCPControlMessage.h b/src/cpp/rtps/transport/tcp/TCPControlMessage.h
index 54f4f8de862..f3d1f334dc4 100644
--- a/src/cpp/rtps/transport/tcp/TCPControlMessage.h
+++ b/src/cpp/rtps/transport/tcp/TCPControlMessage.h
@@ -22,8 +22,8 @@
 #ifndef _FASTDDS_TCP_CONTROL_MESSAGE_H_
 #define _FASTDDS_TCP_CONTROL_MESSAGE_H_
 
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/transport/test_UDPv4Transport.cpp b/src/cpp/rtps/transport/test_UDPv4Transport.cpp
index c6d44f87689..e77ce39517c 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 <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 
 using namespace std;
 
diff --git a/src/cpp/rtps/transport/test_UDPv4Transport.h b/src/cpp/rtps/transport/test_UDPv4Transport.h
index 83a5fb90a00..fd8ce3d08bf 100644
--- a/src/cpp/rtps/transport/test_UDPv4Transport.h
+++ b/src/cpp/rtps/transport/test_UDPv4Transport.h
@@ -17,9 +17,9 @@
 
 #include <vector>
 
-#include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/messages/RTPS_messages.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/messages/RTPS_messages.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <rtps/messages/CDRMessage.hpp>
 #include <rtps/transport/UDPv4Transport.h>
 
diff --git a/src/cpp/rtps/writer/ChangeForReader.hpp b/src/cpp/rtps/writer/ChangeForReader.hpp
index fad390a6f27..a22762fdb9d 100644
--- a/src/cpp/rtps/writer/ChangeForReader.hpp
+++ b/src/cpp/rtps/writer/ChangeForReader.hpp
@@ -19,9 +19,9 @@
 #ifndef RTPS_WRITER__CHANGEFORREADER_HPP
 #define RTPS_WRITER__CHANGEFORREADER_HPP
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/common/FragmentNumber.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/common/FragmentNumber.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
 
 #include <cassert>
 
diff --git a/src/cpp/rtps/writer/LivelinessData.hpp b/src/cpp/rtps/writer/LivelinessData.hpp
index 29bf2af8b24..8a38a95d527 100644
--- a/src/cpp/rtps/writer/LivelinessData.hpp
+++ b/src/cpp/rtps/writer/LivelinessData.hpp
@@ -21,7 +21,7 @@
 #include <chrono>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/writer/LocatorSelectorSender.cpp b/src/cpp/rtps/writer/LocatorSelectorSender.cpp
index f3a08b02891..5bb5e9663d3 100644
--- a/src/cpp/rtps/writer/LocatorSelectorSender.cpp
+++ b/src/cpp/rtps/writer/LocatorSelectorSender.cpp
@@ -1,5 +1,5 @@
 #include <fastdds/rtps/writer/LocatorSelectorSender.hpp>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/writer/PersistentWriter.cpp b/src/cpp/rtps/writer/PersistentWriter.cpp
index c6e1e00128f..30c2ce79279 100644
--- a/src/cpp/rtps/writer/PersistentWriter.cpp
+++ b/src/cpp/rtps/writer/PersistentWriter.cpp
@@ -19,7 +19,7 @@
 
 #include <rtps/writer/PersistentWriter.hpp>
 
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <rtps/DataSharing/WriterPool.hpp>
 #include <rtps/persistence/PersistenceService.h>
diff --git a/src/cpp/rtps/writer/PersistentWriter.hpp b/src/cpp/rtps/writer/PersistentWriter.hpp
index f2734fe0124..f993113707f 100644
--- a/src/cpp/rtps/writer/PersistentWriter.hpp
+++ b/src/cpp/rtps/writer/PersistentWriter.hpp
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
diff --git a/src/cpp/rtps/writer/RTPSWriter.cpp b/src/cpp/rtps/writer/RTPSWriter.cpp
index 41078decb4a..f3feeb74289 100644
--- a/src/cpp/rtps/writer/RTPSWriter.cpp
+++ b/src/cpp/rtps/writer/RTPSWriter.cpp
@@ -17,13 +17,13 @@
  *
  */
 
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <mutex>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <rtps/DataSharing/DataSharingNotifier.hpp>
 #include <rtps/DataSharing/WriterPool.hpp>
diff --git a/src/cpp/rtps/writer/ReaderLocator.cpp b/src/cpp/rtps/writer/ReaderLocator.cpp
index a65b1964597..312a12b2d0c 100644
--- a/src/cpp/rtps/writer/ReaderLocator.cpp
+++ b/src/cpp/rtps/writer/ReaderLocator.cpp
@@ -19,10 +19,10 @@
 
 #include <rtps/writer/ReaderLocator.hpp>
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/rtps/common/LocatorListComparisons.hpp>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/BaseReader.hpp>
diff --git a/src/cpp/rtps/writer/ReaderLocator.hpp b/src/cpp/rtps/writer/ReaderLocator.hpp
index 46a4e58f4e7..173966ec9bd 100644
--- a/src/cpp/rtps/writer/ReaderLocator.hpp
+++ b/src/cpp/rtps/writer/ReaderLocator.hpp
@@ -15,13 +15,13 @@
 /**
  * @file ReaderLocator.hpp
  */
-#ifndef RTPS_WRITER__READERLOCATOR_HPP
-#define RTPS_WRITER__READERLOCATOR_HPP
+#ifndef FASTDDS_RTPS_WRITER__READERLOCATOR_HPP
+#define FASTDDS_RTPS_WRITER__READERLOCATOR_HPP
 
 #include <vector>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
 #include <fastdds/rtps/messages/RTPSMessageSenderInterface.hpp>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 
@@ -270,4 +270,4 @@ class ReaderLocator : public RTPSMessageSenderInterface
 } /* namespace fastdds */
 } /* namespace eprosima */
 
-#endif // RTPS_WRITER__READERLOCATOR_HPP
+#endif // FASTDDS_RTPS_WRITER__READERLOCATOR_HPP
diff --git a/src/cpp/rtps/writer/ReaderProxy.cpp b/src/cpp/rtps/writer/ReaderProxy.cpp
index 16a28f99266..4d513dd53e6 100644
--- a/src/cpp/rtps/writer/ReaderProxy.cpp
+++ b/src/cpp/rtps/writer/ReaderProxy.cpp
@@ -24,7 +24,7 @@
 #include <algorithm>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 #include <fastdds/rtps/common/LocatorListComparisons.hpp>
 
 #include <rtps/DataSharing/DataSharingNotifier.hpp>
diff --git a/src/cpp/rtps/writer/ReaderProxy.hpp b/src/cpp/rtps/writer/ReaderProxy.hpp
index 0c0d95d45c3..1883416f62e 100644
--- a/src/cpp/rtps/writer/ReaderProxy.hpp
+++ b/src/cpp/rtps/writer/ReaderProxy.hpp
@@ -24,13 +24,13 @@
 #include <set>
 
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/common/FragmentNumber.h>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/common/FragmentNumber.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 #include <rtps/writer/ChangeForReader.hpp>
diff --git a/src/cpp/rtps/writer/StatefulPersistentWriter.cpp b/src/cpp/rtps/writer/StatefulPersistentWriter.cpp
index 447738d4238..30527a9fb0f 100644
--- a/src/cpp/rtps/writer/StatefulPersistentWriter.cpp
+++ b/src/cpp/rtps/writer/StatefulPersistentWriter.cpp
@@ -19,7 +19,7 @@
 
 #include "StatefulPersistentWriter.hpp"
 
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <rtps/persistence/PersistenceService.h>
 
diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp
index ac4b058644b..857ba17cbd7 100644
--- a/src/cpp/rtps/writer/StatefulWriter.cpp
+++ b/src/cpp/rtps/writer/StatefulWriter.cpp
@@ -25,13 +25,13 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
 #include <rtps/messages/RTPSMessageCreator.hpp>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/liveliness/WLP.hpp>
diff --git a/src/cpp/rtps/writer/StatefulWriter.hpp b/src/cpp/rtps/writer/StatefulWriter.hpp
index e14809e573c..576227441c5 100644
--- a/src/cpp/rtps/writer/StatefulWriter.hpp
+++ b/src/cpp/rtps/writer/StatefulWriter.hpp
@@ -16,8 +16,8 @@
  * @file StatefulWriter.hpp
  */
 
-#ifndef RTPS_WRITER__STATEFULWRITER_HPP
-#define RTPS_WRITER__STATEFULWRITER_HPP
+#ifndef FASTDDS_RTPS_WRITER__STATEFULWRITER_HPP
+#define FASTDDS_RTPS_WRITER__STATEFULWRITER_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -25,10 +25,10 @@
 #include <mutex>
 
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastdds/rtps/history/IChangePool.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
+#include <fastdds/rtps/history/IChangePool.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 namespace eprosima {
@@ -545,9 +545,9 @@ class StatefulWriter : public RTPSWriter
     LocatorSelectorSender locator_selector_async_;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* RTPS_WRITER__STATEFULWRITER_HPP */
+#endif // FASTDDS_RTPS_WRITER__STATEFULWRITER_HPP
diff --git a/src/cpp/rtps/writer/StatelessPersistentWriter.cpp b/src/cpp/rtps/writer/StatelessPersistentWriter.cpp
index 40f86acdaf7..34f483068f3 100644
--- a/src/cpp/rtps/writer/StatelessPersistentWriter.cpp
+++ b/src/cpp/rtps/writer/StatelessPersistentWriter.cpp
@@ -19,7 +19,7 @@
 
 #include "StatelessPersistentWriter.hpp"
 
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <rtps/persistence/PersistenceService.h>
 
diff --git a/src/cpp/rtps/writer/StatelessWriter.cpp b/src/cpp/rtps/writer/StatelessWriter.cpp
index 3986da62401..254a6a5a9fd 100644
--- a/src/cpp/rtps/writer/StatelessWriter.cpp
+++ b/src/cpp/rtps/writer/StatelessWriter.cpp
@@ -25,9 +25,9 @@
 #include <vector>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 
 #include "../flowcontrol/FlowController.hpp"
 #include <rtps/builtin/BuiltinProtocols.h>
diff --git a/src/cpp/rtps/writer/StatelessWriter.hpp b/src/cpp/rtps/writer/StatelessWriter.hpp
index 51ea2b8df0f..d887cf1843a 100644
--- a/src/cpp/rtps/writer/StatelessWriter.hpp
+++ b/src/cpp/rtps/writer/StatelessWriter.hpp
@@ -15,8 +15,8 @@
 /**
  * @file StatelessWriter.hpp
  */
-#ifndef RTPS_WRITER__STATELESSWRITER_HPP
-#define RTPS_WRITER__STATELESSWRITER_HPP
+#ifndef FASTDDS_RTPS_WRITER__STATELESSWRITER_HPP
+#define FASTDDS_RTPS_WRITER__STATELESSWRITER_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -25,11 +25,11 @@
 #include <mutex>
 #include <vector>
 
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/history/IChangePool.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/history/IChangePool.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 #include <rtps/writer/ChangeForReader.hpp>
@@ -297,9 +297,9 @@ class StatelessWriter : public RTPSWriter
     fastdds::rtps::IReaderDataFilter* reader_data_filter_ = nullptr;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* RTPS_WRITER__STATELESSWRITER_HPP */
+#endif // FASTDDS_RTPS_WRITER__STATELESSWRITER_HPP
diff --git a/src/cpp/security/accesscontrol/AccessPermissionsHandle.h b/src/cpp/security/accesscontrol/AccessPermissionsHandle.h
index 78dcefb37e9..c4d471908ad 100644
--- a/src/cpp/security/accesscontrol/AccessPermissionsHandle.h
+++ b/src/cpp/security/accesscontrol/AccessPermissionsHandle.h
@@ -18,8 +18,8 @@
 #ifndef __SECURITY_ACCESSCONTROL_ACCESSPERMISSIONSHANDLE_H__
 #define __SECURITY_ACCESSCONTROL_ACCESSPERMISSIONSHANDLE_H__
 
-#include <fastdds/rtps/common/Token.h>
-#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/common/Token.hpp>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.hpp>
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
 #include <rtps/security/common/Handle.h>
 #include <security/accesscontrol/PermissionsTypes.h>
diff --git a/src/cpp/security/accesscontrol/Permissions.cpp b/src/cpp/security/accesscontrol/Permissions.cpp
index ad7888b2da2..85e2351edee 100644
--- a/src/cpp/security/accesscontrol/Permissions.cpp
+++ b/src/cpp/security/accesscontrol/Permissions.cpp
@@ -32,10 +32,10 @@
 #include <openssl/err.h>
 #include <openssl/obj_mac.h>
 
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 
 #include <rtps/security/exceptions/SecurityException.h>
 #include <security/accesscontrol/AccessPermissionsHandle.h>
diff --git a/src/cpp/security/accesscontrol/Permissions.h b/src/cpp/security/accesscontrol/Permissions.h
index 396c55a719c..4e3af031534 100644
--- a/src/cpp/security/accesscontrol/Permissions.h
+++ b/src/cpp/security/accesscontrol/Permissions.h
@@ -19,7 +19,7 @@
 #ifndef _SECURITY_ACCESSCONTROL_PERMISSIONS_H_
 #define _SECURITY_ACCESSCONTROL_PERMISSIONS_H_
 
-#include <fastdds/rtps/common/Token.h>
+#include <fastdds/rtps/common/Token.hpp>
 #include <rtps/security/accesscontrol/AccessControl.h>
 
 namespace eprosima {
diff --git a/src/cpp/security/authentication/PKIDH.h b/src/cpp/security/authentication/PKIDH.h
index 4a8dbd178f4..fe4c8a09d79 100644
--- a/src/cpp/security/authentication/PKIDH.h
+++ b/src/cpp/security/authentication/PKIDH.h
@@ -19,7 +19,7 @@
 #ifndef _SECURITY_AUTHENTICATION_PKIDH_H_
 #define _SECURITY_AUTHENTICATION_PKIDH_H_
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 #include <rtps/security/authentication/Authentication.h>
 #include <security/artifact_providers/Pkcs11Provider.hpp>
 #include <security/authentication/PKIHandshakeHandle.h>
diff --git a/src/cpp/security/authentication/PKIIdentityHandle.h b/src/cpp/security/authentication/PKIIdentityHandle.h
index 71b47c7436b..1d1c016d2a6 100644
--- a/src/cpp/security/authentication/PKIIdentityHandle.h
+++ b/src/cpp/security/authentication/PKIIdentityHandle.h
@@ -18,8 +18,8 @@
 #ifndef _SECURITY_AUTHENTICATION_PKIIDENTITYHANDLE_H_
 #define _SECURITY_AUTHENTICATION_PKIIDENTITYHANDLE_H_
 
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Token.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Token.hpp>
 #include <rtps/security/common/Handle.h>
 
 #include <openssl/x509.h>
diff --git a/src/cpp/security/cryptography/AESGCMGMAC.h b/src/cpp/security/cryptography/AESGCMGMAC.h
index 921e268d788..be34ff8f963 100644
--- a/src/cpp/security/cryptography/AESGCMGMAC.h
+++ b/src/cpp/security/cryptography/AESGCMGMAC.h
@@ -20,7 +20,7 @@
 #define _SECURITY_AUTHENTICATION_AESGCMGMAC_H_
 
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 #include <rtps/security/cryptography/Cryptography.h>
 #include <security/cryptography/AESGCMGMAC_KeyExchange.h>
 #include <security/cryptography/AESGCMGMAC_KeyFactory.h>
diff --git a/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.cpp b/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.cpp
index c362b5f3713..2f676e19813 100644
--- a/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.cpp
+++ b/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.cpp
@@ -26,8 +26,8 @@
 #include <openssl/rand.h>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/common/BinaryProperty.h>
-#include <fastdds/rtps/common/Token.h>
+#include <fastdds/rtps/common/BinaryProperty.hpp>
+#include <fastdds/rtps/common/Token.hpp>
 #include <rtps/security/exceptions/SecurityException.h>
 
 // Solve error with Win32 macro
diff --git a/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.h b/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.h
index 50604c3c315..eaa633c8111 100644
--- a/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.h
+++ b/src/cpp/security/cryptography/AESGCMGMAC_KeyExchange.h
@@ -20,7 +20,7 @@
 #define _SECURITY_AUTHENTICATION_AESGCMGMAC_KEYEXCHANGE_H_
 
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 #include <rtps/security/cryptography/CryptoKeyExchange.h>
 #include <security/cryptography/AESGCMGMAC_Types.h>
 
diff --git a/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.h b/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.h
index 96a8cc89f2d..73b6b6ce5cd 100644
--- a/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.h
+++ b/src/cpp/security/cryptography/AESGCMGMAC_KeyFactory.h
@@ -20,7 +20,7 @@
 #define _SECURITY_AUTHENTICATION_AESGCMGMAC_KEYFACTORY_H_
 
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 #include <rtps/security/cryptography/CryptoKeyFactory.h>
 #include <security/cryptography/AESGCMGMAC_Types.h>
 
diff --git a/src/cpp/security/cryptography/AESGCMGMAC_Transform.h b/src/cpp/security/cryptography/AESGCMGMAC_Transform.h
index f2e1be48d96..a3849d81e48 100644
--- a/src/cpp/security/cryptography/AESGCMGMAC_Transform.h
+++ b/src/cpp/security/cryptography/AESGCMGMAC_Transform.h
@@ -20,7 +20,7 @@
 #define _SECURITY_AUTHENTICATION_AESGCMGMAC_TRANSFORM_H_
 
 #include <fastcdr/Cdr.h>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 #include <rtps/security/cryptography/CryptoTransform.h>
 
 #include <map>
diff --git a/src/cpp/security/cryptography/AESGCMGMAC_Types.h b/src/cpp/security/cryptography/AESGCMGMAC_Types.h
index cbf163d7625..04075428785 100644
--- a/src/cpp/security/cryptography/AESGCMGMAC_Types.h
+++ b/src/cpp/security/cryptography/AESGCMGMAC_Types.h
@@ -24,8 +24,8 @@
 #include <limits>
 #include <mutex>
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.hpp>
 
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
 #include <rtps/security/common/Handle.h>
diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
index 5c0c8f9cc2b..7ba349c5d2f 100644
--- a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
+++ b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
@@ -34,8 +34,8 @@
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TopicDescription.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
 #include <fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/statistics/topic_names.hpp>
 
@@ -45,7 +45,7 @@
 #include <statistics/fastdds/subscriber/SubscriberImpl.hpp>
 #include <statistics/rtps/GuidUtils.hpp>
 #include <statistics/types/types.hpp>
-#include <statistics/types/typesPubSubTypes.h>
+#include <statistics/types/typesPubSubTypes.hpp>
 #include <utils/SystemInfo.hpp>
 #include <xmlparser/attributes/PublisherAttributes.hpp>
 #include <xmlparser/XMLParserCommon.h>
diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp
index 18105ced641..a58067b4efe 100644
--- a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp
+++ b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp
@@ -19,7 +19,7 @@
 #ifndef _FASTDDS_STADISTICS_FASTDDS_DOMAIN_DOMAINPARTICIPANTIMPL_HPP_
 #define _FASTDDS_STADISTICS_FASTDDS_DOMAIN_DOMAINPARTICIPANTIMPL_HPP_
 
-#include <fastdds/config.h>
+#include <fastdds/config.hpp>
 
 #ifdef FASTDDS_STATISTICS
 
diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantStatisticsListener.hpp b/src/cpp/statistics/fastdds/domain/DomainParticipantStatisticsListener.hpp
index dee3f1aece4..dc5d2f11f10 100644
--- a/src/cpp/statistics/fastdds/domain/DomainParticipantStatisticsListener.hpp
+++ b/src/cpp/statistics/fastdds/domain/DomainParticipantStatisticsListener.hpp
@@ -19,7 +19,7 @@
 #ifndef _STATISTICS_FASTDDS_DOMAIN_DOMAINPARTICIPANTSTATISTICSLISTENER_HPP
 #define _STATISTICS_FASTDDS_DOMAIN_DOMAINPARTICIPANTSTATISTICSLISTENER_HPP
 
-#include <fastdds/config.h>
+#include <fastdds/config.hpp>
 
 #ifdef FASTDDS_STATISTICS
 
diff --git a/src/cpp/statistics/fastdds/publisher/DataWriterImpl.hpp b/src/cpp/statistics/fastdds/publisher/DataWriterImpl.hpp
index 8394f3fe6a7..75ac8b9b4f3 100644
--- a/src/cpp/statistics/fastdds/publisher/DataWriterImpl.hpp
+++ b/src/cpp/statistics/fastdds/publisher/DataWriterImpl.hpp
@@ -22,8 +22,8 @@
 #include <fastdds/statistics/IListeners.hpp>
 
 #include <fastdds/dds/core/ReturnCode.hpp>
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <fastdds/publisher/DataWriterImpl.hpp>
 #include <statistics/fastdds/domain/DomainParticipantImpl.hpp>
diff --git a/src/cpp/statistics/fastdds/subscriber/DataReaderImpl.hpp b/src/cpp/statistics/fastdds/subscriber/DataReaderImpl.hpp
index 9bb796fabff..b07d54bb82b 100644
--- a/src/cpp/statistics/fastdds/subscriber/DataReaderImpl.hpp
+++ b/src/cpp/statistics/fastdds/subscriber/DataReaderImpl.hpp
@@ -23,7 +23,7 @@
 #include <fastdds/statistics/IListeners.hpp>
 
 #include <fastdds/subscriber/DataReaderImpl.hpp>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <statistics/fastdds/domain/DomainParticipantImpl.hpp>
 
diff --git a/src/cpp/statistics/rtps/GuidUtils.hpp b/src/cpp/statistics/rtps/GuidUtils.hpp
index 03eef276321..35e28f9a890 100644
--- a/src/cpp/statistics/rtps/GuidUtils.hpp
+++ b/src/cpp/statistics/rtps/GuidUtils.hpp
@@ -19,7 +19,7 @@
 #ifndef _STATISTICS_RTPS_GUIDUTILS_HPP_
 #define _STATISTICS_RTPS_GUIDUTILS_HPP_
 
-#include <fastdds/config.h>
+#include <fastdds/config.hpp>
 
 #include <fastdds/rtps/common/EntityId_t.hpp>
 
diff --git a/src/cpp/statistics/rtps/StatisticsBase.hpp b/src/cpp/statistics/rtps/StatisticsBase.hpp
index 0c1c4e4b855..4762f395d9a 100644
--- a/src/cpp/statistics/rtps/StatisticsBase.hpp
+++ b/src/cpp/statistics/rtps/StatisticsBase.hpp
@@ -25,11 +25,11 @@
 #include <mutex>
 #include <set>
 
-#include <fastdds/config.h>
+#include <fastdds/config.hpp>
 #include <fastdds/dds/core/policy/ParameterTypes.hpp>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/common/SampleIdentity.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/SampleIdentity.hpp>
 #include <fastdds/statistics/rtps/StatisticsCommon.hpp>
 #include <statistics/rtps/GuidUtils.hpp>
 #include <statistics/rtps/messages/RTPSStatisticsMessages.hpp>
diff --git a/src/cpp/statistics/rtps/messages/OutputTrafficManager.hpp b/src/cpp/statistics/rtps/messages/OutputTrafficManager.hpp
index 2f19a003374..0c16b9406a9 100644
--- a/src/cpp/statistics/rtps/messages/OutputTrafficManager.hpp
+++ b/src/cpp/statistics/rtps/messages/OutputTrafficManager.hpp
@@ -24,8 +24,8 @@
 #include <list>
 #include <utility>
 
-#include <fastdds/config.h>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/config.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
 
 #include <statistics/rtps/messages/RTPSStatisticsMessages.hpp>
 
diff --git a/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp b/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp
index 2bcc3ea589c..8f1ddf63ea2 100644
--- a/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp
+++ b/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp
@@ -23,8 +23,8 @@
 #include <cstdint>
 #include <cstring>
 
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 #include <rtps/messages/CDRMessage.hpp>
 #include <rtps/messages/RTPSMessageCreator.hpp>
 
diff --git a/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp b/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp
index d931c2fb35c..84e025bfb1e 100644
--- a/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp
+++ b/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp
@@ -28,8 +28,8 @@
 #include <vector>
 
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include "Interfaces.hpp"
 #include <rtps/history/ITopicPayloadPool.h>
@@ -37,7 +37,7 @@
 #include <rtps/writer/StatefulWriter.hpp>
 #include <statistics/rtps/monitor-service/MonitorServiceListener.hpp>
 #include <statistics/types/monitorservice_types.hpp>
-#include <statistics/types/monitorservice_typesPubSubTypes.h>
+#include <statistics/types/monitorservice_typesPubSubTypes.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.hpp b/src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.hpp
index a492412bbb0..e546f8ff11b 100644
--- a/src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.hpp
+++ b/src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.hpp
@@ -20,7 +20,7 @@
 #define _STATISTICS_RTPS_MONITOR_SERVICE_MONITORSERVICELISTENER_HPP_
 
 
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 
 #include "Interfaces.hpp"
 
diff --git a/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsObserver.hpp b/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsObserver.hpp
index 87a967ba5ee..63ec9640d1c 100644
--- a/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsObserver.hpp
+++ b/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsObserver.hpp
@@ -22,7 +22,7 @@
 
 #include <vector>
 
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/statistics/rtps/monitor_service/connections_fwd.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsQueryable.hpp b/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsQueryable.hpp
index eac9b02cd6c..418112f8bec 100644
--- a/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsQueryable.hpp
+++ b/src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsQueryable.hpp
@@ -22,7 +22,7 @@
 
 #include <vector>
 
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/statistics/rtps/monitor_service/connections_fwd.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp b/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp
index 41a9ea88998..5ba0171059d 100644
--- a/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp
+++ b/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp
@@ -20,7 +20,7 @@
 #ifndef _FASTDDS_STATISTICS_MONITOR_SERVICE_INTERFACES_IPROXYOBSERVER_HPP_
 #define _FASTDDS_STATISTICS_MONITOR_SERVICE_INTERFACES_IPROXYOBSERVER_HPP_
 
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyQueryable.hpp b/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyQueryable.hpp
index a993cc4cf13..17db6842c4e 100644
--- a/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyQueryable.hpp
+++ b/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyQueryable.hpp
@@ -22,8 +22,8 @@
 
 #include <vector>
 
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusObserver.hpp b/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusObserver.hpp
index 66229cbcb00..de4c6b23c34 100644
--- a/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusObserver.hpp
+++ b/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusObserver.hpp
@@ -20,7 +20,7 @@
 #ifndef _FASTDDS_STATISTICS_MONITOR_SERVICE_INTERFACES_ISTATUSOBSERVER_HPP_
 #define _FASTDDS_STATISTICS_MONITOR_SERVICE_INTERFACES_ISTATUSOBSERVER_HPP_
 
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusQueryable.hpp b/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusQueryable.hpp
index 0cad2024afb..d5cf17cc354 100644
--- a/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusQueryable.hpp
+++ b/src/cpp/statistics/rtps/monitor-service/interfaces/IStatusQueryable.hpp
@@ -24,7 +24,7 @@
 #include <fastdds/dds/core/status/DeadlineMissedStatus.hpp>
 #include <fastdds/dds/core/status/IncompatibleQosStatus.hpp>
 #include <fastdds/dds/core/status/LivelinessChangedStatus.hpp>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 
 #include <statistics/types/monitorservice_types.hpp>
 
diff --git a/src/cpp/statistics/rtps/reader/StatisticsReaderImpl.cpp b/src/cpp/statistics/rtps/reader/StatisticsReaderImpl.cpp
index 3fabb699793..6f450026ca2 100644
--- a/src/cpp/statistics/rtps/reader/StatisticsReaderImpl.cpp
+++ b/src/cpp/statistics/rtps/reader/StatisticsReaderImpl.cpp
@@ -18,7 +18,7 @@
 
 #include <statistics/rtps/StatisticsBase.hpp>
 
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <rtps/reader/BaseReader.hpp>
 #include <statistics/types/types.hpp>
diff --git a/src/cpp/statistics/rtps/writer/StatisticsWriterImpl.cpp b/src/cpp/statistics/rtps/writer/StatisticsWriterImpl.cpp
index 3947f537125..42550a739d6 100644
--- a/src/cpp/statistics/rtps/writer/StatisticsWriterImpl.cpp
+++ b/src/cpp/statistics/rtps/writer/StatisticsWriterImpl.cpp
@@ -18,7 +18,7 @@
 
 #include <statistics/rtps/StatisticsBase.hpp>
 
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 #include <statistics/types/types.hpp>
 
 using eprosima::fastdds::RecursiveTimedMutex;
diff --git a/src/cpp/statistics/types/monitorservice_types.hpp b/src/cpp/statistics/types/monitorservice_types.hpp
index 63125b25f12..d1bd4bcee03 100644
--- a/src/cpp/statistics/types/monitorservice_types.hpp
+++ b/src/cpp/statistics/types/monitorservice_types.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/src/cpp/statistics/types/monitorservice_typesCdrAux.hpp b/src/cpp/statistics/types/monitorservice_typesCdrAux.hpp
index ee5fff198a7..32c6ac80bb6 100644
--- a/src/cpp/statistics/types/monitorservice_typesCdrAux.hpp
+++ b/src/cpp/statistics/types/monitorservice_typesCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_HPP
 
 #include "monitorservice_types.hpp"
 
@@ -111,5 +111,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_HPP
 
diff --git a/src/cpp/statistics/types/monitorservice_typesCdrAux.ipp b/src/cpp/statistics/types/monitorservice_typesCdrAux.ipp
index cf0924ab80b..3f063f533a8 100644
--- a/src/cpp/statistics/types/monitorservice_typesCdrAux.ipp
+++ b/src/cpp/statistics/types/monitorservice_typesCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_IPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_IPP
 
 #include "monitorservice_typesCdrAux.hpp"
 
@@ -1007,5 +1007,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_IPP
 
diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx
index 65213d9c1b8..d0e23ab6f51 100644
--- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx
+++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "monitorservice_typesPubSubTypes.h"
+#include "monitorservice_typesPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp
similarity index 94%
rename from src/cpp/statistics/types/monitorservice_typesPubSubTypes.h
rename to src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp
index 8225e6e1135..966a6a459c8 100644
--- a/src/cpp/statistics/types/monitorservice_typesPubSubTypes.h
+++ b/src/cpp/statistics/types/monitorservice_typesPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file monitorservice_typesPubSubTypes.h
+ * @file monitorservice_typesPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "monitorservice_types.hpp"
 
-#include "typesPubSubTypes.h"
+#include "typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -113,7 +113,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -131,7 +131,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -204,7 +204,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -222,7 +222,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -295,7 +295,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -313,7 +313,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -387,7 +387,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -405,7 +405,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -478,7 +478,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -496,7 +496,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -569,7 +569,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -587,7 +587,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -677,7 +677,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -695,7 +695,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -703,5 +703,5 @@ namespace eprosima
     } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_HPP
 
diff --git a/src/cpp/statistics/types/monitorservice_typesTypeObjectSupport.hpp b/src/cpp/statistics/types/monitorservice_typesTypeObjectSupport.hpp
index 703ef46f1c6..9d4484ba038 100644
--- a/src/cpp/statistics/types/monitorservice_typesTypeObjectSupport.hpp
+++ b/src/cpp/statistics/types/monitorservice_typesTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -254,4 +254,4 @@ eProsima_user_DllExport void register_MonitorServiceStatusData_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_TYPE_OBJECT_SUPPORT_HPP
diff --git a/src/cpp/statistics/types/types.hpp b/src/cpp/statistics/types/types.hpp
index 308a3dae3d7..eaf91edb09c 100644
--- a/src/cpp/statistics/types/types.hpp
+++ b/src/cpp/statistics/types/types.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/src/cpp/statistics/types/typesCdrAux.hpp b/src/cpp/statistics/types/typesCdrAux.hpp
index d331c557176..8f393b28038 100644
--- a/src/cpp/statistics/types/typesCdrAux.hpp
+++ b/src/cpp/statistics/types/typesCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_HPP
 
 #include "types.hpp"
 
@@ -136,5 +136,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_HPP
 
diff --git a/src/cpp/statistics/types/typesCdrAux.ipp b/src/cpp/statistics/types/typesCdrAux.ipp
index b8d5a1d7f81..f5c77ee8936 100644
--- a/src/cpp/statistics/types/typesCdrAux.ipp
+++ b/src/cpp/statistics/types/typesCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_IPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_IPP
 
 #include "typesCdrAux.hpp"
 
@@ -1744,5 +1744,5 @@ eProsima_user_DllExport void deserialize(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_IPP
 
diff --git a/src/cpp/statistics/types/typesPubSubTypes.cxx b/src/cpp/statistics/types/typesPubSubTypes.cxx
index 50151e3eede..fbc16b14e72 100644
--- a/src/cpp/statistics/types/typesPubSubTypes.cxx
+++ b/src/cpp/statistics/types/typesPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "typesPubSubTypes.h"
+#include "typesPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/src/cpp/statistics/types/typesPubSubTypes.h b/src/cpp/statistics/types/typesPubSubTypes.hpp
similarity index 96%
rename from src/cpp/statistics/types/typesPubSubTypes.h
rename to src/cpp/statistics/types/typesPubSubTypes.hpp
index 86a5046fceb..fb99b8c567d 100644
--- a/src/cpp/statistics/types/typesPubSubTypes.h
+++ b/src/cpp/statistics/types/typesPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file typesPubSubTypes.h
+ * @file typesPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "types.hpp"
 
@@ -114,7 +114,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -132,7 +132,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -205,7 +205,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -223,7 +223,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -296,7 +296,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -314,7 +314,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -387,7 +387,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -405,7 +405,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -478,7 +478,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -496,7 +496,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -569,7 +569,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -587,7 +587,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -661,7 +661,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -679,7 +679,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -752,7 +752,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -770,7 +770,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -843,7 +843,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -861,7 +861,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -934,7 +934,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -952,7 +952,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -1025,7 +1025,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -1043,7 +1043,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -1116,7 +1116,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -1134,7 +1134,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -1207,7 +1207,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -1225,7 +1225,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -1298,7 +1298,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -1316,7 +1316,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -1328,5 +1328,5 @@ namespace eprosima
     } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_HPP
 
diff --git a/src/cpp/statistics/types/typesTypeObjectSupport.hpp b/src/cpp/statistics/types/typesTypeObjectSupport.hpp
index eb9221d8af5..f137234a5d6 100644
--- a/src/cpp/statistics/types/typesTypeObjectSupport.hpp
+++ b/src/cpp/statistics/types/typesTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -250,4 +250,4 @@ eProsima_user_DllExport void register_Data_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_TYPE_OBJECT_SUPPORT_HPP
diff --git a/src/cpp/utils/Host.hpp b/src/cpp/utils/Host.hpp
index 12cf19c13f1..5dc838927f7 100644
--- a/src/cpp/utils/Host.hpp
+++ b/src/cpp/utils/Host.hpp
@@ -17,11 +17,12 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/utils/IPFinder.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/utils/IPFinder.hpp>
+#include <fastdds/utils/md5.hpp>
 
 namespace eprosima {
 
+
 /**
  * This singleton generates a host_id based on system interfaces
  * ip addresses or mac addresses
@@ -65,7 +66,7 @@ class Host
 
         if (loc.size() > 0)
         {
-            MD5 md5;
+            fastdds::MD5 md5;
             for (auto& l : loc)
             {
                 md5.update(l.address, sizeof(l.address));
@@ -106,7 +107,7 @@ class Host
         if (fastdds::rtps::IPFinder::getAllMACAddress(&macs) &&
                 macs.size() > 0)
         {
-            MD5 md5;
+            fastdds::MD5 md5;
             for (auto& m : macs)
             {
                 md5.update(m.address, sizeof(m.address));
diff --git a/src/cpp/utils/IPFinder.cpp b/src/cpp/utils/IPFinder.cpp
index ac0df526e8c..85ed485eb76 100644
--- a/src/cpp/utils/IPFinder.cpp
+++ b/src/cpp/utils/IPFinder.cpp
@@ -17,8 +17,8 @@
  *
  */
 
-#include <fastdds/utils/IPFinder.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPFinder.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <fastdds/dds/log/Log.hpp>
 
diff --git a/src/cpp/utils/IPLocator.cpp b/src/cpp/utils/IPLocator.cpp
index 9bccf278707..1ac641efdb2 100644
--- a/src/cpp/utils/IPLocator.cpp
+++ b/src/cpp/utils/IPLocator.cpp
@@ -22,8 +22,8 @@
 
 #include <asio.hpp>
 
-#include <fastdds/utils/IPLocator.h>
-#include <fastdds/utils/IPFinder.h>
+#include <fastdds/utils/IPLocator.hpp>
+#include <fastdds/utils/IPFinder.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/utils/SystemInfo.cpp b/src/cpp/utils/SystemInfo.cpp
index 8c9c26ce0fd..3cefd7f3208 100644
--- a/src/cpp/utils/SystemInfo.cpp
+++ b/src/cpp/utils/SystemInfo.cpp
@@ -37,7 +37,7 @@
 #include <nlohmann/json.hpp>
 
 #include <fastdds/dds/core/ReturnCode.hpp>
-#include <fastdds/utils/IPFinder.h>
+#include <fastdds/utils/IPFinder.hpp>
 #include <utils/threading.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/utils/SystemInfo.hpp b/src/cpp/utils/SystemInfo.hpp
index 97cbfc4fd2d..2d8a6f26f52 100644
--- a/src/cpp/utils/SystemInfo.hpp
+++ b/src/cpp/utils/SystemInfo.hpp
@@ -28,7 +28,7 @@
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
 #include <fastdds/dds/core/ReturnCode.hpp>
-#include <fastdds/utils/IPFinder.h>
+#include <fastdds/utils/IPFinder.hpp>
 #include <utils/Host.hpp>
 
 #if defined(_WIN32) || defined(__unix__)
diff --git a/src/cpp/utils/TimeConversion.hpp b/src/cpp/utils/TimeConversion.hpp
index d2c2e08f810..9872ba6377f 100644
--- a/src/cpp/utils/TimeConversion.hpp
+++ b/src/cpp/utils/TimeConversion.hpp
@@ -21,7 +21,7 @@
 #define _FASTDDS_TIMECONVERSION_H_
 
 #include <cstdint>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/utils/md5.cpp b/src/cpp/utils/md5.cpp
index c80ac4cb11a..a999b3958b6 100644
--- a/src/cpp/utils/md5.cpp
+++ b/src/cpp/utils/md5.cpp
@@ -32,12 +32,14 @@
  */
 
 /* interface header */
-#include <fastdds/utils/md5.h>
+#include <fastdds/utils/md5.hpp>
 
 /* system implementation headers */
 #include <cstdio>
 #include <stdio.h>
 
+namespace eprosima {
+namespace fastdds {
 
 // Constants for MD5Transform routine.
 #define S11 7
@@ -451,3 +453,6 @@ std::string md5(
 
     return md5.hexdigest();
 }
+
+}   // namespace fastdds
+}   // namespace eprosima
diff --git a/src/cpp/utils/shared_memory/SharedMemSegment.hpp b/src/cpp/utils/shared_memory/SharedMemSegment.hpp
index 81a491d4c21..96b812b8008 100644
--- a/src/cpp/utils/shared_memory/SharedMemSegment.hpp
+++ b/src/cpp/utils/shared_memory/SharedMemSegment.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_SHAREDMEM_SEGMENT_H_
-#define _FASTDDS_SHAREDMEM_SEGMENT_H_
+#ifndef FASTDDS_UTILS_SHARED_MEMORY__SHAREDMEMSEGMENT_HPP
+#define FASTDDS_UTILS_SHARED_MEMORY__SHAREDMEMSEGMENT_HPP
 
 #include <boostconfig.hpp>
 
@@ -483,4 +483,4 @@ using SharedFileSegment = SharedSegment<
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_SHAREDMEM_SEGMENT_H_
+#endif // FASTDDS_UTILS_SHARED_MEMORY__SHAREDMEMSEGMENT_HPP
diff --git a/src/cpp/xmlparser/XMLElementParser.cpp b/src/cpp/xmlparser/XMLElementParser.cpp
index 65230fef58c..d4d8df13c3c 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 <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <utils/string_utilities.hpp>
 #include <utils/SystemInfo.hpp>
diff --git a/src/cpp/xmlparser/XMLEndpointParser.cpp b/src/cpp/xmlparser/XMLEndpointParser.cpp
index 366ceba5afa..9d7795fb407 100644
--- a/src/cpp/xmlparser/XMLEndpointParser.cpp
+++ b/src/cpp/xmlparser/XMLEndpointParser.cpp
@@ -25,9 +25,9 @@
 #include <tinyxml2.h>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <utils/TimeConversion.hpp>
 #include <xmlparser/XMLParserUtils.hpp>
diff --git a/src/cpp/xmlparser/XMLEndpointParser.h b/src/cpp/xmlparser/XMLEndpointParser.h
index 6f7befdeab6..0f7d0e33c19 100644
--- a/src/cpp/xmlparser/XMLEndpointParser.h
+++ b/src/cpp/xmlparser/XMLEndpointParser.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef XMLENDPOINTPARSER_H_
-#define XMLENDPOINTPARSER_H_
+#ifndef FASTDDS_XMLPARSER__XMLENDPOINTPARSER_H
+#define FASTDDS_XMLPARSER__XMLENDPOINTPARSER_H
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <cstdint>
@@ -28,8 +28,8 @@
 
 #include <tinyxml2.h>
 
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 
 #include <xmlparser/XMLParserCommon.h>
 #include <xmlparser/XMLParser.h>
@@ -158,9 +158,9 @@ class XMLEndpointParser : XMLParser
 };
 
 
-} /* xmlparser */
-} /* namespace */
-} /* namespace eprosima */
+} // namespace xmlparser
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* XMLENDPOINTPARSER_H_ */
+#endif // FASTDDS_XMLPARSER__XMLENDPOINTPARSER_H
diff --git a/src/cpp/xmlparser/XMLParser.cpp b/src/cpp/xmlparser/XMLParser.cpp
index 7b20e390580..4ff44b9fa1c 100644
--- a/src/cpp/xmlparser/XMLParser.cpp
+++ b/src/cpp/xmlparser/XMLParser.cpp
@@ -32,11 +32,11 @@
 #include <fastdds/LibrarySettings.hpp>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
 
 #include <rtps/network/utils/netmask_filter.hpp>
 #include <xmlparser/XMLParserUtils.hpp>
diff --git a/src/cpp/xmlparser/XMLParser.h b/src/cpp/xmlparser/XMLParser.h
index 27646091c10..398129476a8 100644
--- a/src/cpp/xmlparser/XMLParser.h
+++ b/src/cpp/xmlparser/XMLParser.h
@@ -28,8 +28,8 @@
 #include <fastdds/LibrarySettings.hpp>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
 #include <fastdds/rtps/transport/PortBasedTransportDescriptor.hpp>
-#include <fastdds/rtps/transport/SocketTransportDescriptor.h>
-#include <fastdds/rtps/transport/TransportDescriptorInterface.h>
+#include <fastdds/rtps/transport/SocketTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TransportDescriptorInterface.hpp>
 
 #include <xmlparser/attributes/ParticipantAttributes.hpp>
 #include <xmlparser/attributes/PublisherAttributes.hpp>
diff --git a/src/cpp/xmlparser/XMLProfileManager.h b/src/cpp/xmlparser/XMLProfileManager.h
index bd7196a8df8..9bf7a94368c 100644
--- a/src/cpp/xmlparser/XMLProfileManager.h
+++ b/src/cpp/xmlparser/XMLProfileManager.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#ifndef XML_PROFILE_MANAGER_H_
-#define XML_PROFILE_MANAGER_H_
+#ifndef FASTDDS_XMLPARSER__XMLPROFILEMANAGER_H
+#define FASTDDS_XMLPARSER__XMLPROFILEMANAGER_H
 
 #include <cstdio>
 #include <map>
@@ -320,8 +320,8 @@ class XMLProfileManager
     static p_dynamictype_map_t dynamic_types_;
 };
 
-} /* xmlparser */
-} /* namespace */
-} /* namespace eprosima */
+} // namespace xmlparser
+} // namespace fastdds
+} // namespace eprosima
 
-#endif // ifndef XML_PROFILE_MANAGER_H_
+#endif // FASTDDS_XMLPARSER__XMLPROFILEMANAGER_H
diff --git a/src/cpp/xmlparser/attributes/ParticipantAttributes.hpp b/src/cpp/xmlparser/attributes/ParticipantAttributes.hpp
index 2274a9ad0c6..5bf493eac1b 100644
--- a/src/cpp/xmlparser/attributes/ParticipantAttributes.hpp
+++ b/src/cpp/xmlparser/attributes/ParticipantAttributes.hpp
@@ -20,7 +20,7 @@
 #ifndef _FASTDDS_PARTICIPANTATTRIBUTES_H_
 #define _FASTDDS_PARTICIPANTATTRIBUTES_H_
 
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/xmlparser/attributes/PublisherAttributes.hpp b/src/cpp/xmlparser/attributes/PublisherAttributes.hpp
index e04b5dcb52a..06c556ba4ee 100644
--- a/src/cpp/xmlparser/attributes/PublisherAttributes.hpp
+++ b/src/cpp/xmlparser/attributes/PublisherAttributes.hpp
@@ -19,15 +19,15 @@
 #ifndef _FASTDDS_PUBLISHERATTRIBUTES_H_
 #define _FASTDDS_PUBLISHERATTRIBUTES_H_
 
-#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #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/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp b/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp
index 3b6d02e0966..54ccd1d2375 100644
--- a/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp
+++ b/src/cpp/xmlparser/attributes/SubscriberAttributes.hpp
@@ -21,12 +21,12 @@
 
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
 #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/Locator.h>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
 #include <fastdds/rtps/attributes/ResourceManagement.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/blackbox/api/dds-pim/PubSubParticipant.hpp b/test/blackbox/api/dds-pim/PubSubParticipant.hpp
index 1b0eefe46aa..6a3eb0cd70e 100644
--- a/test/blackbox/api/dds-pim/PubSubParticipant.hpp
+++ b/test/blackbox/api/dds-pim/PubSubParticipant.hpp
@@ -40,7 +40,7 @@
 #include <fastdds/dds/subscriber/DataReaderListener.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 
 /**
  * @brief A class with one participant that can have multiple publishers and subscribers
diff --git a/test/blackbox/api/dds-pim/PubSubReader.hpp b/test/blackbox/api/dds-pim/PubSubReader.hpp
index 28ea48cc0d1..b7170637fe8 100644
--- a/test/blackbox/api/dds-pim/PubSubReader.hpp
+++ b/test/blackbox/api/dds-pim/PubSubReader.hpp
@@ -53,12 +53,12 @@
 #include <fastdds/dds/topic/ContentFilteredTopic.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TopicDescription.hpp>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPTransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 using eprosima::fastdds::dds::DomainParticipantFactory;
 using eprosima::fastdds::dds::ReturnCode_t;
diff --git a/test/blackbox/api/dds-pim/PubSubWriter.hpp b/test/blackbox/api/dds-pim/PubSubWriter.hpp
index 71fa7057152..c88bddcc356 100644
--- a/test/blackbox/api/dds-pim/PubSubWriter.hpp
+++ b/test/blackbox/api/dds-pim/PubSubWriter.hpp
@@ -48,12 +48,12 @@
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/rtps/flowcontrol/FlowControllerSchedulerPolicy.hpp>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPTransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 using eprosima::fastdds::dds::DomainParticipantFactory;
 using eprosima::fastdds::rtps::UDPTransportDescriptor;
diff --git a/test/blackbox/api/dds-pim/PubSubWriterReader.hpp b/test/blackbox/api/dds-pim/PubSubWriterReader.hpp
index a525032f539..98d78e3ec12 100644
--- a/test/blackbox/api/dds-pim/PubSubWriterReader.hpp
+++ b/test/blackbox/api/dds-pim/PubSubWriterReader.hpp
@@ -34,7 +34,7 @@
 #include <fastdds/dds/subscriber/DataReaderListener.hpp>
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
-#include <fastdds/rtps/transport/TransportDescriptorInterface.h>
+#include <fastdds/rtps/transport/TransportDescriptorInterface.hpp>
 
 #include <string>
 #include <list>
diff --git a/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp b/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp
index 9565dae83ba..0af4799f8e4 100644
--- a/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp
+++ b/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp
@@ -30,7 +30,7 @@
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
-#include <fastdds/rtps/common/WriteParams.h>
+#include <fastdds/rtps/common/WriteParams.hpp>
 
 #include "../../common/BlackboxTests.hpp"
 
diff --git a/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.hpp b/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.hpp
index 31ddddbd280..04668fc5fea 100644
--- a/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.hpp
+++ b/test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.hpp
@@ -20,7 +20,7 @@
 #ifndef _TEST_BLACKBOX_REQREPHELLOWORLDREPLIER_HPP_
 #define _TEST_BLACKBOX_REQREPHELLOWORLDREPLIER_HPP_
 
-#include "../../types/HelloWorldPubSubTypes.h"
+#include "../../types/HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/subscriber/DataReaderListener.hpp>
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
diff --git a/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp b/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp
index d72a6d0c12f..3249cbeac11 100644
--- a/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp
+++ b/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp
@@ -30,7 +30,7 @@
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
-#include <fastdds/rtps/common/WriteParams.h>
+#include <fastdds/rtps/common/WriteParams.hpp>
 
 #include "../../common/BlackboxTests.hpp"
 
diff --git a/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.hpp b/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.hpp
index dc33540ba5d..8c7b9f21287 100644
--- a/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.hpp
+++ b/test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.hpp
@@ -20,7 +20,7 @@
 #ifndef _TEST_BLACKBOX_REQREPHELLOWORLDREQUESTER_HPP_
 #define _TEST_BLACKBOX_REQREPHELLOWORLDREQUESTER_HPP_
 
-#include "../../types/HelloWorldPubSubTypes.h"
+#include "../../types/HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/subscriber/DataReader.hpp>
 #include <fastdds/dds/subscriber/DataReaderListener.hpp>
diff --git a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp
index bcda9eca040..b14023f1c68 100644
--- a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp
+++ b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp
@@ -30,10 +30,10 @@
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
-#include <fastdds/rtps/common/WriteParams.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/common/WriteParams.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include "../../common/BlackboxTests.hpp"
 
diff --git a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.hpp b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.hpp
index 79fb0b270f7..5a3924b718d 100644
--- a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.hpp
+++ b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.hpp
@@ -20,7 +20,7 @@
 #ifndef _TEST_BLACKBOX_TCPReqRepHelloWorldReplier_HPP_
 #define _TEST_BLACKBOX_TCPReqRepHelloWorldReplier_HPP_
 
-#include "../../types/HelloWorldPubSubTypes.h"
+#include "../../types/HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/subscriber/DataReader.hpp>
 #include <fastdds/dds/subscriber/DataReaderListener.hpp>
diff --git a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp
index 2dfcd2de409..901ca78e6ba 100644
--- a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp
+++ b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp
@@ -29,11 +29,11 @@
 #include <fastdds/dds/subscriber/DataReader.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
-#include <fastdds/rtps/common/WriteParams.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/utils/IPFinder.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/common/WriteParams.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/utils/IPFinder.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include "../../common/BlackboxTests.hpp"
 
diff --git a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.hpp b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.hpp
index 037f7a8ebd0..17a73a2908d 100644
--- a/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.hpp
+++ b/test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.hpp
@@ -20,7 +20,7 @@
 #ifndef _TEST_BLACKBOX_TCPReqRepHelloWorldRequester_HPP_
 #define _TEST_BLACKBOX_TCPReqRepHelloWorldRequester_HPP_
 
-#include "../../types/HelloWorldPubSubTypes.h"
+#include "../../types/HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/subscriber/DataReader.hpp>
 #include <fastdds/dds/subscriber/DataReaderListener.hpp>
diff --git a/test/blackbox/common/BlackboxTests.cpp b/test/blackbox/common/BlackboxTests.cpp
index 0daa51f0d1c..167f1ac0b07 100644
--- a/test/blackbox/common/BlackboxTests.cpp
+++ b/test/blackbox/common/BlackboxTests.cpp
@@ -24,7 +24,7 @@
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
 
 using namespace eprosima::fastdds;
 using namespace eprosima::fastdds::rtps;
diff --git a/test/blackbox/common/BlackboxTests.hpp b/test/blackbox/common/BlackboxTests.hpp
index 8ad5dbd201a..a44174cab67 100644
--- a/test/blackbox/common/BlackboxTests.hpp
+++ b/test/blackbox/common/BlackboxTests.hpp
@@ -31,15 +31,15 @@
 #include <unistd.h>
 #endif // if defined(_WIN32)
 
-#include "../types/Data1mbPubSubTypes.h"
-#include "../types/Data64kbPubSubTypes.h"
-#include "../types/FixedSizedPubSubTypes.h"
-#include "../types/HelloWorldPubSubTypes.h"
-#include "../types/KeyedData1mbPubSubTypes.h"
-#include "../types/KeyedHelloWorldPubSubTypes.h"
-#include "../types/core/core_typesPubSubTypes.h"
-#include "../types/StringTestPubSubTypes.h"
-#include "../types/UnboundedHelloWorldPubSubTypes.h"
+#include "../types/Data1mbPubSubTypes.hpp"
+#include "../types/Data64kbPubSubTypes.hpp"
+#include "../types/FixedSizedPubSubTypes.hpp"
+#include "../types/HelloWorldPubSubTypes.hpp"
+#include "../types/KeyedData1mbPubSubTypes.hpp"
+#include "../types/KeyedHelloWorldPubSubTypes.hpp"
+#include "../types/core/core_typesPubSubTypes.hpp"
+#include "../types/StringTestPubSubTypes.hpp"
+#include "../types/UnboundedHelloWorldPubSubTypes.hpp"
 
 #include <algorithm>
 #include <cstddef>
diff --git a/test/blackbox/common/BlackboxTestsDiscovery.cpp b/test/blackbox/common/BlackboxTestsDiscovery.cpp
index 079619e8127..dd60905badf 100644
--- a/test/blackbox/common/BlackboxTestsDiscovery.cpp
+++ b/test/blackbox/common/BlackboxTestsDiscovery.cpp
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
-#include "fastdds/rtps/messages/RTPS_messages.h"
 #include <atomic>
 #include <thread>
 
@@ -30,10 +28,11 @@
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
-#include <fastdds/rtps/attributes/ServerAttributes.h>
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/attributes/ServerAttributes.hpp>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/messages/RTPS_messages.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
 #include "../utils/filter_helpers.hpp"
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/BlackboxTestsKeys.cpp b/test/blackbox/common/BlackboxTestsKeys.cpp
index 760c0b23376..e7b205e2d06 100644
--- a/test/blackbox/common/BlackboxTestsKeys.cpp
+++ b/test/blackbox/common/BlackboxTestsKeys.cpp
@@ -14,8 +14,8 @@
 
 #include "BlackboxTests.hpp"
 
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 
 #include "../utils/filter_helpers.hpp"
 #include "PubSubReader.hpp"
diff --git a/test/blackbox/common/BlackboxTestsLivelinessQos.cpp b/test/blackbox/common/BlackboxTestsLivelinessQos.cpp
index c9efde56dbc..2a544ad995c 100644
--- a/test/blackbox/common/BlackboxTestsLivelinessQos.cpp
+++ b/test/blackbox/common/BlackboxTestsLivelinessQos.cpp
@@ -16,7 +16,7 @@
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <gtest/gtest.h>
 
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/BlackboxTestsNetworkConf.cpp b/test/blackbox/common/BlackboxTestsNetworkConf.cpp
index 0dd775be1cd..16d2ae17b56 100644
--- a/test/blackbox/common/BlackboxTestsNetworkConf.cpp
+++ b/test/blackbox/common/BlackboxTestsNetworkConf.cpp
@@ -16,8 +16,8 @@
 #include <string>
 
 #include <gtest/gtest.h>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/utils/IPFinder.h>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/utils/IPFinder.hpp>
 
 #include "BlackboxTests.hpp"
 #include "PubSubReader.hpp"
diff --git a/test/blackbox/common/BlackboxTestsPubSubFragments.cpp b/test/blackbox/common/BlackboxTestsPubSubFragments.cpp
index 7686f982927..f596f8dcd30 100644
--- a/test/blackbox/common/BlackboxTestsPubSubFragments.cpp
+++ b/test/blackbox/common/BlackboxTestsPubSubFragments.cpp
@@ -15,7 +15,7 @@
 #include <thread>
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/LibrarySettings.hpp>
 
diff --git a/test/blackbox/common/BlackboxTestsPubSubHistory.cpp b/test/blackbox/common/BlackboxTestsPubSubHistory.cpp
index 34064ec54f3..f61898d91aa 100644
--- a/test/blackbox/common/BlackboxTestsPubSubHistory.cpp
+++ b/test/blackbox/common/BlackboxTestsPubSubHistory.cpp
@@ -18,8 +18,8 @@
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <gtest/gtest.h>
 
 #include "../utils/filter_helpers.hpp"
diff --git a/test/blackbox/common/BlackboxTestsReliability.cpp b/test/blackbox/common/BlackboxTestsReliability.cpp
index 691b2eda91c..8db3ec59092 100644
--- a/test/blackbox/common/BlackboxTestsReliability.cpp
+++ b/test/blackbox/common/BlackboxTestsReliability.cpp
@@ -14,8 +14,8 @@
 
 #include <thread>
 
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <gtest/gtest.h>
 
 #include "../utils/filter_helpers.hpp"
diff --git a/test/blackbox/common/BlackboxTestsSecurity.cpp b/test/blackbox/common/BlackboxTestsSecurity.cpp
index 1cfc866074c..706c4f7e7a0 100644
--- a/test/blackbox/common/BlackboxTestsSecurity.cpp
+++ b/test/blackbox/common/BlackboxTestsSecurity.cpp
@@ -25,8 +25,8 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/LibrarySettings.hpp>
 #include <fastdds/rtps/common/EntityId_t.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <gtest/gtest.h>
 
 #include "../utils/filter_helpers.hpp"
diff --git a/test/blackbox/common/BlackboxTestsTransportCustom.cpp b/test/blackbox/common/BlackboxTestsTransportCustom.cpp
index 30541f7ef87..020f11ace1b 100644
--- a/test/blackbox/common/BlackboxTestsTransportCustom.cpp
+++ b/test/blackbox/common/BlackboxTestsTransportCustom.cpp
@@ -18,10 +18,10 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/transport/ChainingTransportDescriptor.h>
-#include <fastdds/rtps/transport/ChainingTransport.h>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/ChainingTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/ChainingTransport.hpp>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
 #include <fastdds/rtps/transport/NetworkBuffer.hpp>
 
 #include "PubSubReader.hpp"
diff --git a/test/blackbox/common/BlackboxTestsTransportSHM.cpp b/test/blackbox/common/BlackboxTestsTransportSHM.cpp
index 1c295539edc..710b8364890 100644
--- a/test/blackbox/common/BlackboxTestsTransportSHM.cpp
+++ b/test/blackbox/common/BlackboxTestsTransportSHM.cpp
@@ -23,8 +23,8 @@
 #include "./mock/BlackboxMockConsumer.h"
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/test_SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 #include <gtest/gtest.h>
 
 using namespace eprosima::fastdds;
diff --git a/test/blackbox/common/BlackboxTestsTransportTCP.cpp b/test/blackbox/common/BlackboxTestsTransportTCP.cpp
index faced37a5d7..15dad6e10e0 100644
--- a/test/blackbox/common/BlackboxTestsTransportTCP.cpp
+++ b/test/blackbox/common/BlackboxTestsTransportTCP.cpp
@@ -20,8 +20,8 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
 
 #include "../api/dds-pim/TCPReqRepHelloWorldRequester.hpp"
 #include "../api/dds-pim/TCPReqRepHelloWorldReplier.hpp"
diff --git a/test/blackbox/common/BlackboxTestsTransportUDP.cpp b/test/blackbox/common/BlackboxTestsTransportUDP.cpp
index 19ac9ee9b82..18907f4bb35 100644
--- a/test/blackbox/common/BlackboxTestsTransportUDP.cpp
+++ b/test/blackbox/common/BlackboxTestsTransportUDP.cpp
@@ -19,9 +19,9 @@
 #include <gtest/gtest.h>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastdds/utils/IPFinder.h>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
+#include <fastdds/utils/IPFinder.hpp>
 
 #include "BlackboxTests.hpp"
 #include "DatagramInjectionTransport.hpp"
diff --git a/test/blackbox/common/BlackboxTestsVolatile.cpp b/test/blackbox/common/BlackboxTestsVolatile.cpp
index 0a5e16e13b5..7137f23e716 100644
--- a/test/blackbox/common/BlackboxTestsVolatile.cpp
+++ b/test/blackbox/common/BlackboxTestsVolatile.cpp
@@ -14,8 +14,8 @@
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <gtest/gtest.h>
 
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp b/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp
index 9f402e67464..a68b6ee5f2e 100644
--- a/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp
@@ -35,8 +35,8 @@
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 
 #include "BlackboxTests.hpp"
 #include "../api/dds-pim/CustomPayloadPool.hpp"
@@ -45,8 +45,8 @@
 #include "../api/dds-pim/ReqRepAsReliableHelloWorldRequester.hpp"
 #include "../api/dds-pim/ReqRepAsReliableHelloWorldReplier.hpp"
 #include "../types/FixedSized.hpp"
-#include "../types/FixedSizedPubSubTypes.h"
-#include "../types/HelloWorldPubSubTypes.h"
+#include "../types/FixedSizedPubSubTypes.hpp"
+#include "../types/HelloWorldPubSubTypes.hpp"
 
 using namespace eprosima::fastdds;
 using namespace eprosima::fastdds::rtps;
diff --git a/test/blackbox/common/DDSBlackboxTestsBasic.cpp b/test/blackbox/common/DDSBlackboxTestsBasic.cpp
index dee1708a07c..91c8fea153a 100644
--- a/test/blackbox/common/DDSBlackboxTestsBasic.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsBasic.cpp
@@ -38,8 +38,8 @@
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 
 #include "../utils/filter_helpers.hpp"
 #include "BlackboxTests.hpp"
@@ -49,8 +49,8 @@
 #include "../api/dds-pim/PubSubWriter.hpp"
 #include "../api/dds-pim/PubSubWriterReader.hpp"
 #include "../types/FixedSized.hpp"
-#include "../types/FixedSizedPubSubTypes.h"
-#include "../types/HelloWorldPubSubTypes.h"
+#include "../types/FixedSizedPubSubTypes.hpp"
+#include "../types/HelloWorldPubSubTypes.hpp"
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/blackbox/common/DDSBlackboxTestsContentFilter.cpp b/test/blackbox/common/DDSBlackboxTestsContentFilter.cpp
index f38133c3c9b..1ffcd52eb60 100644
--- a/test/blackbox/common/DDSBlackboxTestsContentFilter.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsContentFilter.cpp
@@ -27,12 +27,12 @@
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <gtest/gtest.h>
 
 #include "../types/HelloWorldTypeObjectSupport.hpp"
-#include "../types/TestRegression3361PubSubTypes.h"
+#include "../types/TestRegression3361PubSubTypes.hpp"
 #include "../types/TestRegression3361TypeObjectSupport.hpp"
 #include "../utils/filter_helpers.hpp"
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/DDSBlackboxTestsDataReader.cpp b/test/blackbox/common/DDSBlackboxTestsDataReader.cpp
index 040efc430c0..b07679cb436 100644
--- a/test/blackbox/common/DDSBlackboxTestsDataReader.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsDataReader.cpp
@@ -28,8 +28,8 @@
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 
 #include "../utils/filter_helpers.hpp"
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/DDSBlackboxTestsDataSharing.cpp b/test/blackbox/common/DDSBlackboxTestsDataSharing.cpp
index f7e44b809ee..1f22b85a075 100644
--- a/test/blackbox/common/DDSBlackboxTestsDataSharing.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsDataSharing.cpp
@@ -19,7 +19,7 @@
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <gtest/gtest.h>
 
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/DDSBlackboxTestsDataWriter.cpp b/test/blackbox/common/DDSBlackboxTestsDataWriter.cpp
index 91ed70bcd75..24eb291619a 100644
--- a/test/blackbox/common/DDSBlackboxTestsDataWriter.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsDataWriter.cpp
@@ -30,7 +30,7 @@
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 
 #include "BlackboxTests.hpp"
 #include "PubSubReader.hpp"
diff --git a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
index de61fe1d6e6..ac4e9517e05 100644
--- a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
@@ -30,10 +30,10 @@
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <gtest/gtest.h>
 
 #include "../utils/filter_helpers.hpp"
diff --git a/test/blackbox/common/DDSBlackboxTestsListeners.cpp b/test/blackbox/common/DDSBlackboxTestsListeners.cpp
index e8463a69112..8fad1df288f 100644
--- a/test/blackbox/common/DDSBlackboxTestsListeners.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsListeners.cpp
@@ -21,9 +21,9 @@
 #include <fastdds/dds/core/condition/WaitSet.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
 #include "../utils/filter_helpers.hpp"
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp b/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp
index 9e101b6c9ef..a066a6f8e5a 100644
--- a/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <fastdds/statistics/dds/domain/DomainParticipant.hpp>
 #include <fastdds/statistics/topic_names.hpp>
 #include <gtest/gtest.h>
@@ -20,7 +20,7 @@
 // TODO(jlbueno): remove private header
 #include <statistics/rtps/StatisticsBase.hpp>
 
-#include "../types/statistics/monitorservice_typesPubSubTypes.h"
+#include "../types/statistics/monitorservice_typesPubSubTypes.hpp"
 #include "BlackboxTests.hpp"
 #include "PubSubReader.hpp"
 #include "PubSubWriter.hpp"
diff --git a/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp b/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp
index 33bae93f6ea..375c6bad2ba 100644
--- a/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsOwnershipQos.cpp
@@ -16,7 +16,7 @@
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <gtest/gtest.h>
 
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp b/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp
index d0927be49f1..31a625d89c1 100644
--- a/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp
@@ -14,8 +14,8 @@
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 #include <gtest/gtest.h>
 
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/DDSBlackboxTestsSecurity.cpp b/test/blackbox/common/DDSBlackboxTestsSecurity.cpp
index 2175b9e6143..d0490c8c9c1 100644
--- a/test/blackbox/common/DDSBlackboxTestsSecurity.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsSecurity.cpp
@@ -31,7 +31,7 @@
 #include <fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilder.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
 namespace fastdds = ::eprosima::fastdds::dds;
 using namespace eprosima::fastdds;
diff --git a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp
index 289bce65ee8..c87d4397cb3 100644
--- a/test/blackbox/common/DDSBlackboxTestsStatistics.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsStatistics.cpp
@@ -41,21 +41,21 @@
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TopicDescription.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/common/EntityId_t.hpp>
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 #include <fastdds/statistics/dds/domain/DomainParticipant.hpp>
 #include <fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/statistics/dds/subscriber/qos/DataReaderQos.hpp>
 #include <fastdds/statistics/topic_names.hpp>
 
 #include "../types/HelloWorld.hpp"
-#include "../types/HelloWorldPubSubTypes.h"
+#include "../types/HelloWorldPubSubTypes.hpp"
 #include "../types/statistics/types.hpp"
-#include "../types/statistics/typesPubSubTypes.h"
+#include "../types/statistics/typesPubSubTypes.hpp"
 #include "BlackboxTests.hpp"
 #include "PubSubReader.hpp"
 #include "PubSubWriter.hpp"
diff --git a/test/blackbox/common/DDSBlackboxTestsStatisticsDomainParticipant.cpp b/test/blackbox/common/DDSBlackboxTestsStatisticsDomainParticipant.cpp
index 83d5882f274..d3798d687c4 100644
--- a/test/blackbox/common/DDSBlackboxTestsStatisticsDomainParticipant.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsStatisticsDomainParticipant.cpp
@@ -23,7 +23,7 @@
 #include <gtest/gtest.h>
 
 #include "../types/statistics/types.hpp"
-#include "../types/statistics/typesPubSubTypes.h"
+#include "../types/statistics/typesPubSubTypes.hpp"
 #include "BlackboxTests.hpp"
 #include "PubSubReader.hpp"
 
diff --git a/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp b/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp
index 9088b66c423..993fc1a888a 100644
--- a/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp
@@ -21,8 +21,8 @@
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <gtest/gtest.h>
 
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp b/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp
index 80cf8c10eff..d37ed646397 100644
--- a/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp
@@ -14,8 +14,8 @@
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 #include <gtest/gtest.h>
 
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/DatagramInjectionTransport.hpp b/test/blackbox/common/DatagramInjectionTransport.hpp
index 98c850f4ecb..ffde2054af7 100644
--- a/test/blackbox/common/DatagramInjectionTransport.hpp
+++ b/test/blackbox/common/DatagramInjectionTransport.hpp
@@ -16,10 +16,10 @@
 #include <mutex>
 #include <set>
 
-#include <fastdds/rtps/transport/ChainingTransport.h>
-#include <fastdds/rtps/transport/ChainingTransportDescriptor.h>
-#include <fastdds/rtps/transport/SenderResource.h>
-#include <fastdds/rtps/transport/TransportReceiverInterface.h>
+#include <fastdds/rtps/transport/ChainingTransport.hpp>
+#include <fastdds/rtps/transport/ChainingTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/SenderResource.hpp>
+#include <fastdds/rtps/transport/TransportReceiverInterface.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/blackbox/common/RTPSAsSocketReader.hpp b/test/blackbox/common/RTPSAsSocketReader.hpp
index 11f2f2d4994..edfb01f0091 100644
--- a/test/blackbox/common/RTPSAsSocketReader.hpp
+++ b/test/blackbox/common/RTPSAsSocketReader.hpp
@@ -38,18 +38,18 @@
 #include <fastcdr/Cdr.h>
 #include <fastcdr/FastBuffer.h>
 
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/common/SequenceNumber.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 <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+
+#include <fastdds/utils/IPLocator.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 #include <gtest/gtest.h>
 
@@ -160,7 +160,7 @@ class RTPSAsSocketReader
         ASSERT_NE(reader_, nullptr);
 
         register_writer();
-        
+
         initialized_ = true;
     }
 
diff --git a/test/blackbox/common/RTPSAsSocketWriter.hpp b/test/blackbox/common/RTPSAsSocketWriter.hpp
index edfe50f707a..4e699237274 100644
--- a/test/blackbox/common/RTPSAsSocketWriter.hpp
+++ b/test/blackbox/common/RTPSAsSocketWriter.hpp
@@ -30,17 +30,17 @@
 #include <fastcdr/Cdr.h>
 #include <fastcdr/FastBuffer.h>
 
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.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 <fastdds/rtps/writer/WriterListener.h>
-
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
+#include <fastdds/rtps/writer/WriterListener.hpp>
+
+#include <fastdds/utils/IPLocator.hpp>
 
 using eprosima::fastdds::rtps::IPLocator;
 
diff --git a/test/blackbox/common/RTPSBlackboxTests.cpp b/test/blackbox/common/RTPSBlackboxTests.cpp
index 525748bf4cf..e5bf3ac2595 100644
--- a/test/blackbox/common/RTPSBlackboxTests.cpp
+++ b/test/blackbox/common/RTPSBlackboxTests.cpp
@@ -19,7 +19,7 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
 #include <gtest/gtest.h>
 
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/RTPSBlackboxTestsBasic.cpp b/test/blackbox/common/RTPSBlackboxTestsBasic.cpp
index 278ef3be793..bad6ed1d0dc 100644
--- a/test/blackbox/common/RTPSBlackboxTestsBasic.cpp
+++ b/test/blackbox/common/RTPSBlackboxTestsBasic.cpp
@@ -20,13 +20,13 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
-#include <fastdds/rtps/common/CDRMessage_t.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
 #include <fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 #include <gtest/gtest.h>
 
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/RTPSBlackboxTestsDiscovery.cpp b/test/blackbox/common/RTPSBlackboxTestsDiscovery.cpp
index 8c2ee6d91f8..85a621c7873 100644
--- a/test/blackbox/common/RTPSBlackboxTestsDiscovery.cpp
+++ b/test/blackbox/common/RTPSBlackboxTestsDiscovery.cpp
@@ -15,7 +15,7 @@
 #include "BlackboxTests.hpp"
 
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
 #include <gtest/gtest.h>
 
 #include "RTPSWithRegistrationReader.hpp"
diff --git a/test/blackbox/common/RTPSBlackboxTestsMonitorService.cpp b/test/blackbox/common/RTPSBlackboxTestsMonitorService.cpp
index 0536223aca3..ee2b5948475 100644
--- a/test/blackbox/common/RTPSBlackboxTestsMonitorService.cpp
+++ b/test/blackbox/common/RTPSBlackboxTestsMonitorService.cpp
@@ -16,9 +16,9 @@
 
 #include "BlackboxTests.hpp"
 
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 
 using namespace eprosima::fastdds::rtps;
 
diff --git a/test/blackbox/common/RTPSBlackboxTestsPersistence.cpp b/test/blackbox/common/RTPSBlackboxTestsPersistence.cpp
index ebeafdfc153..33b05007505 100644
--- a/test/blackbox/common/RTPSBlackboxTestsPersistence.cpp
+++ b/test/blackbox/common/RTPSBlackboxTestsPersistence.cpp
@@ -18,7 +18,7 @@
 #include <thread>
 
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
 #include <gtest/gtest.h>
 
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/RTPSBlackboxTestsPersistenceGuid.cpp b/test/blackbox/common/RTPSBlackboxTestsPersistenceGuid.cpp
index f6d122f4eea..ceddac2cf92 100644
--- a/test/blackbox/common/RTPSBlackboxTestsPersistenceGuid.cpp
+++ b/test/blackbox/common/RTPSBlackboxTestsPersistenceGuid.cpp
@@ -20,7 +20,7 @@
 #include <thread>
 
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
 #include <gtest/gtest.h>
 
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/RTPSBlackboxTestsPools.cpp b/test/blackbox/common/RTPSBlackboxTestsPools.cpp
index ef0574dd7d7..c5f74f6f2c0 100644
--- a/test/blackbox/common/RTPSBlackboxTestsPools.cpp
+++ b/test/blackbox/common/RTPSBlackboxTestsPools.cpp
@@ -16,7 +16,7 @@
 #include <vector>
 
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
 #include <gtest/gtest.h>
 
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/RTPSBlackboxTestsVolatile.cpp b/test/blackbox/common/RTPSBlackboxTestsVolatile.cpp
index 74db064b8cc..aa31e76b3d4 100644
--- a/test/blackbox/common/RTPSBlackboxTestsVolatile.cpp
+++ b/test/blackbox/common/RTPSBlackboxTestsVolatile.cpp
@@ -16,7 +16,7 @@
 #include <thread>
 
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
 #include <gtest/gtest.h>
 
 #include "BlackboxTests.hpp"
diff --git a/test/blackbox/common/RTPSWithRegistrationReader.hpp b/test/blackbox/common/RTPSWithRegistrationReader.hpp
index d8bad599752..f2b3b253b90 100644
--- a/test/blackbox/common/RTPSWithRegistrationReader.hpp
+++ b/test/blackbox/common/RTPSWithRegistrationReader.hpp
@@ -31,18 +31,18 @@
 #include <fastcdr/FastBuffer.h>
 
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
-#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 <fastdds/utils/IPFinder.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+
+#include <fastdds/utils/IPFinder.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 #include <gtest/gtest.h>
 
diff --git a/test/blackbox/common/RTPSWithRegistrationWriter.hpp b/test/blackbox/common/RTPSWithRegistrationWriter.hpp
index 7b6fd3436fd..6949a0c33ed 100644
--- a/test/blackbox/common/RTPSWithRegistrationWriter.hpp
+++ b/test/blackbox/common/RTPSWithRegistrationWriter.hpp
@@ -30,17 +30,17 @@
 #include <gtest/gtest.h>
 
 #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/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/transport/TransportDescriptorInterface.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/transport/TransportDescriptorInterface.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 
 template<class TypeSupport>
 class RTPSWithRegistrationWriter
diff --git a/test/blackbox/common/UDPMessageSender.hpp b/test/blackbox/common/UDPMessageSender.hpp
index d80ecf115b5..957f4958c45 100644
--- a/test/blackbox/common/UDPMessageSender.hpp
+++ b/test/blackbox/common/UDPMessageSender.hpp
@@ -1,8 +1,8 @@
 #include <asio/io_service.hpp>
 #include <asio/ip/udp.hpp>
 
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 using namespace eprosima::fastdds;
 using namespace eprosima::fastdds::rtps;
diff --git a/test/blackbox/types/Data1mb.hpp b/test/blackbox/types/Data1mb.hpp
index 2bd35a24a42..bccaa4d2735 100644
--- a/test/blackbox/types/Data1mb.hpp
+++ b/test/blackbox/types/Data1mb.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DATA1MB_HPP_
-#define _FAST_DDS_GENERATED_DATA1MB_HPP_
+#ifndef FAST_DDS_GENERATED__DATA1MB_HPP
+#define FAST_DDS_GENERATED__DATA1MB_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/test/blackbox/types/Data1mbCdrAux.hpp b/test/blackbox/types/Data1mbCdrAux.hpp
index 4de75dd113b..79a12248dd2 100644
--- a/test/blackbox/types/Data1mbCdrAux.hpp
+++ b/test/blackbox/types/Data1mbCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DATA1MBCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_DATA1MBCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__DATA1MBCDRAUX_HPP
+#define FAST_DDS_GENERATED__DATA1MBCDRAUX_HPP
 
 #include "Data1mb.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_DATA1MBCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__DATA1MBCDRAUX_HPP
 
diff --git a/test/blackbox/types/Data1mbCdrAux.ipp b/test/blackbox/types/Data1mbCdrAux.ipp
index 2aef77347df..8854e01591b 100644
--- a/test/blackbox/types/Data1mbCdrAux.ipp
+++ b/test/blackbox/types/Data1mbCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DATA1MBCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_DATA1MBCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__DATA1MBCDRAUX_IPP
+#define FAST_DDS_GENERATED__DATA1MBCDRAUX_IPP
 
 #include "Data1mbCdrAux.hpp"
 
@@ -114,5 +114,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_DATA1MBCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__DATA1MBCDRAUX_IPP
 
diff --git a/test/blackbox/types/Data1mbPubSubTypes.cxx b/test/blackbox/types/Data1mbPubSubTypes.cxx
index 1a7f6174f05..3bda0762448 100644
--- a/test/blackbox/types/Data1mbPubSubTypes.cxx
+++ b/test/blackbox/types/Data1mbPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "Data1mbPubSubTypes.h"
+#include "Data1mbPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/blackbox/types/Data1mbPubSubTypes.h b/test/blackbox/types/Data1mbPubSubTypes.hpp
similarity index 89%
rename from test/blackbox/types/Data1mbPubSubTypes.h
rename to test/blackbox/types/Data1mbPubSubTypes.hpp
index 4ed11e1bd46..b5e52335dc2 100644
--- a/test/blackbox/types/Data1mbPubSubTypes.h
+++ b/test/blackbox/types/Data1mbPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file Data1mbPubSubTypes.h
+ * @file Data1mbPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_DATA1MB_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_DATA1MB_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__DATA1MB_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__DATA1MB_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "Data1mb.hpp"
 
@@ -106,7 +106,7 @@ class Data1mbPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class Data1mbPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_DATA1MB_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__DATA1MB_PUBSUBTYPES_HPP
 
diff --git a/test/blackbox/types/Data1mbTypeObjectSupport.hpp b/test/blackbox/types/Data1mbTypeObjectSupport.hpp
index 33f3da5ed57..79a62a7c348 100644
--- a/test/blackbox/types/Data1mbTypeObjectSupport.hpp
+++ b/test/blackbox/types/Data1mbTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DATA1MB_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_DATA1MB_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__DATA1MB_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__DATA1MB_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_Data1mb_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_DATA1MB_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__DATA1MB_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/blackbox/types/Data64kb.hpp b/test/blackbox/types/Data64kb.hpp
index 56f9865b0f7..a180e8b00d7 100644
--- a/test/blackbox/types/Data64kb.hpp
+++ b/test/blackbox/types/Data64kb.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DATA64KB_HPP_
-#define _FAST_DDS_GENERATED_DATA64KB_HPP_
+#ifndef FAST_DDS_GENERATED__DATA64KB_HPP
+#define FAST_DDS_GENERATED__DATA64KB_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/test/blackbox/types/Data64kbCdrAux.hpp b/test/blackbox/types/Data64kbCdrAux.hpp
index 84f01b0a3e3..97fc84eacfd 100644
--- a/test/blackbox/types/Data64kbCdrAux.hpp
+++ b/test/blackbox/types/Data64kbCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DATA64KBCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_DATA64KBCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__DATA64KBCDRAUX_HPP
+#define FAST_DDS_GENERATED__DATA64KBCDRAUX_HPP
 
 #include "Data64kb.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_DATA64KBCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__DATA64KBCDRAUX_HPP
 
diff --git a/test/blackbox/types/Data64kbCdrAux.ipp b/test/blackbox/types/Data64kbCdrAux.ipp
index 63ceb81b374..1b3226ec6b9 100644
--- a/test/blackbox/types/Data64kbCdrAux.ipp
+++ b/test/blackbox/types/Data64kbCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DATA64KBCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_DATA64KBCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__DATA64KBCDRAUX_IPP
+#define FAST_DDS_GENERATED__DATA64KBCDRAUX_IPP
 
 #include "Data64kbCdrAux.hpp"
 
@@ -114,5 +114,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_DATA64KBCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__DATA64KBCDRAUX_IPP
 
diff --git a/test/blackbox/types/Data64kbPubSubTypes.cxx b/test/blackbox/types/Data64kbPubSubTypes.cxx
index 5dbfeed039f..90a08fd6a58 100644
--- a/test/blackbox/types/Data64kbPubSubTypes.cxx
+++ b/test/blackbox/types/Data64kbPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "Data64kbPubSubTypes.h"
+#include "Data64kbPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/blackbox/types/Data64kbPubSubTypes.h b/test/blackbox/types/Data64kbPubSubTypes.hpp
similarity index 89%
rename from test/blackbox/types/Data64kbPubSubTypes.h
rename to test/blackbox/types/Data64kbPubSubTypes.hpp
index c062a326666..9ec70bd190c 100644
--- a/test/blackbox/types/Data64kbPubSubTypes.h
+++ b/test/blackbox/types/Data64kbPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file Data64kbPubSubTypes.h
+ * @file Data64kbPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_DATA64KB_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_DATA64KB_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__DATA64KB_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__DATA64KB_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "Data64kb.hpp"
 
@@ -106,7 +106,7 @@ class Data64kbPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class Data64kbPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_DATA64KB_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__DATA64KB_PUBSUBTYPES_HPP
 
diff --git a/test/blackbox/types/Data64kbTypeObjectSupport.hpp b/test/blackbox/types/Data64kbTypeObjectSupport.hpp
index ff0722999f4..18df0ad9e13 100644
--- a/test/blackbox/types/Data64kbTypeObjectSupport.hpp
+++ b/test/blackbox/types/Data64kbTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DATA64KB_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_DATA64KB_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__DATA64KB_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__DATA64KB_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_Data64kb_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_DATA64KB_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__DATA64KB_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/blackbox/types/FixedSized.hpp b/test/blackbox/types/FixedSized.hpp
index ad4a97e8f5f..e9cb1611b92 100644
--- a/test/blackbox/types/FixedSized.hpp
+++ b/test/blackbox/types/FixedSized.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_FIXEDSIZED_HPP_
-#define _FAST_DDS_GENERATED_FIXEDSIZED_HPP_
+#ifndef FAST_DDS_GENERATED__FIXEDSIZED_HPP
+#define FAST_DDS_GENERATED__FIXEDSIZED_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/test/blackbox/types/FixedSizedCdrAux.hpp b/test/blackbox/types/FixedSizedCdrAux.hpp
index 2179f7b93d3..8eb748478a8 100644
--- a/test/blackbox/types/FixedSizedCdrAux.hpp
+++ b/test/blackbox/types/FixedSizedCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_FIXEDSIZEDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_FIXEDSIZEDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__FIXEDSIZEDCDRAUX_HPP
+#define FAST_DDS_GENERATED__FIXEDSIZEDCDRAUX_HPP
 
 #include "FixedSized.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_FIXEDSIZEDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__FIXEDSIZEDCDRAUX_HPP
 
diff --git a/test/blackbox/types/FixedSizedCdrAux.ipp b/test/blackbox/types/FixedSizedCdrAux.ipp
index fa78fd735e9..f319ddc7ada 100644
--- a/test/blackbox/types/FixedSizedCdrAux.ipp
+++ b/test/blackbox/types/FixedSizedCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_FIXEDSIZEDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_FIXEDSIZEDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__FIXEDSIZEDCDRAUX_IPP
+#define FAST_DDS_GENERATED__FIXEDSIZEDCDRAUX_IPP
 
 #include "FixedSizedCdrAux.hpp"
 
@@ -114,5 +114,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_FIXEDSIZEDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__FIXEDSIZEDCDRAUX_IPP
 
diff --git a/test/blackbox/types/FixedSizedPubSubTypes.cxx b/test/blackbox/types/FixedSizedPubSubTypes.cxx
index 24dca125371..545a7a8d600 100644
--- a/test/blackbox/types/FixedSizedPubSubTypes.cxx
+++ b/test/blackbox/types/FixedSizedPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "FixedSizedPubSubTypes.h"
+#include "FixedSizedPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/blackbox/types/FixedSizedPubSubTypes.h b/test/blackbox/types/FixedSizedPubSubTypes.hpp
similarity index 89%
rename from test/blackbox/types/FixedSizedPubSubTypes.h
rename to test/blackbox/types/FixedSizedPubSubTypes.hpp
index 2fef7e74eb5..b51c27393ab 100644
--- a/test/blackbox/types/FixedSizedPubSubTypes.h
+++ b/test/blackbox/types/FixedSizedPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file FixedSizedPubSubTypes.h
+ * @file FixedSizedPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_FIXEDSIZED_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_FIXEDSIZED_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__FIXEDSIZED_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__FIXEDSIZED_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "FixedSized.hpp"
 
@@ -139,9 +139,9 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -163,7 +163,7 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -184,5 +184,5 @@ class FixedSizedPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 };
 
-#endif // _FAST_DDS_GENERATED_FIXEDSIZED_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__FIXEDSIZED_PUBSUBTYPES_HPP
 
diff --git a/test/blackbox/types/FixedSizedTypeObjectSupport.hpp b/test/blackbox/types/FixedSizedTypeObjectSupport.hpp
index cdc09e4f9b6..f5d775beb8f 100644
--- a/test/blackbox/types/FixedSizedTypeObjectSupport.hpp
+++ b/test/blackbox/types/FixedSizedTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_FIXEDSIZED_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_FIXEDSIZED_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__FIXEDSIZED_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__FIXEDSIZED_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_FixedSized_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_FIXEDSIZED_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__FIXEDSIZED_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/blackbox/types/HelloWorld.hpp b/test/blackbox/types/HelloWorld.hpp
index aa7cc5c9a96..bd2be44d1af 100644
--- a/test/blackbox/types/HelloWorld.hpp
+++ b/test/blackbox/types/HelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/test/blackbox/types/HelloWorldCdrAux.hpp b/test/blackbox/types/HelloWorldCdrAux.hpp
index 616b77d8dd3..ede32f42df1 100644
--- a/test/blackbox/types/HelloWorldCdrAux.hpp
+++ b/test/blackbox/types/HelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
 #include "HelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_HPP
 
diff --git a/test/blackbox/types/HelloWorldCdrAux.ipp b/test/blackbox/types/HelloWorldCdrAux.ipp
index 8894ea4edfb..314fb9a71a9 100644
--- a/test/blackbox/types/HelloWorldCdrAux.ipp
+++ b/test/blackbox/types/HelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
 #include "HelloWorldCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLDCDRAUX_IPP
 
diff --git a/test/blackbox/types/HelloWorldPubSubTypes.cxx b/test/blackbox/types/HelloWorldPubSubTypes.cxx
index 0bb05737395..fcd07be724a 100644
--- a/test/blackbox/types/HelloWorldPubSubTypes.cxx
+++ b/test/blackbox/types/HelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "HelloWorldPubSubTypes.h"
+#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/blackbox/types/HelloWorldPubSubTypes.h b/test/blackbox/types/HelloWorldPubSubTypes.hpp
similarity index 89%
rename from test/blackbox/types/HelloWorldPubSubTypes.h
rename to test/blackbox/types/HelloWorldPubSubTypes.hpp
index b161b42f744..75830b9c78b 100644
--- a/test/blackbox/types/HelloWorldPubSubTypes.h
+++ b/test/blackbox/types/HelloWorldPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file HelloWorldPubSubTypes.h
+ * @file HelloWorldPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "HelloWorld.hpp"
 
@@ -106,7 +106,7 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class HelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_PUBSUBTYPES_HPP
 
diff --git a/test/blackbox/types/HelloWorldTypeObjectSupport.hpp b/test/blackbox/types/HelloWorldTypeObjectSupport.hpp
index 2eba797b07f..ec922163d11 100644
--- a/test/blackbox/types/HelloWorldTypeObjectSupport.hpp
+++ b/test/blackbox/types/HelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_HelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__HELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/blackbox/types/KeyedData1mb.hpp b/test/blackbox/types/KeyedData1mb.hpp
index e8b7a343214..76e80888d56 100644
--- a/test/blackbox/types/KeyedData1mb.hpp
+++ b/test/blackbox/types/KeyedData1mb.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_KEYEDDATA1MB_HPP_
-#define _FAST_DDS_GENERATED_KEYEDDATA1MB_HPP_
+#ifndef FAST_DDS_GENERATED__KEYEDDATA1MB_HPP
+#define FAST_DDS_GENERATED__KEYEDDATA1MB_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/test/blackbox/types/KeyedData1mbCdrAux.hpp b/test/blackbox/types/KeyedData1mbCdrAux.hpp
index 1a5493d44aa..eaee00920f1 100644
--- a/test/blackbox/types/KeyedData1mbCdrAux.hpp
+++ b/test/blackbox/types/KeyedData1mbCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_KEYEDDATA1MBCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_KEYEDDATA1MBCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__KEYEDDATA1MBCDRAUX_HPP
+#define FAST_DDS_GENERATED__KEYEDDATA1MBCDRAUX_HPP
 
 #include "KeyedData1mb.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_KEYEDDATA1MBCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__KEYEDDATA1MBCDRAUX_HPP
 
diff --git a/test/blackbox/types/KeyedData1mbCdrAux.ipp b/test/blackbox/types/KeyedData1mbCdrAux.ipp
index 4b2c78fb324..c8f04cd38fa 100644
--- a/test/blackbox/types/KeyedData1mbCdrAux.ipp
+++ b/test/blackbox/types/KeyedData1mbCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_KEYEDDATA1MBCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_KEYEDDATA1MBCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__KEYEDDATA1MBCDRAUX_IPP
+#define FAST_DDS_GENERATED__KEYEDDATA1MBCDRAUX_IPP
 
 #include "KeyedData1mbCdrAux.hpp"
 
@@ -125,5 +125,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_KEYEDDATA1MBCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__KEYEDDATA1MBCDRAUX_IPP
 
diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.cxx b/test/blackbox/types/KeyedData1mbPubSubTypes.cxx
index 1c99cebcc9f..23aa6e4a424 100644
--- a/test/blackbox/types/KeyedData1mbPubSubTypes.cxx
+++ b/test/blackbox/types/KeyedData1mbPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "KeyedData1mbPubSubTypes.h"
+#include "KeyedData1mbPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/blackbox/types/KeyedData1mbPubSubTypes.h b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp
similarity index 89%
rename from test/blackbox/types/KeyedData1mbPubSubTypes.h
rename to test/blackbox/types/KeyedData1mbPubSubTypes.hpp
index ee77e36c65e..f351d1853db 100644
--- a/test/blackbox/types/KeyedData1mbPubSubTypes.h
+++ b/test/blackbox/types/KeyedData1mbPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file KeyedData1mbPubSubTypes.h
+ * @file KeyedData1mbPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_KEYEDDATA1MB_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_KEYEDDATA1MB_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__KEYEDDATA1MB_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__KEYEDDATA1MB_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "KeyedData1mb.hpp"
 
@@ -106,7 +106,7 @@ class KeyedData1mbPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class KeyedData1mbPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_KEYEDDATA1MB_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__KEYEDDATA1MB_PUBSUBTYPES_HPP
 
diff --git a/test/blackbox/types/KeyedData1mbTypeObjectSupport.hpp b/test/blackbox/types/KeyedData1mbTypeObjectSupport.hpp
index cfc4990b2f2..7e9ce190d90 100644
--- a/test/blackbox/types/KeyedData1mbTypeObjectSupport.hpp
+++ b/test/blackbox/types/KeyedData1mbTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_KEYEDDATA1MB_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_KEYEDDATA1MB_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__KEYEDDATA1MB_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__KEYEDDATA1MB_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_KeyedData1mb_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_KEYEDDATA1MB_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__KEYEDDATA1MB_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/blackbox/types/KeyedHelloWorld.hpp b/test/blackbox/types/KeyedHelloWorld.hpp
index fcff19a6304..a37586d8e1d 100644
--- a/test/blackbox/types/KeyedHelloWorld.hpp
+++ b/test/blackbox/types/KeyedHelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_KEYEDHELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_KEYEDHELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__KEYEDHELLOWORLD_HPP
+#define FAST_DDS_GENERATED__KEYEDHELLOWORLD_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/test/blackbox/types/KeyedHelloWorldCdrAux.hpp b/test/blackbox/types/KeyedHelloWorldCdrAux.hpp
index 294bc5672a0..0a567a746ab 100644
--- a/test/blackbox/types/KeyedHelloWorldCdrAux.hpp
+++ b/test/blackbox/types/KeyedHelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_KEYEDHELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_KEYEDHELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__KEYEDHELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__KEYEDHELLOWORLDCDRAUX_HPP
 
 #include "KeyedHelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_KEYEDHELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__KEYEDHELLOWORLDCDRAUX_HPP
 
diff --git a/test/blackbox/types/KeyedHelloWorldCdrAux.ipp b/test/blackbox/types/KeyedHelloWorldCdrAux.ipp
index 8fb6dcf3801..fa076cb54f8 100644
--- a/test/blackbox/types/KeyedHelloWorldCdrAux.ipp
+++ b/test/blackbox/types/KeyedHelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_KEYEDHELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_KEYEDHELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__KEYEDHELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__KEYEDHELLOWORLDCDRAUX_IPP
 
 #include "KeyedHelloWorldCdrAux.hpp"
 
@@ -134,5 +134,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_KEYEDHELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__KEYEDHELLOWORLDCDRAUX_IPP
 
diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx b/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx
index e26659777fa..990b0adbca3 100644
--- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx
+++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "KeyedHelloWorldPubSubTypes.h"
+#include "KeyedHelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/blackbox/types/KeyedHelloWorldPubSubTypes.h b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp
similarity index 88%
rename from test/blackbox/types/KeyedHelloWorldPubSubTypes.h
rename to test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp
index 1d07507bfa8..31c5b9bfd6b 100644
--- a/test/blackbox/types/KeyedHelloWorldPubSubTypes.h
+++ b/test/blackbox/types/KeyedHelloWorldPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file KeyedHelloWorldPubSubTypes.h
+ * @file KeyedHelloWorldPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_KEYEDHELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_KEYEDHELLOWORLD_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__KEYEDHELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__KEYEDHELLOWORLD_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "KeyedHelloWorld.hpp"
 
@@ -106,7 +106,7 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class KeyedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_KEYEDHELLOWORLD_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__KEYEDHELLOWORLD_PUBSUBTYPES_HPP
 
diff --git a/test/blackbox/types/KeyedHelloWorldTypeObjectSupport.hpp b/test/blackbox/types/KeyedHelloWorldTypeObjectSupport.hpp
index 1b260651938..924de66761d 100644
--- a/test/blackbox/types/KeyedHelloWorldTypeObjectSupport.hpp
+++ b/test/blackbox/types/KeyedHelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_KEYEDHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_KEYEDHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__KEYEDHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__KEYEDHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_KeyedHelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_KEYEDHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__KEYEDHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/blackbox/types/StringTest.hpp b/test/blackbox/types/StringTest.hpp
index 822d4697392..5a9d2bd990e 100644
--- a/test/blackbox/types/StringTest.hpp
+++ b/test/blackbox/types/StringTest.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_STRINGTEST_HPP_
-#define _FAST_DDS_GENERATED_STRINGTEST_HPP_
+#ifndef FAST_DDS_GENERATED__STRINGTEST_HPP
+#define FAST_DDS_GENERATED__STRINGTEST_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/test/blackbox/types/StringTestCdrAux.hpp b/test/blackbox/types/StringTestCdrAux.hpp
index 5e7710437f9..67e09f3280b 100644
--- a/test/blackbox/types/StringTestCdrAux.hpp
+++ b/test/blackbox/types/StringTestCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_STRINGTESTCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_STRINGTESTCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__STRINGTESTCDRAUX_HPP
+#define FAST_DDS_GENERATED__STRINGTESTCDRAUX_HPP
 
 #include "StringTest.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_STRINGTESTCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__STRINGTESTCDRAUX_HPP
 
diff --git a/test/blackbox/types/StringTestCdrAux.ipp b/test/blackbox/types/StringTestCdrAux.ipp
index f4c94087886..b4ab43b53c6 100644
--- a/test/blackbox/types/StringTestCdrAux.ipp
+++ b/test/blackbox/types/StringTestCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_STRINGTESTCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_STRINGTESTCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__STRINGTESTCDRAUX_IPP
+#define FAST_DDS_GENERATED__STRINGTESTCDRAUX_IPP
 
 #include "StringTestCdrAux.hpp"
 
@@ -114,5 +114,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_STRINGTESTCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__STRINGTESTCDRAUX_IPP
 
diff --git a/test/blackbox/types/StringTestPubSubTypes.cxx b/test/blackbox/types/StringTestPubSubTypes.cxx
index 6e7c703cb1f..f27379cc665 100644
--- a/test/blackbox/types/StringTestPubSubTypes.cxx
+++ b/test/blackbox/types/StringTestPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "StringTestPubSubTypes.h"
+#include "StringTestPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/blackbox/types/StringTestPubSubTypes.h b/test/blackbox/types/StringTestPubSubTypes.hpp
similarity index 89%
rename from test/blackbox/types/StringTestPubSubTypes.h
rename to test/blackbox/types/StringTestPubSubTypes.hpp
index a15fd619b27..372d78eec85 100644
--- a/test/blackbox/types/StringTestPubSubTypes.h
+++ b/test/blackbox/types/StringTestPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file StringTestPubSubTypes.h
+ * @file StringTestPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_STRINGTEST_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_STRINGTEST_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__STRINGTEST_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__STRINGTEST_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "StringTest.hpp"
 
@@ -106,7 +106,7 @@ class StringTestPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class StringTestPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_STRINGTEST_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__STRINGTEST_PUBSUBTYPES_HPP
 
diff --git a/test/blackbox/types/StringTestTypeObjectSupport.hpp b/test/blackbox/types/StringTestTypeObjectSupport.hpp
index bcae90e3f3f..a3c598a6359 100644
--- a/test/blackbox/types/StringTestTypeObjectSupport.hpp
+++ b/test/blackbox/types/StringTestTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_STRINGTEST_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_STRINGTEST_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__STRINGTEST_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__STRINGTEST_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_StringTest_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_STRINGTEST_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__STRINGTEST_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/blackbox/types/TestIncludeRegression3361.hpp b/test/blackbox/types/TestIncludeRegression3361.hpp
index 16a7933db21..aca39b8c68d 100644
--- a/test/blackbox/types/TestIncludeRegression3361.hpp
+++ b/test/blackbox/types/TestIncludeRegression3361.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_TESTINCLUDEREGRESSION3361_HPP_
-#define _FAST_DDS_GENERATED_TESTINCLUDEREGRESSION3361_HPP_
+#ifndef FAST_DDS_GENERATED__TESTINCLUDEREGRESSION3361_HPP
+#define FAST_DDS_GENERATED__TESTINCLUDEREGRESSION3361_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/test/blackbox/types/TestIncludeRegression3361PubSubTypes.h b/test/blackbox/types/TestIncludeRegression3361PubSubTypes.hpp
similarity index 75%
rename from test/blackbox/types/TestIncludeRegression3361PubSubTypes.h
rename to test/blackbox/types/TestIncludeRegression3361PubSubTypes.hpp
index 161a4f404e5..480dd7051fb 100644
--- a/test/blackbox/types/TestIncludeRegression3361PubSubTypes.h
+++ b/test/blackbox/types/TestIncludeRegression3361PubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file TestIncludeRegression3361PubSubTypes.h
+ * @file TestIncludeRegression3361PubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_TESTINCLUDEREGRESSION3361_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_TESTINCLUDEREGRESSION3361_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__TESTINCLUDEREGRESSION3361_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__TESTINCLUDEREGRESSION3361_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "TestIncludeRegression3361.hpp"
 
@@ -42,5 +42,5 @@ namespace TestModule
     typedef std::string MACHINEID;
 } // namespace TestModule
 
-#endif // _FAST_DDS_GENERATED_TESTINCLUDEREGRESSION3361_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__TESTINCLUDEREGRESSION3361_PUBSUBTYPES_HPP
 
diff --git a/test/blackbox/types/TestIncludeRegression3361TypeObjectSupport.hpp b/test/blackbox/types/TestIncludeRegression3361TypeObjectSupport.hpp
index 55e69fa3f92..f933a994b90 100644
--- a/test/blackbox/types/TestIncludeRegression3361TypeObjectSupport.hpp
+++ b/test/blackbox/types/TestIncludeRegression3361TypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_TESTINCLUDEREGRESSION3361_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_TESTINCLUDEREGRESSION3361_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__TESTINCLUDEREGRESSION3361_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__TESTINCLUDEREGRESSION3361_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -58,4 +58,4 @@ eProsima_user_DllExport void register_MACHINEID_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_TESTINCLUDEREGRESSION3361_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__TESTINCLUDEREGRESSION3361_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/blackbox/types/TestRegression3361.hpp b/test/blackbox/types/TestRegression3361.hpp
index b2aa588d59f..c6509515fc0 100644
--- a/test/blackbox/types/TestRegression3361.hpp
+++ b/test/blackbox/types/TestRegression3361.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_TESTREGRESSION3361_HPP_
-#define _FAST_DDS_GENERATED_TESTREGRESSION3361_HPP_
+#ifndef FAST_DDS_GENERATED__TESTREGRESSION3361_HPP
+#define FAST_DDS_GENERATED__TESTREGRESSION3361_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/test/blackbox/types/TestRegression3361CdrAux.hpp b/test/blackbox/types/TestRegression3361CdrAux.hpp
index e83d1d32fc8..26a1e48f3cd 100644
--- a/test/blackbox/types/TestRegression3361CdrAux.hpp
+++ b/test/blackbox/types/TestRegression3361CdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_TESTREGRESSION3361CDRAUX_HPP_
-#define _FAST_DDS_GENERATED_TESTREGRESSION3361CDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__TESTREGRESSION3361CDRAUX_HPP
+#define FAST_DDS_GENERATED__TESTREGRESSION3361CDRAUX_HPP
 
 #include "TestRegression3361.hpp"
 
@@ -43,5 +43,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_TESTREGRESSION3361CDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__TESTREGRESSION3361CDRAUX_HPP
 
diff --git a/test/blackbox/types/TestRegression3361CdrAux.ipp b/test/blackbox/types/TestRegression3361CdrAux.ipp
index f451babf688..251408da5f5 100644
--- a/test/blackbox/types/TestRegression3361CdrAux.ipp
+++ b/test/blackbox/types/TestRegression3361CdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_TESTREGRESSION3361CDRAUX_IPP_
-#define _FAST_DDS_GENERATED_TESTREGRESSION3361CDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__TESTREGRESSION3361CDRAUX_IPP
+#define FAST_DDS_GENERATED__TESTREGRESSION3361CDRAUX_IPP
 
 #include "TestRegression3361CdrAux.hpp"
 
@@ -114,5 +114,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_TESTREGRESSION3361CDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__TESTREGRESSION3361CDRAUX_IPP
 
diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.cxx b/test/blackbox/types/TestRegression3361PubSubTypes.cxx
index 6b83b48e459..e62e4d81c84 100644
--- a/test/blackbox/types/TestRegression3361PubSubTypes.cxx
+++ b/test/blackbox/types/TestRegression3361PubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "TestRegression3361PubSubTypes.h"
+#include "TestRegression3361PubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/blackbox/types/TestRegression3361PubSubTypes.h b/test/blackbox/types/TestRegression3361PubSubTypes.hpp
similarity index 87%
rename from test/blackbox/types/TestRegression3361PubSubTypes.h
rename to test/blackbox/types/TestRegression3361PubSubTypes.hpp
index 2a7fd4e4836..b78d087acce 100644
--- a/test/blackbox/types/TestRegression3361PubSubTypes.h
+++ b/test/blackbox/types/TestRegression3361PubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file TestRegression3361PubSubTypes.h
+ * @file TestRegression3361PubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_TESTREGRESSION3361_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_TESTREGRESSION3361_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__TESTREGRESSION3361_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__TESTREGRESSION3361_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "TestRegression3361.hpp"
 
-#include "TestIncludeRegression3361PubSubTypes.h"
+#include "TestIncludeRegression3361PubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class TestRegression3361PubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,10 +125,10 @@ class TestRegression3361PubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_TESTREGRESSION3361_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__TESTREGRESSION3361_PUBSUBTYPES_HPP
 
diff --git a/test/blackbox/types/TestRegression3361TypeObjectSupport.hpp b/test/blackbox/types/TestRegression3361TypeObjectSupport.hpp
index 3106dadb2b7..73c8b346d82 100644
--- a/test/blackbox/types/TestRegression3361TypeObjectSupport.hpp
+++ b/test/blackbox/types/TestRegression3361TypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_TESTREGRESSION3361_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_TESTREGRESSION3361_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__TESTREGRESSION3361_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__TESTREGRESSION3361_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -54,4 +54,4 @@ eProsima_user_DllExport void register_TestRegression3361_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_TESTREGRESSION3361_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__TESTREGRESSION3361_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/blackbox/types/UnboundedHelloWorld.hpp b/test/blackbox/types/UnboundedHelloWorld.hpp
index 431ecef78dc..4b615a9ed3a 100644
--- a/test/blackbox/types/UnboundedHelloWorld.hpp
+++ b/test/blackbox/types/UnboundedHelloWorld.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLD_HPP_
-#define _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLD_HPP_
+#ifndef FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLD_HPP
+#define FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLD_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/test/blackbox/types/UnboundedHelloWorldCdrAux.hpp b/test/blackbox/types/UnboundedHelloWorldCdrAux.hpp
index 8a7a496130f..27c30169280 100644
--- a/test/blackbox/types/UnboundedHelloWorldCdrAux.hpp
+++ b/test/blackbox/types/UnboundedHelloWorldCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLDCDRAUX_HPP
+#define FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLDCDRAUX_HPP
 
 #include "UnboundedHelloWorld.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLDCDRAUX_HPP
 
diff --git a/test/blackbox/types/UnboundedHelloWorldCdrAux.ipp b/test/blackbox/types/UnboundedHelloWorldCdrAux.ipp
index af8513070cd..310edf51a0b 100644
--- a/test/blackbox/types/UnboundedHelloWorldCdrAux.ipp
+++ b/test/blackbox/types/UnboundedHelloWorldCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLDCDRAUX_IPP
+#define FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLDCDRAUX_IPP
 
 #include "UnboundedHelloWorldCdrAux.hpp"
 
@@ -122,5 +122,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLDCDRAUX_IPP
 
diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx
index c754d27b4d4..0aa09725928 100644
--- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx
+++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "UnboundedHelloWorldPubSubTypes.h"
+#include "UnboundedHelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.h b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp
similarity index 88%
rename from test/blackbox/types/UnboundedHelloWorldPubSubTypes.h
rename to test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp
index 29c132887b8..d190c95d4de 100644
--- a/test/blackbox/types/UnboundedHelloWorldPubSubTypes.h
+++ b/test/blackbox/types/UnboundedHelloWorldPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file UnboundedHelloWorldPubSubTypes.h
+ * @file UnboundedHelloWorldPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLD_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLD_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLD_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLD_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "UnboundedHelloWorld.hpp"
 
@@ -106,7 +106,7 @@ class UnboundedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class UnboundedHelloWorldPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLD_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLD_PUBSUBTYPES_HPP
 
diff --git a/test/blackbox/types/UnboundedHelloWorldTypeObjectSupport.hpp b/test/blackbox/types/UnboundedHelloWorldTypeObjectSupport.hpp
index a442dd68414..e8a5c476dae 100644
--- a/test/blackbox/types/UnboundedHelloWorldTypeObjectSupport.hpp
+++ b/test/blackbox/types/UnboundedHelloWorldTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_UnboundedHelloWorld_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_UNBOUNDEDHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__UNBOUNDEDHELLOWORLD_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/blackbox/types/core/core_types.hpp b/test/blackbox/types/core/core_types.hpp
index 6a5d752127c..2485bc77382 100644
--- a/test/blackbox/types/core/core_types.hpp
+++ b/test/blackbox/types/core/core_types.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/test/blackbox/types/core/core_typesCdrAux.hpp b/test/blackbox/types/core/core_typesCdrAux.hpp
index 7e042fb0d64..c361c3987d7 100644
--- a/test/blackbox/types/core/core_typesCdrAux.hpp
+++ b/test/blackbox/types/core/core_typesCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPESCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPESCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPESCDRAUX_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPESCDRAUX_HPP
 
 #include "core_types.hpp"
 
@@ -198,5 +198,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPESCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPESCDRAUX_HPP
 
diff --git a/test/blackbox/types/core/core_typesCdrAux.ipp b/test/blackbox/types/core/core_typesCdrAux.ipp
index 052885b19b7..11233176783 100644
--- a/test/blackbox/types/core/core_typesCdrAux.ipp
+++ b/test/blackbox/types/core/core_typesCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPESCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPESCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPESCDRAUX_IPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPESCDRAUX_IPP
 
 #include "core_typesCdrAux.hpp"
 
@@ -2320,5 +2320,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPESCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPESCDRAUX_IPP
 
diff --git a/test/blackbox/types/core/core_typesPubSubTypes.cxx b/test/blackbox/types/core/core_typesPubSubTypes.cxx
index 992458b63e1..bb921ed43d2 100644
--- a/test/blackbox/types/core/core_typesPubSubTypes.cxx
+++ b/test/blackbox/types/core/core_typesPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "core_typesPubSubTypes.h"
+#include "core_typesPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/blackbox/types/core/core_typesPubSubTypes.h b/test/blackbox/types/core/core_typesPubSubTypes.hpp
similarity index 96%
rename from test/blackbox/types/core/core_typesPubSubTypes.h
rename to test/blackbox/types/core/core_typesPubSubTypes.hpp
index 02d5873f917..72f426d79aa 100644
--- a/test/blackbox/types/core/core_typesPubSubTypes.h
+++ b/test/blackbox/types/core/core_typesPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file core_typesPubSubTypes.h
+ * @file core_typesPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "core_types.hpp"
 
@@ -116,7 +116,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -134,7 +134,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -207,7 +207,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -225,7 +225,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -298,7 +298,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -316,7 +316,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -389,7 +389,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -407,7 +407,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -480,7 +480,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -498,7 +498,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -571,7 +571,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -589,7 +589,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -662,7 +662,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -680,7 +680,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -753,7 +753,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -771,7 +771,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -845,7 +845,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -863,7 +863,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -936,7 +936,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -954,7 +954,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -1027,7 +1027,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -1045,7 +1045,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -1120,7 +1120,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -1138,7 +1138,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -1211,7 +1211,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -1229,7 +1229,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -1302,7 +1302,7 @@ namespace eprosima
                         }
 
                         eProsima_user_DllExport inline bool is_plain(
-                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                         {
                             static_cast<void>(data_representation);
                             return false;
@@ -1320,7 +1320,7 @@ namespace eprosima
 
                     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                        MD5 m_md5;
+                        eprosima::fastdds::MD5 m_md5;
                         unsigned char* m_keyBuffer;
 
                     };
@@ -1394,7 +1394,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -1412,7 +1412,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -1485,7 +1485,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -1503,7 +1503,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -1579,7 +1579,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -1597,7 +1597,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -1670,7 +1670,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -1688,7 +1688,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -1761,7 +1761,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -1779,7 +1779,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -1852,7 +1852,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -1870,7 +1870,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -1943,7 +1943,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -1961,7 +1961,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -2035,7 +2035,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -2053,7 +2053,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -2062,5 +2062,5 @@ namespace eprosima
     } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_PUBSUBTYPES_HPP
 
diff --git a/test/blackbox/types/core/core_typesTypeObjectSupport.hpp b/test/blackbox/types/core/core_typesTypeObjectSupport.hpp
index 7e44c3f8d6b..718f09ff3b7 100644
--- a/test/blackbox/types/core/core_typesTypeObjectSupport.hpp
+++ b/test/blackbox/types/core/core_typesTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -402,4 +402,4 @@ eProsima_user_DllExport void register_RTPSMessage_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_RTPS_CORE_CORE_TYPES_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/blackbox/types/statistics/monitorservice_types.hpp b/test/blackbox/types/statistics/monitorservice_types.hpp
index 63125b25f12..d1bd4bcee03 100644
--- a/test/blackbox/types/statistics/monitorservice_types.hpp
+++ b/test/blackbox/types/statistics/monitorservice_types.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/test/blackbox/types/statistics/monitorservice_typesCdrAux.hpp b/test/blackbox/types/statistics/monitorservice_typesCdrAux.hpp
index ee5fff198a7..32c6ac80bb6 100644
--- a/test/blackbox/types/statistics/monitorservice_typesCdrAux.hpp
+++ b/test/blackbox/types/statistics/monitorservice_typesCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_HPP
 
 #include "monitorservice_types.hpp"
 
@@ -111,5 +111,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_HPP
 
diff --git a/test/blackbox/types/statistics/monitorservice_typesCdrAux.ipp b/test/blackbox/types/statistics/monitorservice_typesCdrAux.ipp
index cf0924ab80b..3f063f533a8 100644
--- a/test/blackbox/types/statistics/monitorservice_typesCdrAux.ipp
+++ b/test/blackbox/types/statistics/monitorservice_typesCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_IPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_IPP
 
 #include "monitorservice_typesCdrAux.hpp"
 
@@ -1007,5 +1007,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPESCDRAUX_IPP
 
diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx
index 65213d9c1b8..d0e23ab6f51 100644
--- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx
+++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "monitorservice_typesPubSubTypes.h"
+#include "monitorservice_typesPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp
similarity index 94%
rename from test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h
rename to test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp
index 8225e6e1135..966a6a459c8 100644
--- a/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.h
+++ b/test/blackbox/types/statistics/monitorservice_typesPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file monitorservice_typesPubSubTypes.h
+ * @file monitorservice_typesPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "monitorservice_types.hpp"
 
-#include "typesPubSubTypes.h"
+#include "typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -113,7 +113,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -131,7 +131,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -204,7 +204,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -222,7 +222,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -295,7 +295,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -313,7 +313,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -387,7 +387,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -405,7 +405,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -478,7 +478,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -496,7 +496,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -569,7 +569,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -587,7 +587,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -677,7 +677,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -695,7 +695,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -703,5 +703,5 @@ namespace eprosima
     } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_PUBSUBTYPES_HPP
 
diff --git a/test/blackbox/types/statistics/monitorservice_typesTypeObjectSupport.hpp b/test/blackbox/types/statistics/monitorservice_typesTypeObjectSupport.hpp
index 703ef46f1c6..9d4484ba038 100644
--- a/test/blackbox/types/statistics/monitorservice_typesTypeObjectSupport.hpp
+++ b/test/blackbox/types/statistics/monitorservice_typesTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -254,4 +254,4 @@ eProsima_user_DllExport void register_MonitorServiceStatusData_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_MONITORSERVICE_TYPES_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/blackbox/types/statistics/types.hpp b/test/blackbox/types/statistics/types.hpp
index 308a3dae3d7..eaf91edb09c 100644
--- a/test/blackbox/types/statistics/types.hpp
+++ b/test/blackbox/types/statistics/types.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/test/blackbox/types/statistics/typesCdrAux.hpp b/test/blackbox/types/statistics/typesCdrAux.hpp
index d331c557176..8f393b28038 100644
--- a/test/blackbox/types/statistics/typesCdrAux.hpp
+++ b/test/blackbox/types/statistics/typesCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_HPP
 
 #include "types.hpp"
 
@@ -136,5 +136,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_HPP
 
diff --git a/test/blackbox/types/statistics/typesCdrAux.ipp b/test/blackbox/types/statistics/typesCdrAux.ipp
index b8d5a1d7f81..f5c77ee8936 100644
--- a/test/blackbox/types/statistics/typesCdrAux.ipp
+++ b/test/blackbox/types/statistics/typesCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_IPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_IPP
 
 #include "typesCdrAux.hpp"
 
@@ -1744,5 +1744,5 @@ eProsima_user_DllExport void deserialize(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPESCDRAUX_IPP
 
diff --git a/test/blackbox/types/statistics/typesPubSubTypes.cxx b/test/blackbox/types/statistics/typesPubSubTypes.cxx
index 50151e3eede..fbc16b14e72 100644
--- a/test/blackbox/types/statistics/typesPubSubTypes.cxx
+++ b/test/blackbox/types/statistics/typesPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "typesPubSubTypes.h"
+#include "typesPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/blackbox/types/statistics/typesPubSubTypes.h b/test/blackbox/types/statistics/typesPubSubTypes.hpp
similarity index 96%
rename from test/blackbox/types/statistics/typesPubSubTypes.h
rename to test/blackbox/types/statistics/typesPubSubTypes.hpp
index 86a5046fceb..fb99b8c567d 100644
--- a/test/blackbox/types/statistics/typesPubSubTypes.h
+++ b/test/blackbox/types/statistics/typesPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file typesPubSubTypes.h
+ * @file typesPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "types.hpp"
 
@@ -114,7 +114,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -132,7 +132,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -205,7 +205,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -223,7 +223,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -296,7 +296,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -314,7 +314,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -387,7 +387,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -405,7 +405,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -478,7 +478,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -496,7 +496,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -569,7 +569,7 @@ namespace eprosima
                     }
 
                     eProsima_user_DllExport inline bool is_plain(
-                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                     {
                         static_cast<void>(data_representation);
                         return false;
@@ -587,7 +587,7 @@ namespace eprosima
 
                 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                    MD5 m_md5;
+                    eprosima::fastdds::MD5 m_md5;
                     unsigned char* m_keyBuffer;
 
                 };
@@ -661,7 +661,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -679,7 +679,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -752,7 +752,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -770,7 +770,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -843,7 +843,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -861,7 +861,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -934,7 +934,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -952,7 +952,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -1025,7 +1025,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -1043,7 +1043,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -1116,7 +1116,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -1134,7 +1134,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -1207,7 +1207,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -1225,7 +1225,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -1298,7 +1298,7 @@ namespace eprosima
                 }
 
                 eProsima_user_DllExport inline bool is_plain(
-                    eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
                 {
                     static_cast<void>(data_representation);
                     return false;
@@ -1316,7 +1316,7 @@ namespace eprosima
 
             #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-                MD5 m_md5;
+                eprosima::fastdds::MD5 m_md5;
                 unsigned char* m_keyBuffer;
 
             };
@@ -1328,5 +1328,5 @@ namespace eprosima
     } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_PUBSUBTYPES_HPP
 
diff --git a/test/blackbox/types/statistics/typesTypeObjectSupport.hpp b/test/blackbox/types/statistics/typesTypeObjectSupport.hpp
index eb9221d8af5..f137234a5d6 100644
--- a/test/blackbox/types/statistics/typesTypeObjectSupport.hpp
+++ b/test/blackbox/types/statistics/typesTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -250,4 +250,4 @@ eProsima_user_DllExport void register_Data_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_EPROSIMA_FASTDDS_STATISTICS_TYPES_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__EPROSIMA_FASTDDS_STATISTICS_TYPES_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/blackbox/utils/filter_helpers.hpp b/test/blackbox/utils/filter_helpers.hpp
index 1aea5e3aef4..3725e8e283c 100644
--- a/test/blackbox/utils/filter_helpers.hpp
+++ b/test/blackbox/utils/filter_helpers.hpp
@@ -16,9 +16,9 @@
 #include <fastcdr/FastBuffer.h>
 
 #include <fastdds/dds/core/Entity.hpp>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Types.hpp>
 
-#include "../types/core/core_typesPubSubTypes.h"
+#include "../types/core/core_typesPubSubTypes.hpp"
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/dds-types-test/aliases.hpp b/test/dds-types-test/aliases.hpp
index 8cb179b2375..0494aa8d62d 100644
--- a/test/dds-types-test/aliases.hpp
+++ b/test/dds-types-test/aliases.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ALIASES_HPP_
-#define _FAST_DDS_GENERATED_ALIASES_HPP_
+#ifndef FAST_DDS_GENERATED__ALIASES_HPP
+#define FAST_DDS_GENERATED__ALIASES_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/test/dds-types-test/aliasesCdrAux.hpp b/test/dds-types-test/aliasesCdrAux.hpp
index aa455b7b487..959a81f7270 100644
--- a/test/dds-types-test/aliasesCdrAux.hpp
+++ b/test/dds-types-test/aliasesCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ALIASESCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_ALIASESCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__ALIASESCDRAUX_HPP
+#define FAST_DDS_GENERATED__ALIASESCDRAUX_HPP
 
 #include "aliases.hpp"
 
@@ -247,5 +247,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_ALIASESCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__ALIASESCDRAUX_HPP
 
diff --git a/test/dds-types-test/aliasesCdrAux.ipp b/test/dds-types-test/aliasesCdrAux.ipp
index 2cd0dcbb6f2..1f3c87b8819 100644
--- a/test/dds-types-test/aliasesCdrAux.ipp
+++ b/test/dds-types-test/aliasesCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ALIASESCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_ALIASESCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__ALIASESCDRAUX_IPP
+#define FAST_DDS_GENERATED__ALIASESCDRAUX_IPP
 
 #include "aliasesCdrAux.hpp"
 
@@ -1938,5 +1938,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_ALIASESCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__ALIASESCDRAUX_IPP
 
diff --git a/test/dds-types-test/aliasesPubSubTypes.cxx b/test/dds-types-test/aliasesPubSubTypes.cxx
index 3ddfb82dc5e..763cadc162e 100644
--- a/test/dds-types-test/aliasesPubSubTypes.cxx
+++ b/test/dds-types-test/aliasesPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "aliasesPubSubTypes.h"
+#include "aliasesPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/aliasesPubSubTypes.h b/test/dds-types-test/aliasesPubSubTypes.hpp
similarity index 95%
rename from test/dds-types-test/aliasesPubSubTypes.h
rename to test/dds-types-test/aliasesPubSubTypes.hpp
index 14a9c776d45..6ac00ba62c3 100644
--- a/test/dds-types-test/aliasesPubSubTypes.h
+++ b/test/dds-types-test/aliasesPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file aliasesPubSubTypes.h
+ * @file aliasesPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_ALIASES_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_ALIASES_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__ALIASES_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__ALIASES_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "aliases.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -132,7 +132,7 @@ class AliasInt16PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -150,7 +150,7 @@ class AliasInt16PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -223,7 +223,7 @@ class AliasUint16PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -241,7 +241,7 @@ class AliasUint16PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -314,7 +314,7 @@ class AliasInt32PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -332,7 +332,7 @@ class AliasInt32PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -405,7 +405,7 @@ class AliasUInt32PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -423,7 +423,7 @@ class AliasUInt32PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -496,7 +496,7 @@ class AliasInt64PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -514,7 +514,7 @@ class AliasInt64PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -587,7 +587,7 @@ class AliasUInt64PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -605,7 +605,7 @@ class AliasUInt64PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -678,7 +678,7 @@ class AliasFloat32PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -696,7 +696,7 @@ class AliasFloat32PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -769,7 +769,7 @@ class AliasFloat64PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -787,7 +787,7 @@ class AliasFloat64PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -860,7 +860,7 @@ class AliasFloat128PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -878,7 +878,7 @@ class AliasFloat128PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -951,7 +951,7 @@ class AliasBoolPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -969,7 +969,7 @@ class AliasBoolPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1042,7 +1042,7 @@ class AliasOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1060,7 +1060,7 @@ class AliasOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1133,7 +1133,7 @@ class AliasChar8PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1151,7 +1151,7 @@ class AliasChar8PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1224,7 +1224,7 @@ class AliasChar16PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1242,7 +1242,7 @@ class AliasChar16PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1315,7 +1315,7 @@ class AliasString8PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1333,7 +1333,7 @@ class AliasString8PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1406,7 +1406,7 @@ class AliasString16PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1424,7 +1424,7 @@ class AliasString16PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1497,7 +1497,7 @@ class AliasEnumPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1515,7 +1515,7 @@ class AliasEnumPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1588,7 +1588,7 @@ class AliasBitmaskPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1606,7 +1606,7 @@ class AliasBitmaskPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1679,7 +1679,7 @@ class AliasAliasPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1697,7 +1697,7 @@ class AliasAliasPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1770,7 +1770,7 @@ class AliasArrayPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1788,7 +1788,7 @@ class AliasArrayPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1861,7 +1861,7 @@ class AliasMultiArrayPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1879,7 +1879,7 @@ class AliasMultiArrayPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1952,7 +1952,7 @@ class AliasSequencePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1970,7 +1970,7 @@ class AliasSequencePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2043,7 +2043,7 @@ class AliasMapPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2061,7 +2061,7 @@ class AliasMapPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2134,7 +2134,7 @@ class AliasUnionPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2152,7 +2152,7 @@ class AliasUnionPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2225,7 +2225,7 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2243,7 +2243,7 @@ class AliasStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2316,7 +2316,7 @@ class AliasBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2334,10 +2334,10 @@ class AliasBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_ALIASES_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__ALIASES_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/aliasesTypeObjectSupport.hpp b/test/dds-types-test/aliasesTypeObjectSupport.hpp
index c9e0d120c85..800875eb252 100644
--- a/test/dds-types-test/aliasesTypeObjectSupport.hpp
+++ b/test/dds-types-test/aliasesTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ALIASES_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_ALIASES_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__ALIASES_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__ALIASES_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -692,4 +692,4 @@ eProsima_user_DllExport void register_AliasBitset_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_ALIASES_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__ALIASES_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/annotations.hpp b/test/dds-types-test/annotations.hpp
index aae36e0de63..bd172e1dc6f 100644
--- a/test/dds-types-test/annotations.hpp
+++ b/test/dds-types-test/annotations.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ANNOTATIONS_HPP_
-#define _FAST_DDS_GENERATED_ANNOTATIONS_HPP_
+#ifndef FAST_DDS_GENERATED__ANNOTATIONS_HPP
+#define FAST_DDS_GENERATED__ANNOTATIONS_HPP
 
 #include <cstdint>
 #include <string>
@@ -57,7 +57,7 @@ namespace AnnotationTest {
      * @brief This class represents the enumeration InnerEnumHelper defined by the user in the IDL file.
      * @ingroup annotations
      */
-    enum class InnerEnumHelper : uint32_t
+    enum class InnerEnumHelper : int32_t
     {
         ONE,
         TWO
diff --git a/test/dds-types-test/annotationsCdrAux.hpp b/test/dds-types-test/annotationsCdrAux.hpp
index c9b73b5880d..dfa040a397d 100644
--- a/test/dds-types-test/annotationsCdrAux.hpp
+++ b/test/dds-types-test/annotationsCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ANNOTATIONSCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_ANNOTATIONSCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__ANNOTATIONSCDRAUX_HPP
+#define FAST_DDS_GENERATED__ANNOTATIONSCDRAUX_HPP
 
 #include "annotations.hpp"
 
@@ -72,5 +72,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_ANNOTATIONSCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__ANNOTATIONSCDRAUX_HPP
 
diff --git a/test/dds-types-test/annotationsCdrAux.ipp b/test/dds-types-test/annotationsCdrAux.ipp
index 6fa95a00d1d..492549f8cfe 100644
--- a/test/dds-types-test/annotationsCdrAux.ipp
+++ b/test/dds-types-test/annotationsCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ANNOTATIONSCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_ANNOTATIONSCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__ANNOTATIONSCDRAUX_IPP
+#define FAST_DDS_GENERATED__ANNOTATIONSCDRAUX_IPP
 
 #include "annotationsCdrAux.hpp"
 
@@ -243,5 +243,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_ANNOTATIONSCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__ANNOTATIONSCDRAUX_IPP
 
diff --git a/test/dds-types-test/annotationsPubSubTypes.cxx b/test/dds-types-test/annotationsPubSubTypes.cxx
index 5a4db5694eb..eef736b5191 100644
--- a/test/dds-types-test/annotationsPubSubTypes.cxx
+++ b/test/dds-types-test/annotationsPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "annotationsPubSubTypes.h"
+#include "annotationsPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/annotationsPubSubTypes.h b/test/dds-types-test/annotationsPubSubTypes.hpp
similarity index 92%
rename from test/dds-types-test/annotationsPubSubTypes.h
rename to test/dds-types-test/annotationsPubSubTypes.hpp
index 4a6e9894b5e..ad990d06a56 100644
--- a/test/dds-types-test/annotationsPubSubTypes.h
+++ b/test/dds-types-test/annotationsPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file annotationsPubSubTypes.h
+ * @file annotationsPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_ANNOTATIONS_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_ANNOTATIONS_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__ANNOTATIONS_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__ANNOTATIONS_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "annotations.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class AnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,7 +125,7 @@ class AnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -198,7 +198,7 @@ class EmptyAnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -216,7 +216,7 @@ class EmptyAnnotatedStructPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -290,7 +290,7 @@ class BasicAnnotationsStructPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -308,10 +308,10 @@ class BasicAnnotationsStructPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_ANNOTATIONS_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__ANNOTATIONS_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/annotationsTypeObjectSupport.hpp b/test/dds-types-test/annotationsTypeObjectSupport.hpp
index 026043575d1..9d914aac862 100644
--- a/test/dds-types-test/annotationsTypeObjectSupport.hpp
+++ b/test/dds-types-test/annotationsTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ANNOTATIONS_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_ANNOTATIONS_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__ANNOTATIONS_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__ANNOTATIONS_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -163,4 +163,4 @@ eProsima_user_DllExport void register_BasicAnnotationsStruct_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_ANNOTATIONS_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__ANNOTATIONS_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/appendable.hpp b/test/dds-types-test/appendable.hpp
index 6feb9a0c4a8..ae7149d1bfe 100644
--- a/test/dds-types-test/appendable.hpp
+++ b/test/dds-types-test/appendable.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_APPENDABLE_HPP_
-#define _FAST_DDS_GENERATED_APPENDABLE_HPP_
+#ifndef FAST_DDS_GENERATED__APPENDABLE_HPP
+#define FAST_DDS_GENERATED__APPENDABLE_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/test/dds-types-test/appendableCdrAux.hpp b/test/dds-types-test/appendableCdrAux.hpp
index 47533909228..3d2fc77b515 100644
--- a/test/dds-types-test/appendableCdrAux.hpp
+++ b/test/dds-types-test/appendableCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_APPENDABLECDRAUX_HPP_
-#define _FAST_DDS_GENERATED_APPENDABLECDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__APPENDABLECDRAUX_HPP
+#define FAST_DDS_GENERATED__APPENDABLECDRAUX_HPP
 
 #include "appendable.hpp"
 
@@ -182,5 +182,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_APPENDABLECDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__APPENDABLECDRAUX_HPP
 
diff --git a/test/dds-types-test/appendableCdrAux.ipp b/test/dds-types-test/appendableCdrAux.ipp
index d21466165fb..5419cf6c692 100644
--- a/test/dds-types-test/appendableCdrAux.ipp
+++ b/test/dds-types-test/appendableCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_APPENDABLECDRAUX_IPP_
-#define _FAST_DDS_GENERATED_APPENDABLECDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__APPENDABLECDRAUX_IPP
+#define FAST_DDS_GENERATED__APPENDABLECDRAUX_IPP
 
 #include "appendableCdrAux.hpp"
 
@@ -1486,5 +1486,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_APPENDABLECDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__APPENDABLECDRAUX_IPP
 
diff --git a/test/dds-types-test/appendablePubSubTypes.cxx b/test/dds-types-test/appendablePubSubTypes.cxx
index 35f28a536c1..756bd87c45e 100644
--- a/test/dds-types-test/appendablePubSubTypes.cxx
+++ b/test/dds-types-test/appendablePubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "appendablePubSubTypes.h"
+#include "appendablePubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/appendablePubSubTypes.h b/test/dds-types-test/appendablePubSubTypes.hpp
similarity index 95%
rename from test/dds-types-test/appendablePubSubTypes.h
rename to test/dds-types-test/appendablePubSubTypes.hpp
index 33b652e4848..83db540ff19 100644
--- a/test/dds-types-test/appendablePubSubTypes.h
+++ b/test/dds-types-test/appendablePubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file appendablePubSubTypes.h
+ * @file appendablePubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_APPENDABLE_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_APPENDABLE_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__APPENDABLE_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__APPENDABLE_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "appendable.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class AppendableShortStructPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,7 +125,7 @@ class AppendableShortStructPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -198,7 +198,7 @@ class AppendableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -216,7 +216,7 @@ class AppendableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -289,7 +289,7 @@ class AppendableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -307,7 +307,7 @@ class AppendableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -380,7 +380,7 @@ class AppendableULongStructPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -398,7 +398,7 @@ class AppendableULongStructPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -471,7 +471,7 @@ class AppendableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -489,7 +489,7 @@ class AppendableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -562,7 +562,7 @@ class AppendableULongLongStructPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -580,7 +580,7 @@ class AppendableULongLongStructPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -653,7 +653,7 @@ class AppendableFloatStructPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -671,7 +671,7 @@ class AppendableFloatStructPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -744,7 +744,7 @@ class AppendableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -762,7 +762,7 @@ class AppendableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -835,7 +835,7 @@ class AppendableLongDoubleStructPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -853,7 +853,7 @@ class AppendableLongDoubleStructPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -926,7 +926,7 @@ class AppendableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -944,7 +944,7 @@ class AppendableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1017,7 +1017,7 @@ class AppendableOctetStructPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1035,7 +1035,7 @@ class AppendableOctetStructPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1108,7 +1108,7 @@ class AppendableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1126,7 +1126,7 @@ class AppendableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1199,7 +1199,7 @@ class AppendableWCharStructPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1217,7 +1217,7 @@ class AppendableWCharStructPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1290,7 +1290,7 @@ class AppendableUnionStructPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1308,7 +1308,7 @@ class AppendableUnionStructPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1381,7 +1381,7 @@ class AppendableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1399,7 +1399,7 @@ class AppendableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1472,7 +1472,7 @@ class AppendableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1490,7 +1490,7 @@ class AppendableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1563,7 +1563,7 @@ class AppendableInheritanceStructPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1581,7 +1581,7 @@ class AppendableInheritanceStructPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1654,7 +1654,7 @@ class AppendableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1672,7 +1672,7 @@ class AppendableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1745,7 +1745,7 @@ class AppendableExtensibilityInheritancePubSubType : public eprosima::fastdds::d
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1763,10 +1763,10 @@ class AppendableExtensibilityInheritancePubSubType : public eprosima::fastdds::d
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_APPENDABLE_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__APPENDABLE_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/appendableTypeObjectSupport.hpp b/test/dds-types-test/appendableTypeObjectSupport.hpp
index 27c17207ee1..27fe0714fba 100644
--- a/test/dds-types-test/appendableTypeObjectSupport.hpp
+++ b/test/dds-types-test/appendableTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_APPENDABLE_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_APPENDABLE_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__APPENDABLE_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__APPENDABLE_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -270,4 +270,4 @@ eProsima_user_DllExport void register_AppendableExtensibilityInheritance_type_id
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_APPENDABLE_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__APPENDABLE_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/arrays.hpp b/test/dds-types-test/arrays.hpp
index 8abcb187754..4397e55ddc1 100644
--- a/test/dds-types-test/arrays.hpp
+++ b/test/dds-types-test/arrays.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ARRAYS_HPP_
-#define _FAST_DDS_GENERATED_ARRAYS_HPP_
+#ifndef FAST_DDS_GENERATED__ARRAYS_HPP
+#define FAST_DDS_GENERATED__ARRAYS_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/test/dds-types-test/arraysCdrAux.hpp b/test/dds-types-test/arraysCdrAux.hpp
index c7a576b5e69..2264068936b 100644
--- a/test/dds-types-test/arraysCdrAux.hpp
+++ b/test/dds-types-test/arraysCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ARRAYSCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_ARRAYSCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__ARRAYSCDRAUX_HPP
+#define FAST_DDS_GENERATED__ARRAYSCDRAUX_HPP
 
 #include "arrays.hpp"
 
@@ -779,5 +779,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_ARRAYSCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__ARRAYSCDRAUX_HPP
 
diff --git a/test/dds-types-test/arraysCdrAux.ipp b/test/dds-types-test/arraysCdrAux.ipp
index 5b3919a4d3e..795d648ecb4 100644
--- a/test/dds-types-test/arraysCdrAux.ipp
+++ b/test/dds-types-test/arraysCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ARRAYSCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_ARRAYSCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__ARRAYSCDRAUX_IPP
+#define FAST_DDS_GENERATED__ARRAYSCDRAUX_IPP
 
 #include "arraysCdrAux.hpp"
 
@@ -7944,5 +7944,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_ARRAYSCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__ARRAYSCDRAUX_IPP
 
diff --git a/test/dds-types-test/arraysPubSubTypes.cxx b/test/dds-types-test/arraysPubSubTypes.cxx
index b8993126283..a9f432fe07c 100644
--- a/test/dds-types-test/arraysPubSubTypes.cxx
+++ b/test/dds-types-test/arraysPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "arraysPubSubTypes.h"
+#include "arraysPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/arraysPubSubTypes.h b/test/dds-types-test/arraysPubSubTypes.hpp
similarity index 95%
rename from test/dds-types-test/arraysPubSubTypes.h
rename to test/dds-types-test/arraysPubSubTypes.hpp
index d35a48c8b8c..5bc03cf83fa 100644
--- a/test/dds-types-test/arraysPubSubTypes.h
+++ b/test/dds-types-test/arraysPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file arraysPubSubTypes.h
+ * @file arraysPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_ARRAYS_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_ARRAYS_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__ARRAYS_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__ARRAYS_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "arrays.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class ArrayShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,7 +125,7 @@ class ArrayShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -198,7 +198,7 @@ class ArrayUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -216,7 +216,7 @@ class ArrayUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -289,7 +289,7 @@ class ArrayLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -307,7 +307,7 @@ class ArrayLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -380,7 +380,7 @@ class ArrayULongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -398,7 +398,7 @@ class ArrayULongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -471,7 +471,7 @@ class ArrayLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -489,7 +489,7 @@ class ArrayLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -562,7 +562,7 @@ class ArrayULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -580,7 +580,7 @@ class ArrayULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -653,7 +653,7 @@ class ArrayFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -671,7 +671,7 @@ class ArrayFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -744,7 +744,7 @@ class ArrayDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -762,7 +762,7 @@ class ArrayDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -835,7 +835,7 @@ class ArrayLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -853,7 +853,7 @@ class ArrayLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -926,7 +926,7 @@ class ArrayBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -944,7 +944,7 @@ class ArrayBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1017,7 +1017,7 @@ class ArrayOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1035,7 +1035,7 @@ class ArrayOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1108,7 +1108,7 @@ class ArrayCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1126,7 +1126,7 @@ class ArrayCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1199,7 +1199,7 @@ class ArrayWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1217,7 +1217,7 @@ class ArrayWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1290,7 +1290,7 @@ class ArrayStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1308,7 +1308,7 @@ class ArrayStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1381,7 +1381,7 @@ class ArrayWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1399,7 +1399,7 @@ class ArrayWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1472,7 +1472,7 @@ class ArrayBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1490,7 +1490,7 @@ class ArrayBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1563,7 +1563,7 @@ class ArrayBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1581,7 +1581,7 @@ class ArrayBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1654,7 +1654,7 @@ class ArrayEnumPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1672,7 +1672,7 @@ class ArrayEnumPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1745,7 +1745,7 @@ class ArrayBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1763,7 +1763,7 @@ class ArrayBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1836,7 +1836,7 @@ class ArrayAliasPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1854,7 +1854,7 @@ class ArrayAliasPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1927,7 +1927,7 @@ class ArrayShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1945,7 +1945,7 @@ class ArrayShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2018,7 +2018,7 @@ class ArraySequencePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2036,7 +2036,7 @@ class ArraySequencePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2109,7 +2109,7 @@ class ArrayMapPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2127,7 +2127,7 @@ class ArrayMapPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2200,7 +2200,7 @@ class ArrayUnionPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2218,7 +2218,7 @@ class ArrayUnionPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2291,7 +2291,7 @@ class ArrayStructurePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2309,7 +2309,7 @@ class ArrayStructurePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2382,7 +2382,7 @@ class ArrayBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2400,7 +2400,7 @@ class ArrayBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2473,7 +2473,7 @@ class ArrayMultiDimensionShortPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2491,7 +2491,7 @@ class ArrayMultiDimensionShortPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2564,7 +2564,7 @@ class ArrayMultiDimensionUShortPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2582,7 +2582,7 @@ class ArrayMultiDimensionUShortPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2655,7 +2655,7 @@ class ArrayMultiDimensionLongPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2673,7 +2673,7 @@ class ArrayMultiDimensionLongPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2746,7 +2746,7 @@ class ArrayMultiDimensionULongPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2764,7 +2764,7 @@ class ArrayMultiDimensionULongPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2837,7 +2837,7 @@ class ArrayMultiDimensionLongLongPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2855,7 +2855,7 @@ class ArrayMultiDimensionLongLongPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2928,7 +2928,7 @@ class ArrayMultiDimensionULongLongPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2946,7 +2946,7 @@ class ArrayMultiDimensionULongLongPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3019,7 +3019,7 @@ class ArrayMultiDimensionFloatPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3037,7 +3037,7 @@ class ArrayMultiDimensionFloatPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3110,7 +3110,7 @@ class ArrayMultiDimensionDoublePubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3128,7 +3128,7 @@ class ArrayMultiDimensionDoublePubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3201,7 +3201,7 @@ class ArrayMultiDimensionLongDoublePubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3219,7 +3219,7 @@ class ArrayMultiDimensionLongDoublePubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3292,7 +3292,7 @@ class ArrayMultiDimensionBooleanPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3310,7 +3310,7 @@ class ArrayMultiDimensionBooleanPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3383,7 +3383,7 @@ class ArrayMultiDimensionOctetPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3401,7 +3401,7 @@ class ArrayMultiDimensionOctetPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3474,7 +3474,7 @@ class ArrayMultiDimensionCharPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3492,7 +3492,7 @@ class ArrayMultiDimensionCharPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3565,7 +3565,7 @@ class ArrayMultiDimensionWCharPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3583,7 +3583,7 @@ class ArrayMultiDimensionWCharPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3656,7 +3656,7 @@ class ArrayMultiDimensionStringPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3674,7 +3674,7 @@ class ArrayMultiDimensionStringPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3747,7 +3747,7 @@ class ArrayMultiDimensionWStringPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3765,7 +3765,7 @@ class ArrayMultiDimensionWStringPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3838,7 +3838,7 @@ class ArrayMultiDimensionBoundedStringPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3856,7 +3856,7 @@ class ArrayMultiDimensionBoundedStringPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3929,7 +3929,7 @@ class ArrayMultiDimensionBoundedWStringPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3947,7 +3947,7 @@ class ArrayMultiDimensionBoundedWStringPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4020,7 +4020,7 @@ class ArrayMultiDimensionEnumPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4038,7 +4038,7 @@ class ArrayMultiDimensionEnumPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4111,7 +4111,7 @@ class ArrayMultiDimensionBitMaskPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4129,7 +4129,7 @@ class ArrayMultiDimensionBitMaskPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4202,7 +4202,7 @@ class ArrayMultiDimensionAliasPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4220,7 +4220,7 @@ class ArrayMultiDimensionAliasPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4293,7 +4293,7 @@ class ArrayMultiDimensionSequencePubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4311,7 +4311,7 @@ class ArrayMultiDimensionSequencePubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4384,7 +4384,7 @@ class ArrayMultiDimensionMapPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4402,7 +4402,7 @@ class ArrayMultiDimensionMapPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4475,7 +4475,7 @@ class ArrayMultiDimensionUnionPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4493,7 +4493,7 @@ class ArrayMultiDimensionUnionPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4566,7 +4566,7 @@ class ArrayMultiDimensionStructurePubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4584,7 +4584,7 @@ class ArrayMultiDimensionStructurePubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4657,7 +4657,7 @@ class ArrayMultiDimensionBitsetPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4675,7 +4675,7 @@ class ArrayMultiDimensionBitsetPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4750,7 +4750,7 @@ class ArraySingleDimensionLiteralsShortPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4768,7 +4768,7 @@ class ArraySingleDimensionLiteralsShortPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4841,7 +4841,7 @@ class ArraySingleDimensionLiteralsUnsignedShortPubSubType : public eprosima::fas
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4859,7 +4859,7 @@ class ArraySingleDimensionLiteralsUnsignedShortPubSubType : public eprosima::fas
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4932,7 +4932,7 @@ class ArraySingleDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4950,7 +4950,7 @@ class ArraySingleDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5023,7 +5023,7 @@ class ArraySingleDimensionLiteralsUnsignedLongPubSubType : public eprosima::fast
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5041,7 +5041,7 @@ class ArraySingleDimensionLiteralsUnsignedLongPubSubType : public eprosima::fast
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5114,7 +5114,7 @@ class ArraySingleDimensionLiteralsLongLongPubSubType : public eprosima::fastdds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5132,7 +5132,7 @@ class ArraySingleDimensionLiteralsLongLongPubSubType : public eprosima::fastdds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5205,7 +5205,7 @@ class ArraySingleDimensionLiteralsUnsignedLongLongPubSubType : public eprosima::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5223,7 +5223,7 @@ class ArraySingleDimensionLiteralsUnsignedLongLongPubSubType : public eprosima::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5296,7 +5296,7 @@ class ArraySingleDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5314,7 +5314,7 @@ class ArraySingleDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5387,7 +5387,7 @@ class ArraySingleDimensionLiteralsDoublePubSubType : public eprosima::fastdds::d
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5405,7 +5405,7 @@ class ArraySingleDimensionLiteralsDoublePubSubType : public eprosima::fastdds::d
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5478,7 +5478,7 @@ class ArraySingleDimensionLiteralsLongDoublePubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5496,7 +5496,7 @@ class ArraySingleDimensionLiteralsLongDoublePubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5569,7 +5569,7 @@ class ArraySingleDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5587,7 +5587,7 @@ class ArraySingleDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5660,7 +5660,7 @@ class ArraySingleDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5678,7 +5678,7 @@ class ArraySingleDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5751,7 +5751,7 @@ class ArraySingleDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5769,7 +5769,7 @@ class ArraySingleDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5842,7 +5842,7 @@ class ArraySingleDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5860,7 +5860,7 @@ class ArraySingleDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5933,7 +5933,7 @@ class ArraySingleDimensionLiteralsStringPubSubType : public eprosima::fastdds::d
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5951,7 +5951,7 @@ class ArraySingleDimensionLiteralsStringPubSubType : public eprosima::fastdds::d
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6024,7 +6024,7 @@ class ArraySingleDimensionLiteralsWStringPubSubType : public eprosima::fastdds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6042,7 +6042,7 @@ class ArraySingleDimensionLiteralsWStringPubSubType : public eprosima::fastdds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6115,7 +6115,7 @@ class ArraySingleDimensionLiteralsBoundedStringPubSubType : public eprosima::fas
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6133,7 +6133,7 @@ class ArraySingleDimensionLiteralsBoundedStringPubSubType : public eprosima::fas
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6206,7 +6206,7 @@ class ArraySingleDimensionLiteralsBoundedWStringPubSubType : public eprosima::fa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6224,7 +6224,7 @@ class ArraySingleDimensionLiteralsBoundedWStringPubSubType : public eprosima::fa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6297,7 +6297,7 @@ class ArraySingleDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6315,7 +6315,7 @@ class ArraySingleDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6388,7 +6388,7 @@ class ArraySingleDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6406,7 +6406,7 @@ class ArraySingleDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6479,7 +6479,7 @@ class ArraySingleDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6497,7 +6497,7 @@ class ArraySingleDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6570,7 +6570,7 @@ class ArraySingleDimensionLiteralsShortArrayPubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6588,7 +6588,7 @@ class ArraySingleDimensionLiteralsShortArrayPubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6661,7 +6661,7 @@ class ArraySingleDimensionLiteralsSequencePubSubType : public eprosima::fastdds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6679,7 +6679,7 @@ class ArraySingleDimensionLiteralsSequencePubSubType : public eprosima::fastdds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6752,7 +6752,7 @@ class ArraySingleDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6770,7 +6770,7 @@ class ArraySingleDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6843,7 +6843,7 @@ class ArraySingleDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6861,7 +6861,7 @@ class ArraySingleDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6934,7 +6934,7 @@ class ArraySingleDimensionLiteralsStructurePubSubType : public eprosima::fastdds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6952,7 +6952,7 @@ class ArraySingleDimensionLiteralsStructurePubSubType : public eprosima::fastdds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7025,7 +7025,7 @@ class ArraySingleDimensionLiteralsBitsetPubSubType : public eprosima::fastdds::d
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7043,7 +7043,7 @@ class ArraySingleDimensionLiteralsBitsetPubSubType : public eprosima::fastdds::d
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7116,7 +7116,7 @@ class ArrayMultiDimensionLiteralsShortPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7134,7 +7134,7 @@ class ArrayMultiDimensionLiteralsShortPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7207,7 +7207,7 @@ class ArrayMultiDimensionLiteralsUShortPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7225,7 +7225,7 @@ class ArrayMultiDimensionLiteralsUShortPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7298,7 +7298,7 @@ class ArrayMultiDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7316,7 +7316,7 @@ class ArrayMultiDimensionLiteralsLongPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7389,7 +7389,7 @@ class ArrayMultiDimensionLiteralsULongPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7407,7 +7407,7 @@ class ArrayMultiDimensionLiteralsULongPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7480,7 +7480,7 @@ class ArrayMultiDimensionLiteralsLongLongPubSubType : public eprosima::fastdds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7498,7 +7498,7 @@ class ArrayMultiDimensionLiteralsLongLongPubSubType : public eprosima::fastdds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7571,7 +7571,7 @@ class ArrayMultiDimensionLiteralsULongLongPubSubType : public eprosima::fastdds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7589,7 +7589,7 @@ class ArrayMultiDimensionLiteralsULongLongPubSubType : public eprosima::fastdds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7662,7 +7662,7 @@ class ArrayMultiDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7680,7 +7680,7 @@ class ArrayMultiDimensionLiteralsFloatPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7753,7 +7753,7 @@ class ArrayMultiDimensionLiteralsDoublePubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7771,7 +7771,7 @@ class ArrayMultiDimensionLiteralsDoublePubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7844,7 +7844,7 @@ class ArrayMultiDimensionLiteralsLongDoublePubSubType : public eprosima::fastdds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7862,7 +7862,7 @@ class ArrayMultiDimensionLiteralsLongDoublePubSubType : public eprosima::fastdds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7935,7 +7935,7 @@ class ArrayMultiDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::d
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7953,7 +7953,7 @@ class ArrayMultiDimensionLiteralsBooleanPubSubType : public eprosima::fastdds::d
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8026,7 +8026,7 @@ class ArrayMultiDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8044,7 +8044,7 @@ class ArrayMultiDimensionLiteralsOctetPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8117,7 +8117,7 @@ class ArrayMultiDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8135,7 +8135,7 @@ class ArrayMultiDimensionLiteralsCharPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8208,7 +8208,7 @@ class ArrayMultiDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8226,7 +8226,7 @@ class ArrayMultiDimensionLiteralsWCharPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8299,7 +8299,7 @@ class ArrayMultiDimensionLiteralsStringPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8317,7 +8317,7 @@ class ArrayMultiDimensionLiteralsStringPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8390,7 +8390,7 @@ class ArrayMultiDimensionLiteralsWStringPubSubType : public eprosima::fastdds::d
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8408,7 +8408,7 @@ class ArrayMultiDimensionLiteralsWStringPubSubType : public eprosima::fastdds::d
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8481,7 +8481,7 @@ class ArrayMultiDimensionLiteralsBoundedStringPubSubType : public eprosima::fast
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8499,7 +8499,7 @@ class ArrayMultiDimensionLiteralsBoundedStringPubSubType : public eprosima::fast
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8572,7 +8572,7 @@ class ArrayMultiDimensionLiteralsBoundedWStringPubSubType : public eprosima::fas
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8590,7 +8590,7 @@ class ArrayMultiDimensionLiteralsBoundedWStringPubSubType : public eprosima::fas
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8663,7 +8663,7 @@ class ArrayMultiDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8681,7 +8681,7 @@ class ArrayMultiDimensionLiteralsEnumPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8754,7 +8754,7 @@ class ArrayMultiDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::d
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8772,7 +8772,7 @@ class ArrayMultiDimensionLiteralsBitMaskPubSubType : public eprosima::fastdds::d
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8845,7 +8845,7 @@ class ArrayMultiDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8863,7 +8863,7 @@ class ArrayMultiDimensionLiteralsAliasPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8936,7 +8936,7 @@ class ArrayMultiDimensionLiteralsSequencePubSubType : public eprosima::fastdds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8954,7 +8954,7 @@ class ArrayMultiDimensionLiteralsSequencePubSubType : public eprosima::fastdds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9027,7 +9027,7 @@ class ArrayMultiDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9045,7 +9045,7 @@ class ArrayMultiDimensionLiteralsMapPubSubType : public eprosima::fastdds::dds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9118,7 +9118,7 @@ class ArrayMultiDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9136,7 +9136,7 @@ class ArrayMultiDimensionLiteralsUnionPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9209,7 +9209,7 @@ class ArrayMultiDimensionLiteralsStructurePubSubType : public eprosima::fastdds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9227,7 +9227,7 @@ class ArrayMultiDimensionLiteralsStructurePubSubType : public eprosima::fastdds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9300,7 +9300,7 @@ class ArrayMultiDimensionLiteralsBitSetPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9318,7 +9318,7 @@ class ArrayMultiDimensionLiteralsBitSetPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9391,7 +9391,7 @@ class BoundedSmallArraysPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9409,7 +9409,7 @@ class BoundedSmallArraysPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9482,7 +9482,7 @@ class BoundedBigArraysPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9500,10 +9500,10 @@ class BoundedBigArraysPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_ARRAYS_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__ARRAYS_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/arraysTypeObjectSupport.hpp b/test/dds-types-test/arraysTypeObjectSupport.hpp
index 1c8fd6edd70..5bc966c0c8f 100644
--- a/test/dds-types-test/arraysTypeObjectSupport.hpp
+++ b/test/dds-types-test/arraysTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ARRAYS_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_ARRAYS_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__ARRAYS_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__ARRAYS_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -1290,4 +1290,4 @@ eProsima_user_DllExport void register_BoundedBigArrays_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_ARRAYS_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__ARRAYS_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/bitsets.hpp b/test/dds-types-test/bitsets.hpp
index 7f2bf737f31..f4e895b1968 100644
--- a/test/dds-types-test/bitsets.hpp
+++ b/test/dds-types-test/bitsets.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_BITSETS_HPP_
-#define _FAST_DDS_GENERATED_BITSETS_HPP_
+#ifndef FAST_DDS_GENERATED__BITSETS_HPP
+#define FAST_DDS_GENERATED__BITSETS_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/test/dds-types-test/bitsetsCdrAux.hpp b/test/dds-types-test/bitsetsCdrAux.hpp
index 6110c23182d..c07f4ef7b74 100644
--- a/test/dds-types-test/bitsetsCdrAux.hpp
+++ b/test/dds-types-test/bitsetsCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_BITSETSCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_BITSETSCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__BITSETSCDRAUX_HPP
+#define FAST_DDS_GENERATED__BITSETSCDRAUX_HPP
 
 #include "bitsets.hpp"
 
@@ -58,5 +58,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_BITSETSCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__BITSETSCDRAUX_HPP
 
diff --git a/test/dds-types-test/bitsetsCdrAux.ipp b/test/dds-types-test/bitsetsCdrAux.ipp
index f2b1507129d..6b1e3724363 100644
--- a/test/dds-types-test/bitsetsCdrAux.ipp
+++ b/test/dds-types-test/bitsetsCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_BITSETSCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_BITSETSCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__BITSETSCDRAUX_IPP
+#define FAST_DDS_GENERATED__BITSETSCDRAUX_IPP
 
 #include "bitsetsCdrAux.hpp"
 
@@ -326,5 +326,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_BITSETSCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__BITSETSCDRAUX_IPP
 
diff --git a/test/dds-types-test/bitsetsPubSubTypes.cxx b/test/dds-types-test/bitsetsPubSubTypes.cxx
index fc64bb4f953..c5d91cc1dd7 100644
--- a/test/dds-types-test/bitsetsPubSubTypes.cxx
+++ b/test/dds-types-test/bitsetsPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "bitsetsPubSubTypes.h"
+#include "bitsetsPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/bitsetsPubSubTypes.h b/test/dds-types-test/bitsetsPubSubTypes.hpp
similarity index 88%
rename from test/dds-types-test/bitsetsPubSubTypes.h
rename to test/dds-types-test/bitsetsPubSubTypes.hpp
index 2d431064449..bb349267a1a 100644
--- a/test/dds-types-test/bitsetsPubSubTypes.h
+++ b/test/dds-types-test/bitsetsPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file bitsetsPubSubTypes.h
+ * @file bitsetsPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_BITSETS_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_BITSETS_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__BITSETS_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__BITSETS_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "bitsets.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,10 +125,10 @@ class BitsetStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_BITSETS_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__BITSETS_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/bitsetsTypeObjectSupport.hpp b/test/dds-types-test/bitsetsTypeObjectSupport.hpp
index 58e9d8275c4..d1b6e4e852e 100644
--- a/test/dds-types-test/bitsetsTypeObjectSupport.hpp
+++ b/test/dds-types-test/bitsetsTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_BITSETS_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_BITSETS_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__BITSETS_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__BITSETS_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -102,4 +102,4 @@ eProsima_user_DllExport void register_BitsetStruct_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_BITSETS_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__BITSETS_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/constants.hpp b/test/dds-types-test/constants.hpp
index 03ec476cc5e..115272af13d 100644
--- a/test/dds-types-test/constants.hpp
+++ b/test/dds-types-test/constants.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CONSTANTS_HPP_
-#define _FAST_DDS_GENERATED_CONSTANTS_HPP_
+#ifndef FAST_DDS_GENERATED__CONSTANTS_HPP
+#define FAST_DDS_GENERATED__CONSTANTS_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/test/dds-types-test/constantsCdrAux.hpp b/test/dds-types-test/constantsCdrAux.hpp
index 16cfc9c3a24..e203fb3515b 100644
--- a/test/dds-types-test/constantsCdrAux.hpp
+++ b/test/dds-types-test/constantsCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CONSTANTSCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_CONSTANTSCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__CONSTANTSCDRAUX_HPP
+#define FAST_DDS_GENERATED__CONSTANTSCDRAUX_HPP
 
 #include "constants.hpp"
 
@@ -65,5 +65,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_CONSTANTSCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__CONSTANTSCDRAUX_HPP
 
diff --git a/test/dds-types-test/constantsCdrAux.ipp b/test/dds-types-test/constantsCdrAux.ipp
index 9ccaaf8eed2..f621921540a 100644
--- a/test/dds-types-test/constantsCdrAux.ipp
+++ b/test/dds-types-test/constantsCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CONSTANTSCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_CONSTANTSCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__CONSTANTSCDRAUX_IPP
+#define FAST_DDS_GENERATED__CONSTANTSCDRAUX_IPP
 
 #include "constantsCdrAux.hpp"
 
@@ -546,5 +546,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_CONSTANTSCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__CONSTANTSCDRAUX_IPP
 
diff --git a/test/dds-types-test/constantsPubSubTypes.cxx b/test/dds-types-test/constantsPubSubTypes.cxx
index debbad50029..6ef0459d6e6 100644
--- a/test/dds-types-test/constantsPubSubTypes.cxx
+++ b/test/dds-types-test/constantsPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "constantsPubSubTypes.h"
+#include "constantsPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/constantsPubSubTypes.h b/test/dds-types-test/constantsPubSubTypes.hpp
similarity index 93%
rename from test/dds-types-test/constantsPubSubTypes.h
rename to test/dds-types-test/constantsPubSubTypes.hpp
index 95fd8359c92..e756388d7d5 100644
--- a/test/dds-types-test/constantsPubSubTypes.h
+++ b/test/dds-types-test/constantsPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file constantsPubSubTypes.h
+ * @file constantsPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_CONSTANTS_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_CONSTANTS_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__CONSTANTS_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__CONSTANTS_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "constants.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -113,7 +113,7 @@ namespace const_module1
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -131,7 +131,7 @@ namespace const_module1
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -207,7 +207,7 @@ namespace const_module2
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -225,7 +225,7 @@ namespace const_module2
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -299,7 +299,7 @@ class ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -317,10 +317,10 @@ class ConstsLiteralsStructPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_CONSTANTS_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__CONSTANTS_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/constantsTypeObjectSupport.hpp b/test/dds-types-test/constantsTypeObjectSupport.hpp
index 0a6df72fe5f..2b966f34fdb 100644
--- a/test/dds-types-test/constantsTypeObjectSupport.hpp
+++ b/test/dds-types-test/constantsTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CONSTANTS_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_CONSTANTS_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__CONSTANTS_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__CONSTANTS_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -114,4 +114,4 @@ eProsima_user_DllExport void register_ConstsLiteralsStruct_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_CONSTANTS_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__CONSTANTS_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/declarations.hpp b/test/dds-types-test/declarations.hpp
index 5326559032d..8c7f9b01b29 100644
--- a/test/dds-types-test/declarations.hpp
+++ b/test/dds-types-test/declarations.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DECLARATIONS_HPP_
-#define _FAST_DDS_GENERATED_DECLARATIONS_HPP_
+#ifndef FAST_DDS_GENERATED__DECLARATIONS_HPP
+#define FAST_DDS_GENERATED__DECLARATIONS_HPP
 
 #include <cstdint>
 #include <functional>
diff --git a/test/dds-types-test/declarationsCdrAux.hpp b/test/dds-types-test/declarationsCdrAux.hpp
index 5b355cb38ed..2590c05308c 100644
--- a/test/dds-types-test/declarationsCdrAux.hpp
+++ b/test/dds-types-test/declarationsCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DECLARATIONSCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_DECLARATIONSCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__DECLARATIONSCDRAUX_HPP
+#define FAST_DDS_GENERATED__DECLARATIONSCDRAUX_HPP
 
 #include "declarations.hpp"
 
@@ -87,5 +87,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_DECLARATIONSCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__DECLARATIONSCDRAUX_HPP
 
diff --git a/test/dds-types-test/declarationsCdrAux.ipp b/test/dds-types-test/declarationsCdrAux.ipp
index dbe507fbbd3..729bd76d314 100644
--- a/test/dds-types-test/declarationsCdrAux.ipp
+++ b/test/dds-types-test/declarationsCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_DECLARATIONSCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_DECLARATIONSCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__DECLARATIONSCDRAUX_IPP
+#define FAST_DDS_GENERATED__DECLARATIONSCDRAUX_IPP
 
 #include "declarationsCdrAux.hpp"
 
@@ -849,5 +849,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_DECLARATIONSCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__DECLARATIONSCDRAUX_IPP
 
diff --git a/test/dds-types-test/declarationsPubSubTypes.cxx b/test/dds-types-test/declarationsPubSubTypes.cxx
index e93c5cd74d4..6c060c36f7d 100644
--- a/test/dds-types-test/declarationsPubSubTypes.cxx
+++ b/test/dds-types-test/declarationsPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "declarationsPubSubTypes.h"
+#include "declarationsPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/declarationsPubSubTypes.h b/test/dds-types-test/declarationsPubSubTypes.hpp
similarity index 95%
rename from test/dds-types-test/declarationsPubSubTypes.h
rename to test/dds-types-test/declarationsPubSubTypes.hpp
index 62400b0d9b7..d066074f218 100644
--- a/test/dds-types-test/declarationsPubSubTypes.h
+++ b/test/dds-types-test/declarationsPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file declarationsPubSubTypes.h
+ * @file declarationsPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_DECLARATIONS_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_DECLARATIONS_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__DECLARATIONS_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__DECLARATIONS_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "declarations.hpp"
 
@@ -111,7 +111,7 @@ class ForwardDeclarationsRecursiveStructPubSubType : public eprosima::fastdds::d
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -129,7 +129,7 @@ class ForwardDeclarationsRecursiveStructPubSubType : public eprosima::fastdds::d
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -203,7 +203,7 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -221,7 +221,7 @@ class ForwardStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -300,7 +300,7 @@ namespace declarations_module
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -318,7 +318,7 @@ namespace declarations_module
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -392,7 +392,7 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -410,7 +410,7 @@ class ModuledForwardDeclarationsRecursiveStructPubSubType : public eprosima::fas
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -485,7 +485,7 @@ namespace declarations_module
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -503,7 +503,7 @@ namespace declarations_module
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -579,7 +579,7 @@ class ModuledCommonNameStructurePubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -597,10 +597,10 @@ class ModuledCommonNameStructurePubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_DECLARATIONS_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__DECLARATIONS_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/enumerations.hpp b/test/dds-types-test/enumerations.hpp
index 479daea2320..7308cd3a8ba 100644
--- a/test/dds-types-test/enumerations.hpp
+++ b/test/dds-types-test/enumerations.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ENUMERATIONS_HPP_
-#define _FAST_DDS_GENERATED_ENUMERATIONS_HPP_
+#ifndef FAST_DDS_GENERATED__ENUMERATIONS_HPP
+#define FAST_DDS_GENERATED__ENUMERATIONS_HPP
 
 #include <cstdint>
 #include <utility>
@@ -56,7 +56,7 @@ namespace Test {
  * @brief This class represents the enumeration InnerEnumHelper defined by the user in the IDL file.
  * @ingroup enumerations
  */
-enum class InnerEnumHelper : uint32_t
+enum class InnerEnumHelper : int32_t
 {
     ENUM_VALUE_1,
     ENUM_VALUE_2,
diff --git a/test/dds-types-test/enumerationsCdrAux.hpp b/test/dds-types-test/enumerationsCdrAux.hpp
index 3d08dab9df2..7dc2039594d 100644
--- a/test/dds-types-test/enumerationsCdrAux.hpp
+++ b/test/dds-types-test/enumerationsCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ENUMERATIONSCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_ENUMERATIONSCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__ENUMERATIONSCDRAUX_HPP
+#define FAST_DDS_GENERATED__ENUMERATIONSCDRAUX_HPP
 
 #include "enumerations.hpp"
 
@@ -68,5 +68,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_ENUMERATIONSCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__ENUMERATIONSCDRAUX_HPP
 
diff --git a/test/dds-types-test/enumerationsCdrAux.ipp b/test/dds-types-test/enumerationsCdrAux.ipp
index 94fa872e055..aa3433b1a5a 100644
--- a/test/dds-types-test/enumerationsCdrAux.ipp
+++ b/test/dds-types-test/enumerationsCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ENUMERATIONSCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_ENUMERATIONSCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__ENUMERATIONSCDRAUX_IPP
+#define FAST_DDS_GENERATED__ENUMERATIONSCDRAUX_IPP
 
 #include "enumerationsCdrAux.hpp"
 
@@ -274,5 +274,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_ENUMERATIONSCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__ENUMERATIONSCDRAUX_IPP
 
diff --git a/test/dds-types-test/enumerationsPubSubTypes.cxx b/test/dds-types-test/enumerationsPubSubTypes.cxx
index 826883bfd44..3ce6ab2b8ce 100644
--- a/test/dds-types-test/enumerationsPubSubTypes.cxx
+++ b/test/dds-types-test/enumerationsPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "enumerationsPubSubTypes.h"
+#include "enumerationsPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/enumerationsPubSubTypes.h b/test/dds-types-test/enumerationsPubSubTypes.hpp
similarity index 92%
rename from test/dds-types-test/enumerationsPubSubTypes.h
rename to test/dds-types-test/enumerationsPubSubTypes.hpp
index 5cb3727f2de..f2ac0587742 100644
--- a/test/dds-types-test/enumerationsPubSubTypes.h
+++ b/test/dds-types-test/enumerationsPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file enumerationsPubSubTypes.h
+ * @file enumerationsPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_ENUMERATIONS_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_ENUMERATIONS_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__ENUMERATIONS_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__ENUMERATIONS_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "enumerations.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -110,7 +110,7 @@ class EnumStructurePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -128,7 +128,7 @@ class EnumStructurePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -201,7 +201,7 @@ class BitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -219,7 +219,7 @@ class BitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -292,7 +292,7 @@ class BoundedBitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -310,10 +310,10 @@ class BoundedBitMaskStructurePubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_ENUMERATIONS_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__ENUMERATIONS_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/enumerationsTypeObjectSupport.hpp b/test/dds-types-test/enumerationsTypeObjectSupport.hpp
index 08acc9b2f36..4920e8ed4bb 100644
--- a/test/dds-types-test/enumerationsTypeObjectSupport.hpp
+++ b/test/dds-types-test/enumerationsTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ENUMERATIONS_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_ENUMERATIONS_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__ENUMERATIONS_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__ENUMERATIONS_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -93,4 +93,4 @@ eProsima_user_DllExport void register_BoundedBitMaskStructure_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_ENUMERATIONS_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__ENUMERATIONS_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/external.hpp b/test/dds-types-test/external.hpp
index 7df59b4b91d..b54c9589f62 100644
--- a/test/dds-types-test/external.hpp
+++ b/test/dds-types-test/external.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EXTERNAL_HPP_
-#define _FAST_DDS_GENERATED_EXTERNAL_HPP_
+#ifndef FAST_DDS_GENERATED__EXTERNAL_HPP
+#define FAST_DDS_GENERATED__EXTERNAL_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/test/dds-types-test/externalCdrAux.hpp b/test/dds-types-test/externalCdrAux.hpp
index f45f982933e..c97303b7670 100644
--- a/test/dds-types-test/externalCdrAux.hpp
+++ b/test/dds-types-test/externalCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EXTERNALCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_EXTERNALCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__EXTERNALCDRAUX_HPP
+#define FAST_DDS_GENERATED__EXTERNALCDRAUX_HPP
 
 #include "external.hpp"
 
@@ -244,5 +244,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EXTERNALCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__EXTERNALCDRAUX_HPP
 
diff --git a/test/dds-types-test/externalCdrAux.ipp b/test/dds-types-test/externalCdrAux.ipp
index 76a3e9f6908..d3c3971bbdb 100644
--- a/test/dds-types-test/externalCdrAux.ipp
+++ b/test/dds-types-test/externalCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_EXTERNALCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_EXTERNALCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__EXTERNALCDRAUX_IPP
+#define FAST_DDS_GENERATED__EXTERNALCDRAUX_IPP
 
 #include "externalCdrAux.hpp"
 
@@ -2434,5 +2434,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_EXTERNALCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__EXTERNALCDRAUX_IPP
 
diff --git a/test/dds-types-test/externalPubSubTypes.cxx b/test/dds-types-test/externalPubSubTypes.cxx
index 13fa731867e..2c136fe9f45 100644
--- a/test/dds-types-test/externalPubSubTypes.cxx
+++ b/test/dds-types-test/externalPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "externalPubSubTypes.h"
+#include "externalPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/externalPubSubTypes.h b/test/dds-types-test/externalPubSubTypes.hpp
similarity index 95%
rename from test/dds-types-test/externalPubSubTypes.h
rename to test/dds-types-test/externalPubSubTypes.hpp
index 9217ad0187b..ddab0c35114 100644
--- a/test/dds-types-test/externalPubSubTypes.h
+++ b/test/dds-types-test/externalPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file externalPubSubTypes.h
+ * @file externalPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_EXTERNAL_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_EXTERNAL_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__EXTERNAL_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__EXTERNAL_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "external.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class short_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,7 +125,7 @@ class short_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -198,7 +198,7 @@ class ushort_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -216,7 +216,7 @@ class ushort_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -289,7 +289,7 @@ class long_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -307,7 +307,7 @@ class long_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -380,7 +380,7 @@ class ulong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -398,7 +398,7 @@ class ulong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -471,7 +471,7 @@ class longlong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -489,7 +489,7 @@ class longlong_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -562,7 +562,7 @@ class ulonglong_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -580,7 +580,7 @@ class ulonglong_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -653,7 +653,7 @@ class float_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -671,7 +671,7 @@ class float_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -744,7 +744,7 @@ class double_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -762,7 +762,7 @@ class double_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -835,7 +835,7 @@ class longdouble_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -853,7 +853,7 @@ class longdouble_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -926,7 +926,7 @@ class boolean_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -944,7 +944,7 @@ class boolean_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1017,7 +1017,7 @@ class octet_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1035,7 +1035,7 @@ class octet_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1108,7 +1108,7 @@ class char_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1126,7 +1126,7 @@ class char_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1199,7 +1199,7 @@ class wchar_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1217,7 +1217,7 @@ class wchar_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1290,7 +1290,7 @@ class sequence_short_externalPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1308,7 +1308,7 @@ class sequence_short_externalPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1381,7 +1381,7 @@ class string_unbounded_externalPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1399,7 +1399,7 @@ class string_unbounded_externalPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1472,7 +1472,7 @@ class string_bounded_externalPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1490,7 +1490,7 @@ class string_bounded_externalPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1563,7 +1563,7 @@ class map_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1581,7 +1581,7 @@ class map_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1654,7 +1654,7 @@ class array_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1672,7 +1672,7 @@ class array_short_externalPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1745,7 +1745,7 @@ class struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1763,7 +1763,7 @@ class struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1836,7 +1836,7 @@ class InnerStructExternalPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1854,7 +1854,7 @@ class InnerStructExternalPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1927,7 +1927,7 @@ class ext_struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1945,7 +1945,7 @@ class ext_struct_externalPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2018,7 +2018,7 @@ class ext_and_inner_struct_externalPubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2036,7 +2036,7 @@ class ext_and_inner_struct_externalPubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2109,7 +2109,7 @@ class struct_external_optionalPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2127,7 +2127,7 @@ class struct_external_optionalPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2201,7 +2201,7 @@ class recursive_union_containerPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2219,7 +2219,7 @@ class recursive_union_containerPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2293,7 +2293,7 @@ class recursive_test_1PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2311,7 +2311,7 @@ class recursive_test_1PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2386,7 +2386,7 @@ class recursive_structurePubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2404,7 +2404,7 @@ class recursive_structurePubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2477,7 +2477,7 @@ class recursive_test_2PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2495,10 +2495,10 @@ class recursive_test_2PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_EXTERNAL_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__EXTERNAL_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/final.hpp b/test/dds-types-test/final.hpp
index 6e60b4d1d69..eccac14ef45 100644
--- a/test/dds-types-test/final.hpp
+++ b/test/dds-types-test/final.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_FINAL_HPP_
-#define _FAST_DDS_GENERATED_FINAL_HPP_
+#ifndef FAST_DDS_GENERATED__FINAL_HPP
+#define FAST_DDS_GENERATED__FINAL_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/test/dds-types-test/finalCdrAux.hpp b/test/dds-types-test/finalCdrAux.hpp
index 91e1d65694d..a2059306338 100644
--- a/test/dds-types-test/finalCdrAux.hpp
+++ b/test/dds-types-test/finalCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_FINALCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_FINALCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__FINALCDRAUX_HPP
+#define FAST_DDS_GENERATED__FINALCDRAUX_HPP
 
 #include "final.hpp"
 
@@ -182,5 +182,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_FINALCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__FINALCDRAUX_HPP
 
diff --git a/test/dds-types-test/finalCdrAux.ipp b/test/dds-types-test/finalCdrAux.ipp
index e061f75f73a..9ca67d849d7 100644
--- a/test/dds-types-test/finalCdrAux.ipp
+++ b/test/dds-types-test/finalCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_FINALCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_FINALCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__FINALCDRAUX_IPP
+#define FAST_DDS_GENERATED__FINALCDRAUX_IPP
 
 #include "finalCdrAux.hpp"
 
@@ -1486,5 +1486,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_FINALCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__FINALCDRAUX_IPP
 
diff --git a/test/dds-types-test/finalPubSubTypes.cxx b/test/dds-types-test/finalPubSubTypes.cxx
index 3f2fc3667f3..e83b5ae42c3 100644
--- a/test/dds-types-test/finalPubSubTypes.cxx
+++ b/test/dds-types-test/finalPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "finalPubSubTypes.h"
+#include "finalPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/finalPubSubTypes.h b/test/dds-types-test/finalPubSubTypes.hpp
similarity index 94%
rename from test/dds-types-test/finalPubSubTypes.h
rename to test/dds-types-test/finalPubSubTypes.hpp
index e25da07b1e5..f0e601fca31 100644
--- a/test/dds-types-test/finalPubSubTypes.h
+++ b/test/dds-types-test/finalPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file finalPubSubTypes.h
+ * @file finalPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_FINAL_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_FINAL_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__FINAL_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__FINAL_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "final.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -140,9 +140,9 @@ class FinalShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -164,7 +164,7 @@ class FinalShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -286,9 +286,9 @@ class FinalUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -310,7 +310,7 @@ class FinalUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -432,9 +432,9 @@ class FinalLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -456,7 +456,7 @@ class FinalLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -578,9 +578,9 @@ class FinalULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -602,7 +602,7 @@ class FinalULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -724,9 +724,9 @@ class FinalLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -748,7 +748,7 @@ class FinalLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -870,9 +870,9 @@ class FinalULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -894,7 +894,7 @@ class FinalULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -1016,9 +1016,9 @@ class FinalFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -1040,7 +1040,7 @@ class FinalFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -1162,9 +1162,9 @@ class FinalDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -1186,7 +1186,7 @@ class FinalDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -1308,9 +1308,9 @@ class FinalLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -1332,7 +1332,7 @@ class FinalLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -1454,9 +1454,9 @@ class FinalBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -1478,7 +1478,7 @@ class FinalBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -1600,9 +1600,9 @@ class FinalOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -1624,7 +1624,7 @@ class FinalOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -1746,9 +1746,9 @@ class FinalCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -1770,7 +1770,7 @@ class FinalCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -1892,9 +1892,9 @@ class FinalWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -1916,7 +1916,7 @@ class FinalWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -2005,7 +2005,7 @@ class FinalUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2023,7 +2023,7 @@ class FinalUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2096,9 +2096,9 @@ class FinalEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -2120,7 +2120,7 @@ class FinalEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -2205,7 +2205,7 @@ class FinalEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2223,7 +2223,7 @@ class FinalEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2296,7 +2296,7 @@ class FinalInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2314,7 +2314,7 @@ class FinalInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2387,9 +2387,9 @@ class InheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -2411,7 +2411,7 @@ class InheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -2533,9 +2533,9 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            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();
         }
@@ -2557,7 +2557,7 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 private:
@@ -2578,5 +2578,5 @@ class FinalExtensibilityInheritancePubSubType : public eprosima::fastdds::dds::T
 
 };
 
-#endif // _FAST_DDS_GENERATED_FINAL_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__FINAL_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/finalTypeObjectSupport.hpp b/test/dds-types-test/finalTypeObjectSupport.hpp
index 71618ed5a24..8a730fc658f 100644
--- a/test/dds-types-test/finalTypeObjectSupport.hpp
+++ b/test/dds-types-test/finalTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_FINAL_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_FINAL_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__FINAL_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__FINAL_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -270,4 +270,4 @@ eProsima_user_DllExport void register_FinalExtensibilityInheritance_type_identif
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_FINAL_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__FINAL_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/helpers/basic_inner_types.hpp b/test/dds-types-test/helpers/basic_inner_types.hpp
index 3c9e75a1d8b..305df1b3e31 100644
--- a/test/dds-types-test/helpers/basic_inner_types.hpp
+++ b/test/dds-types-test/helpers/basic_inner_types.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_BASIC_INNER_TYPES_HPP_
-#define _FAST_DDS_GENERATED_BASIC_INNER_TYPES_HPP_
+#ifndef FAST_DDS_GENERATED__BASIC_INNER_TYPES_HPP
+#define FAST_DDS_GENERATED__BASIC_INNER_TYPES_HPP
 
 #include <array>
 #include <cstdint>
@@ -62,7 +62,7 @@
  * @brief This class represents the enumeration InnerEnumHelper defined by the user in the IDL file.
  * @ingroup basic_inner_types
  */
-enum class InnerEnumHelper : uint32_t
+enum class InnerEnumHelper : int32_t
 {
     ENUM_VALUE_1,
     ENUM_VALUE_2,
diff --git a/test/dds-types-test/helpers/basic_inner_typesCdrAux.hpp b/test/dds-types-test/helpers/basic_inner_typesCdrAux.hpp
index df8e793ed1c..d4bd5d62095 100644
--- a/test/dds-types-test/helpers/basic_inner_typesCdrAux.hpp
+++ b/test/dds-types-test/helpers/basic_inner_typesCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_BASIC_INNER_TYPESCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_BASIC_INNER_TYPESCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__BASIC_INNER_TYPESCDRAUX_HPP
+#define FAST_DDS_GENERATED__BASIC_INNER_TYPESCDRAUX_HPP
 
 #include "basic_inner_types.hpp"
 
@@ -74,5 +74,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_BASIC_INNER_TYPESCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__BASIC_INNER_TYPESCDRAUX_HPP
 
diff --git a/test/dds-types-test/helpers/basic_inner_typesCdrAux.ipp b/test/dds-types-test/helpers/basic_inner_typesCdrAux.ipp
index 9a40d8e658b..81460277928 100644
--- a/test/dds-types-test/helpers/basic_inner_typesCdrAux.ipp
+++ b/test/dds-types-test/helpers/basic_inner_typesCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_BASIC_INNER_TYPESCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_BASIC_INNER_TYPESCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__BASIC_INNER_TYPESCDRAUX_IPP
+#define FAST_DDS_GENERATED__BASIC_INNER_TYPESCDRAUX_IPP
 
 #include "basic_inner_typesCdrAux.hpp"
 
@@ -400,5 +400,5 @@ eProsima_user_DllExport void deserialize(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_BASIC_INNER_TYPESCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__BASIC_INNER_TYPESCDRAUX_IPP
 
diff --git a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx
index 8c3c2e1ed7b..cea43fb311e 100644
--- a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx
+++ b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "basic_inner_typesPubSubTypes.h"
+#include "basic_inner_typesPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.h b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp
similarity index 92%
rename from test/dds-types-test/helpers/basic_inner_typesPubSubTypes.h
rename to test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp
index c60fb3da17a..a3cb7ac6e95 100644
--- a/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.h
+++ b/test/dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file basic_inner_typesPubSubTypes.h
+ * @file basic_inner_typesPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_BASIC_INNER_TYPES_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_BASIC_INNER_TYPES_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__BASIC_INNER_TYPES_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__BASIC_INNER_TYPES_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "basic_inner_types.hpp"
 
@@ -107,7 +107,7 @@ class InnerStructureHelperPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,7 +125,7 @@ class InnerStructureHelperPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -198,7 +198,7 @@ class InnerEmptyStructureHelperPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -216,7 +216,7 @@ class InnerEmptyStructureHelperPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -233,5 +233,5 @@ typedef InnerBitsetHelper inner_bitset_helper_alias;
 
 
 
-#endif // _FAST_DDS_GENERATED_BASIC_INNER_TYPES_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__BASIC_INNER_TYPES_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/helpers/basic_inner_typesTypeObjectSupport.hpp b/test/dds-types-test/helpers/basic_inner_typesTypeObjectSupport.hpp
index 3846a5fa21d..405b9e0e13e 100644
--- a/test/dds-types-test/helpers/basic_inner_typesTypeObjectSupport.hpp
+++ b/test/dds-types-test/helpers/basic_inner_typesTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_BASIC_INNER_TYPES_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_BASIC_INNER_TYPES_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__BASIC_INNER_TYPES_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__BASIC_INNER_TYPES_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -237,4 +237,4 @@ eProsima_user_DllExport void register_inner_bitset_helper_alias_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_BASIC_INNER_TYPES_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__BASIC_INNER_TYPES_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/inheritance.hpp b/test/dds-types-test/inheritance.hpp
index 9dd80dd1d99..68b4f1c2710 100644
--- a/test/dds-types-test/inheritance.hpp
+++ b/test/dds-types-test/inheritance.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_INHERITANCE_HPP_
-#define _FAST_DDS_GENERATED_INHERITANCE_HPP_
+#ifndef FAST_DDS_GENERATED__INHERITANCE_HPP
+#define FAST_DDS_GENERATED__INHERITANCE_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/test/dds-types-test/inheritanceCdrAux.hpp b/test/dds-types-test/inheritanceCdrAux.hpp
index 7e65ecb2295..a74bd263af3 100644
--- a/test/dds-types-test/inheritanceCdrAux.hpp
+++ b/test/dds-types-test/inheritanceCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_INHERITANCECDRAUX_HPP_
-#define _FAST_DDS_GENERATED_INHERITANCECDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__INHERITANCECDRAUX_HPP
+#define FAST_DDS_GENERATED__INHERITANCECDRAUX_HPP
 
 #include "inheritance.hpp"
 
@@ -111,5 +111,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_INHERITANCECDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__INHERITANCECDRAUX_HPP
 
diff --git a/test/dds-types-test/inheritanceCdrAux.ipp b/test/dds-types-test/inheritanceCdrAux.ipp
index 823351cb682..b6ded5cd0c2 100644
--- a/test/dds-types-test/inheritanceCdrAux.ipp
+++ b/test/dds-types-test/inheritanceCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_INHERITANCECDRAUX_IPP_
-#define _FAST_DDS_GENERATED_INHERITANCECDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__INHERITANCECDRAUX_IPP
+#define FAST_DDS_GENERATED__INHERITANCECDRAUX_IPP
 
 #include "inheritanceCdrAux.hpp"
 
@@ -1024,5 +1024,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_INHERITANCECDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__INHERITANCECDRAUX_IPP
 
diff --git a/test/dds-types-test/inheritancePubSubTypes.cxx b/test/dds-types-test/inheritancePubSubTypes.cxx
index 43cceb1a294..aea4de131a7 100644
--- a/test/dds-types-test/inheritancePubSubTypes.cxx
+++ b/test/dds-types-test/inheritancePubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "inheritancePubSubTypes.h"
+#include "inheritancePubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/inheritancePubSubTypes.h b/test/dds-types-test/inheritancePubSubTypes.hpp
similarity index 94%
rename from test/dds-types-test/inheritancePubSubTypes.h
rename to test/dds-types-test/inheritancePubSubTypes.hpp
index 712ce3f96af..d72a0642be2 100644
--- a/test/dds-types-test/inheritancePubSubTypes.h
+++ b/test/dds-types-test/inheritancePubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file inheritancePubSubTypes.h
+ * @file inheritancePubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_INHERITANCE_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_INHERITANCE_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__INHERITANCE_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__INHERITANCE_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "inheritance.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class InnerStructureHelperChildPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,7 +125,7 @@ class InnerStructureHelperChildPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -198,7 +198,7 @@ class InnerStructureHelperChildChildPubSubType : public eprosima::fastdds::dds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -216,7 +216,7 @@ class InnerStructureHelperChildChildPubSubType : public eprosima::fastdds::dds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -289,7 +289,7 @@ class InnerStructureHelperEmptyChildPubSubType : public eprosima::fastdds::dds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -307,7 +307,7 @@ class InnerStructureHelperEmptyChildPubSubType : public eprosima::fastdds::dds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -380,7 +380,7 @@ class InnerStructureHelperEmptyChildChildPubSubType : public eprosima::fastdds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -398,7 +398,7 @@ class InnerStructureHelperEmptyChildChildPubSubType : public eprosima::fastdds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -471,7 +471,7 @@ class InnerEmptyStructureHelperChildPubSubType : public eprosima::fastdds::dds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -489,7 +489,7 @@ class InnerEmptyStructureHelperChildPubSubType : public eprosima::fastdds::dds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -562,7 +562,7 @@ class StructAliasInheritanceStructPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -580,7 +580,7 @@ class StructAliasInheritanceStructPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -653,7 +653,7 @@ class StructuresInheritanceStructPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -671,7 +671,7 @@ class StructuresInheritanceStructPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -747,7 +747,7 @@ class BitsetsChildInheritanceStructPubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -765,10 +765,10 @@ class BitsetsChildInheritanceStructPubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_INHERITANCE_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__INHERITANCE_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/inheritanceTypeObjectSupport.hpp b/test/dds-types-test/inheritanceTypeObjectSupport.hpp
index 24923bd2e3c..5d176b62424 100644
--- a/test/dds-types-test/inheritanceTypeObjectSupport.hpp
+++ b/test/dds-types-test/inheritanceTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_INHERITANCE_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_INHERITANCE_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__INHERITANCE_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__INHERITANCE_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -174,4 +174,4 @@ eProsima_user_DllExport void register_BitsetsChildInheritanceStruct_type_identif
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_INHERITANCE_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__INHERITANCE_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/key.hpp b/test/dds-types-test/key.hpp
index 8e7b38735ae..e8900f5d406 100644
--- a/test/dds-types-test/key.hpp
+++ b/test/dds-types-test/key.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_KEY_HPP_
-#define _FAST_DDS_GENERATED_KEY_HPP_
+#ifndef FAST_DDS_GENERATED__KEY_HPP
+#define FAST_DDS_GENERATED__KEY_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/test/dds-types-test/keyCdrAux.hpp b/test/dds-types-test/keyCdrAux.hpp
index b3f64723ca2..4ee71139ebe 100644
--- a/test/dds-types-test/keyCdrAux.hpp
+++ b/test/dds-types-test/keyCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_KEYCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_KEYCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__KEYCDRAUX_HPP
+#define FAST_DDS_GENERATED__KEYCDRAUX_HPP
 
 #include "key.hpp"
 
@@ -154,5 +154,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_KEYCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__KEYCDRAUX_HPP
 
diff --git a/test/dds-types-test/keyCdrAux.ipp b/test/dds-types-test/keyCdrAux.ipp
index f9f3de89aee..fa4e07aa0b0 100644
--- a/test/dds-types-test/keyCdrAux.ipp
+++ b/test/dds-types-test/keyCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_KEYCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_KEYCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__KEYCDRAUX_IPP
+#define FAST_DDS_GENERATED__KEYCDRAUX_IPP
 
 #include "keyCdrAux.hpp"
 
@@ -1523,5 +1523,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_KEYCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__KEYCDRAUX_IPP
 
diff --git a/test/dds-types-test/keyPubSubTypes.cxx b/test/dds-types-test/keyPubSubTypes.cxx
index 26a62d22089..a625d907e39 100644
--- a/test/dds-types-test/keyPubSubTypes.cxx
+++ b/test/dds-types-test/keyPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "keyPubSubTypes.h"
+#include "keyPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/keyPubSubTypes.h b/test/dds-types-test/keyPubSubTypes.hpp
similarity index 95%
rename from test/dds-types-test/keyPubSubTypes.h
rename to test/dds-types-test/keyPubSubTypes.hpp
index 2520c03ba49..2e292ad59f7 100644
--- a/test/dds-types-test/keyPubSubTypes.h
+++ b/test/dds-types-test/keyPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file keyPubSubTypes.h
+ * @file keyPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_KEY_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_KEY_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__KEY_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__KEY_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "key.hpp"
 
@@ -106,7 +106,7 @@ class KeyedShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,7 +124,7 @@ class KeyedShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -197,7 +197,7 @@ class KeyedUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -215,7 +215,7 @@ class KeyedUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -288,7 +288,7 @@ class KeyedLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -306,7 +306,7 @@ class KeyedLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -379,7 +379,7 @@ class KeyedULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -397,7 +397,7 @@ class KeyedULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -470,7 +470,7 @@ class KeyedLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -488,7 +488,7 @@ class KeyedLongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -561,7 +561,7 @@ class KeyedULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -579,7 +579,7 @@ class KeyedULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -652,7 +652,7 @@ class KeyedFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -670,7 +670,7 @@ class KeyedFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -743,7 +743,7 @@ class KeyedDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -761,7 +761,7 @@ class KeyedDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -834,7 +834,7 @@ class KeyedLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -852,7 +852,7 @@ class KeyedLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -925,7 +925,7 @@ class KeyedBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -943,7 +943,7 @@ class KeyedBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1016,7 +1016,7 @@ class KeyedOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1034,7 +1034,7 @@ class KeyedOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1107,7 +1107,7 @@ class KeyedCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1125,7 +1125,7 @@ class KeyedCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1198,7 +1198,7 @@ class KeyedWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1216,7 +1216,7 @@ class KeyedWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1289,7 +1289,7 @@ class KeyedEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1307,7 +1307,7 @@ class KeyedEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1380,7 +1380,7 @@ class KeyedEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1398,7 +1398,7 @@ class KeyedEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1471,7 +1471,7 @@ class KeyedInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1489,7 +1489,7 @@ class KeyedInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1562,7 +1562,7 @@ class InheritanceKeyedEmptyStructPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1580,10 +1580,10 @@ class InheritanceKeyedEmptyStructPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_KEY_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__KEY_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/keyTypeObjectSupport.hpp b/test/dds-types-test/keyTypeObjectSupport.hpp
index 2f50c759b0b..b88defd7ae5 100644
--- a/test/dds-types-test/keyTypeObjectSupport.hpp
+++ b/test/dds-types-test/keyTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_KEY_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_KEY_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__KEY_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__KEY_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -245,4 +245,4 @@ eProsima_user_DllExport void register_InheritanceKeyedEmptyStruct_type_identifie
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_KEY_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__KEY_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/maps.hpp b/test/dds-types-test/maps.hpp
index 6fd13b98b5e..feb3ddf3ed8 100644
--- a/test/dds-types-test/maps.hpp
+++ b/test/dds-types-test/maps.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_MAPS_HPP_
-#define _FAST_DDS_GENERATED_MAPS_HPP_
+#ifndef FAST_DDS_GENERATED__MAPS_HPP
+#define FAST_DDS_GENERATED__MAPS_HPP
 
 #include <cstdint>
 #include <map>
diff --git a/test/dds-types-test/mapsCdrAux.hpp b/test/dds-types-test/mapsCdrAux.hpp
index f6fd7f6b21a..1f0fe8e8982 100644
--- a/test/dds-types-test/mapsCdrAux.hpp
+++ b/test/dds-types-test/mapsCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_MAPSCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_MAPSCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__MAPSCDRAUX_HPP
+#define FAST_DDS_GENERATED__MAPSCDRAUX_HPP
 
 #include "maps.hpp"
 
@@ -1884,5 +1884,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_MAPSCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__MAPSCDRAUX_HPP
 
diff --git a/test/dds-types-test/mapsCdrAux.ipp b/test/dds-types-test/mapsCdrAux.ipp
index d7be0c36f87..52f41c27157 100644
--- a/test/dds-types-test/mapsCdrAux.ipp
+++ b/test/dds-types-test/mapsCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_MAPSCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_MAPSCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__MAPSCDRAUX_IPP
+#define FAST_DDS_GENERATED__MAPSCDRAUX_IPP
 
 #include "mapsCdrAux.hpp"
 
@@ -19982,5 +19982,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_MAPSCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__MAPSCDRAUX_IPP
 
diff --git a/test/dds-types-test/mapsPubSubTypes.cxx b/test/dds-types-test/mapsPubSubTypes.cxx
index 396a3adc8dc..3107283f9df 100644
--- a/test/dds-types-test/mapsPubSubTypes.cxx
+++ b/test/dds-types-test/mapsPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "mapsPubSubTypes.h"
+#include "mapsPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/mapsPubSubTypes.h b/test/dds-types-test/mapsPubSubTypes.hpp
similarity index 95%
rename from test/dds-types-test/mapsPubSubTypes.h
rename to test/dds-types-test/mapsPubSubTypes.hpp
index 56ed4bef96f..34c1d60871e 100644
--- a/test/dds-types-test/mapsPubSubTypes.h
+++ b/test/dds-types-test/mapsPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file mapsPubSubTypes.h
+ * @file mapsPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_MAPS_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_MAPS_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__MAPS_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__MAPS_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "maps.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class MapShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,7 +125,7 @@ class MapShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -198,7 +198,7 @@ class MapShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -216,7 +216,7 @@ class MapShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -289,7 +289,7 @@ class MapShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -307,7 +307,7 @@ class MapShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -380,7 +380,7 @@ class MapShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -398,7 +398,7 @@ class MapShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -471,7 +471,7 @@ class MapShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -489,7 +489,7 @@ class MapShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -562,7 +562,7 @@ class MapShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -580,7 +580,7 @@ class MapShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -653,7 +653,7 @@ class MapShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -671,7 +671,7 @@ class MapShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -744,7 +744,7 @@ class MapShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -762,7 +762,7 @@ class MapShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -835,7 +835,7 @@ class MapShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -853,7 +853,7 @@ class MapShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -926,7 +926,7 @@ class MapShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -944,7 +944,7 @@ class MapShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1017,7 +1017,7 @@ class MapShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1035,7 +1035,7 @@ class MapShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1108,7 +1108,7 @@ class MapShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1126,7 +1126,7 @@ class MapShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1199,7 +1199,7 @@ class MapShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1217,7 +1217,7 @@ class MapShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1290,7 +1290,7 @@ class MapShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1308,7 +1308,7 @@ class MapShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1381,7 +1381,7 @@ class MapShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1399,7 +1399,7 @@ class MapShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1472,7 +1472,7 @@ class MapShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1490,7 +1490,7 @@ class MapShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1563,7 +1563,7 @@ class MapShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1581,7 +1581,7 @@ class MapShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1654,7 +1654,7 @@ class MapShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1672,7 +1672,7 @@ class MapShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1745,7 +1745,7 @@ class MapShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1763,7 +1763,7 @@ class MapShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1836,7 +1836,7 @@ class MapShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1854,7 +1854,7 @@ class MapShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1927,7 +1927,7 @@ class MapShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1945,7 +1945,7 @@ class MapShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2018,7 +2018,7 @@ class MapShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2036,7 +2036,7 @@ class MapShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2109,7 +2109,7 @@ class MapShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2127,7 +2127,7 @@ class MapShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2200,7 +2200,7 @@ class MapShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2218,7 +2218,7 @@ class MapShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2291,7 +2291,7 @@ class MapShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2309,7 +2309,7 @@ class MapShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2382,7 +2382,7 @@ class MapShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2400,7 +2400,7 @@ class MapShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2473,7 +2473,7 @@ class MapUShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2491,7 +2491,7 @@ class MapUShortShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2564,7 +2564,7 @@ class MapUShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2582,7 +2582,7 @@ class MapUShortUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2655,7 +2655,7 @@ class MapUShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2673,7 +2673,7 @@ class MapUShortLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2746,7 +2746,7 @@ class MapUShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2764,7 +2764,7 @@ class MapUShortULongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2837,7 +2837,7 @@ class MapUShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2855,7 +2855,7 @@ class MapUShortLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2928,7 +2928,7 @@ class MapUShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2946,7 +2946,7 @@ class MapUShortULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3019,7 +3019,7 @@ class MapUShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3037,7 +3037,7 @@ class MapUShortFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3110,7 +3110,7 @@ class MapUShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3128,7 +3128,7 @@ class MapUShortDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3201,7 +3201,7 @@ class MapUShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3219,7 +3219,7 @@ class MapUShortLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3292,7 +3292,7 @@ class MapUShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3310,7 +3310,7 @@ class MapUShortBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3383,7 +3383,7 @@ class MapUShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3401,7 +3401,7 @@ class MapUShortOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3474,7 +3474,7 @@ class MapUShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3492,7 +3492,7 @@ class MapUShortCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3565,7 +3565,7 @@ class MapUShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3583,7 +3583,7 @@ class MapUShortWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3656,7 +3656,7 @@ class MapUShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3674,7 +3674,7 @@ class MapUShortStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3747,7 +3747,7 @@ class MapUShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3765,7 +3765,7 @@ class MapUShortWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3838,7 +3838,7 @@ class MapUShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3856,7 +3856,7 @@ class MapUShortInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3929,7 +3929,7 @@ class MapUShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3947,7 +3947,7 @@ class MapUShortInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4020,7 +4020,7 @@ class MapUShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4038,7 +4038,7 @@ class MapUShortInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4111,7 +4111,7 @@ class MapUShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4129,7 +4129,7 @@ class MapUShortInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4202,7 +4202,7 @@ class MapUShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4220,7 +4220,7 @@ class MapUShortInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4293,7 +4293,7 @@ class MapUShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4311,7 +4311,7 @@ class MapUShortInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4384,7 +4384,7 @@ class MapUShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4402,7 +4402,7 @@ class MapUShortInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4475,7 +4475,7 @@ class MapUShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4493,7 +4493,7 @@ class MapUShortInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4566,7 +4566,7 @@ class MapUShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4584,7 +4584,7 @@ class MapUShortInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4657,7 +4657,7 @@ class MapUShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4675,7 +4675,7 @@ class MapUShortInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4748,7 +4748,7 @@ class MapUShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4766,7 +4766,7 @@ class MapUShortInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4839,7 +4839,7 @@ class MapLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4857,7 +4857,7 @@ class MapLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4930,7 +4930,7 @@ class MapLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4948,7 +4948,7 @@ class MapLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5021,7 +5021,7 @@ class MapLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5039,7 +5039,7 @@ class MapLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5112,7 +5112,7 @@ class MapLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5130,7 +5130,7 @@ class MapLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5203,7 +5203,7 @@ class MapLongKeyLongLongValuePubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5221,7 +5221,7 @@ class MapLongKeyLongLongValuePubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5294,7 +5294,7 @@ class MapLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5312,7 +5312,7 @@ class MapLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5385,7 +5385,7 @@ class MapLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5403,7 +5403,7 @@ class MapLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5476,7 +5476,7 @@ class MapLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5494,7 +5494,7 @@ class MapLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5567,7 +5567,7 @@ class MapLongKeyLongDoubleValuePubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5585,7 +5585,7 @@ class MapLongKeyLongDoubleValuePubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5658,7 +5658,7 @@ class MapLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5676,7 +5676,7 @@ class MapLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5749,7 +5749,7 @@ class MapLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5767,7 +5767,7 @@ class MapLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5840,7 +5840,7 @@ class MapLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5858,7 +5858,7 @@ class MapLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5931,7 +5931,7 @@ class MapLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5949,7 +5949,7 @@ class MapLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6022,7 +6022,7 @@ class MapLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6040,7 +6040,7 @@ class MapLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6113,7 +6113,7 @@ class MapLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6131,7 +6131,7 @@ class MapLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6204,7 +6204,7 @@ class MapLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6222,7 +6222,7 @@ class MapLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6295,7 +6295,7 @@ class MapLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6313,7 +6313,7 @@ class MapLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6386,7 +6386,7 @@ class MapLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6404,7 +6404,7 @@ class MapLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6477,7 +6477,7 @@ class MapLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6495,7 +6495,7 @@ class MapLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6568,7 +6568,7 @@ class MapLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6586,7 +6586,7 @@ class MapLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6659,7 +6659,7 @@ class MapLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6677,7 +6677,7 @@ class MapLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6750,7 +6750,7 @@ class MapLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6768,7 +6768,7 @@ class MapLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6841,7 +6841,7 @@ class MapLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6859,7 +6859,7 @@ class MapLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6932,7 +6932,7 @@ class MapLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6950,7 +6950,7 @@ class MapLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7023,7 +7023,7 @@ class MapLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7041,7 +7041,7 @@ class MapLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7114,7 +7114,7 @@ class MapLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7132,7 +7132,7 @@ class MapLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7205,7 +7205,7 @@ class MapULongShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7223,7 +7223,7 @@ class MapULongShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7296,7 +7296,7 @@ class MapULongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7314,7 +7314,7 @@ class MapULongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7387,7 +7387,7 @@ class MapULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7405,7 +7405,7 @@ class MapULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7478,7 +7478,7 @@ class MapULongULongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7496,7 +7496,7 @@ class MapULongULongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7569,7 +7569,7 @@ class MapKeyULongValueLongLongPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7587,7 +7587,7 @@ class MapKeyULongValueLongLongPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7660,7 +7660,7 @@ class MapULongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7678,7 +7678,7 @@ class MapULongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7751,7 +7751,7 @@ class MapULongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7769,7 +7769,7 @@ class MapULongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7842,7 +7842,7 @@ class MapULongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7860,7 +7860,7 @@ class MapULongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7933,7 +7933,7 @@ class MapKeyULongValueLongDoublePubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7951,7 +7951,7 @@ class MapKeyULongValueLongDoublePubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8024,7 +8024,7 @@ class MapULongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8042,7 +8042,7 @@ class MapULongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8115,7 +8115,7 @@ class MapULongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8133,7 +8133,7 @@ class MapULongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8206,7 +8206,7 @@ class MapULongCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8224,7 +8224,7 @@ class MapULongCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8297,7 +8297,7 @@ class MapULongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8315,7 +8315,7 @@ class MapULongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8388,7 +8388,7 @@ class MapULongStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8406,7 +8406,7 @@ class MapULongStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8479,7 +8479,7 @@ class MapULongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8497,7 +8497,7 @@ class MapULongWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8570,7 +8570,7 @@ class MapULongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8588,7 +8588,7 @@ class MapULongInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8661,7 +8661,7 @@ class MapULongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8679,7 +8679,7 @@ class MapULongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8752,7 +8752,7 @@ class MapULongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8770,7 +8770,7 @@ class MapULongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8843,7 +8843,7 @@ class MapULongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8861,7 +8861,7 @@ class MapULongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -8934,7 +8934,7 @@ class MapULongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -8952,7 +8952,7 @@ class MapULongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9025,7 +9025,7 @@ class MapULongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9043,7 +9043,7 @@ class MapULongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9116,7 +9116,7 @@ class MapULongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9134,7 +9134,7 @@ class MapULongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9207,7 +9207,7 @@ class MapULongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9225,7 +9225,7 @@ class MapULongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9298,7 +9298,7 @@ class MapULongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9316,7 +9316,7 @@ class MapULongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9389,7 +9389,7 @@ class MapULongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9407,7 +9407,7 @@ class MapULongInnerStructureHelperPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9480,7 +9480,7 @@ class MapULongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9498,7 +9498,7 @@ class MapULongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9571,7 +9571,7 @@ class MapLongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9589,7 +9589,7 @@ class MapLongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9662,7 +9662,7 @@ class MapLongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9680,7 +9680,7 @@ class MapLongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9753,7 +9753,7 @@ class MapLongLongKeyLongValuePubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9771,7 +9771,7 @@ class MapLongLongKeyLongValuePubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9844,7 +9844,7 @@ class MapLongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9862,7 +9862,7 @@ class MapLongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -9935,7 +9935,7 @@ class MapLongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -9953,7 +9953,7 @@ class MapLongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -10026,7 +10026,7 @@ class MapLongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -10044,7 +10044,7 @@ class MapLongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -10117,7 +10117,7 @@ class MapLongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -10135,7 +10135,7 @@ class MapLongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -10208,7 +10208,7 @@ class MapLongLongKeyDoubleValuePubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -10226,7 +10226,7 @@ class MapLongLongKeyDoubleValuePubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -10299,7 +10299,7 @@ class MapLongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -10317,7 +10317,7 @@ class MapLongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -10390,7 +10390,7 @@ class MapLongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -10408,7 +10408,7 @@ class MapLongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -10481,7 +10481,7 @@ class MapLongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -10499,7 +10499,7 @@ class MapLongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -10572,7 +10572,7 @@ class MapLongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -10590,7 +10590,7 @@ class MapLongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -10663,7 +10663,7 @@ class MapLongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -10681,7 +10681,7 @@ class MapLongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -10754,7 +10754,7 @@ class MapLongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -10772,7 +10772,7 @@ class MapLongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -10845,7 +10845,7 @@ class MapLongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -10863,7 +10863,7 @@ class MapLongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -10936,7 +10936,7 @@ class MapLongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fast
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -10954,7 +10954,7 @@ class MapLongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fast
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -11027,7 +11027,7 @@ class MapLongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fas
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -11045,7 +11045,7 @@ class MapLongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fas
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -11118,7 +11118,7 @@ class MapLongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -11136,7 +11136,7 @@ class MapLongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -11209,7 +11209,7 @@ class MapLongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -11227,7 +11227,7 @@ class MapLongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -11300,7 +11300,7 @@ class MapLongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -11318,7 +11318,7 @@ class MapLongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -11391,7 +11391,7 @@ class MapLongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -11409,7 +11409,7 @@ class MapLongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -11482,7 +11482,7 @@ class MapLongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -11500,7 +11500,7 @@ class MapLongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -11573,7 +11573,7 @@ class MapLongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -11591,7 +11591,7 @@ class MapLongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -11664,7 +11664,7 @@ class MapLongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -11682,7 +11682,7 @@ class MapLongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -11755,7 +11755,7 @@ class MapLongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -11773,7 +11773,7 @@ class MapLongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -11846,7 +11846,7 @@ class MapLongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -11864,7 +11864,7 @@ class MapLongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -11937,7 +11937,7 @@ class MapULongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -11955,7 +11955,7 @@ class MapULongLongShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -12028,7 +12028,7 @@ class MapULongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -12046,7 +12046,7 @@ class MapULongLongUShortPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -12119,7 +12119,7 @@ class MapULongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -12137,7 +12137,7 @@ class MapULongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -12210,7 +12210,7 @@ class MapULongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -12228,7 +12228,7 @@ class MapULongLongULongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -12301,7 +12301,7 @@ class MapULongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -12319,7 +12319,7 @@ class MapULongLongLongLongPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -12392,7 +12392,7 @@ class MapULongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -12410,7 +12410,7 @@ class MapULongLongULongLongPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -12483,7 +12483,7 @@ class MapULongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -12501,7 +12501,7 @@ class MapULongLongFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -12574,7 +12574,7 @@ class MapKeyULongLongValueDoublePubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -12592,7 +12592,7 @@ class MapKeyULongLongValueDoublePubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -12665,7 +12665,7 @@ class MapULongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -12683,7 +12683,7 @@ class MapULongLongLongDoublePubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -12756,7 +12756,7 @@ class MapULongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -12774,7 +12774,7 @@ class MapULongLongBooleanPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -12847,7 +12847,7 @@ class MapULongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -12865,7 +12865,7 @@ class MapULongLongOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -12938,7 +12938,7 @@ class MapULongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -12956,7 +12956,7 @@ class MapULongLongCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -13029,7 +13029,7 @@ class MapULongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -13047,7 +13047,7 @@ class MapULongLongWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -13120,7 +13120,7 @@ class MapULongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -13138,7 +13138,7 @@ class MapULongLongStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -13211,7 +13211,7 @@ class MapULongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -13229,7 +13229,7 @@ class MapULongLongWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -13302,7 +13302,7 @@ class MapULongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fas
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -13320,7 +13320,7 @@ class MapULongLongInnerAliasBoundedStringHelperPubSubType : public eprosima::fas
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -13393,7 +13393,7 @@ class MapULongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -13411,7 +13411,7 @@ class MapULongLongInnerAliasBoundedWStringHelperPubSubType : public eprosima::fa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -13484,7 +13484,7 @@ class MapULongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -13502,7 +13502,7 @@ class MapULongLongInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -13575,7 +13575,7 @@ class MapULongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -13593,7 +13593,7 @@ class MapULongLongInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -13666,7 +13666,7 @@ class MapULongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -13684,7 +13684,7 @@ class MapULongLongInnerAliasHelperPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -13757,7 +13757,7 @@ class MapULongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -13775,7 +13775,7 @@ class MapULongLongInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -13848,7 +13848,7 @@ class MapULongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -13866,7 +13866,7 @@ class MapULongLongInnerAliasSequenceHelperPubSubType : public eprosima::fastdds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -13939,7 +13939,7 @@ class MapULongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -13957,7 +13957,7 @@ class MapULongLongInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -14030,7 +14030,7 @@ class MapULongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -14048,7 +14048,7 @@ class MapULongLongInnerUnionHelperPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -14121,7 +14121,7 @@ class MapULongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -14139,7 +14139,7 @@ class MapULongLongInnerStructureHelperPubSubType : public eprosima::fastdds::dds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -14212,7 +14212,7 @@ class MapULongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -14230,7 +14230,7 @@ class MapULongLongInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -14303,7 +14303,7 @@ class MapStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -14321,7 +14321,7 @@ class MapStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -14394,7 +14394,7 @@ class MapStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -14412,7 +14412,7 @@ class MapStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -14485,7 +14485,7 @@ class MapStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -14503,7 +14503,7 @@ class MapStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -14576,7 +14576,7 @@ class MapStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -14594,7 +14594,7 @@ class MapStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -14667,7 +14667,7 @@ class MapStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -14685,7 +14685,7 @@ class MapStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -14758,7 +14758,7 @@ class MapStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -14776,7 +14776,7 @@ class MapStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -14849,7 +14849,7 @@ class MapStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -14867,7 +14867,7 @@ class MapStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -14940,7 +14940,7 @@ class MapStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -14958,7 +14958,7 @@ class MapStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -15031,7 +15031,7 @@ class MapStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -15049,7 +15049,7 @@ class MapStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -15122,7 +15122,7 @@ class MapStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -15140,7 +15140,7 @@ class MapStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -15213,7 +15213,7 @@ class MapStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -15231,7 +15231,7 @@ class MapStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -15304,7 +15304,7 @@ class MapStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -15322,7 +15322,7 @@ class MapStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -15395,7 +15395,7 @@ class MapStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -15413,7 +15413,7 @@ class MapStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -15486,7 +15486,7 @@ class MapStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -15504,7 +15504,7 @@ class MapStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -15577,7 +15577,7 @@ class MapStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -15595,7 +15595,7 @@ class MapStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -15668,7 +15668,7 @@ class MapStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -15686,7 +15686,7 @@ class MapStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -15759,7 +15759,7 @@ class MapStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -15777,7 +15777,7 @@ class MapStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fastd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -15850,7 +15850,7 @@ class MapStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -15868,7 +15868,7 @@ class MapStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -15941,7 +15941,7 @@ class MapStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -15959,7 +15959,7 @@ class MapStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -16032,7 +16032,7 @@ class MapStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -16050,7 +16050,7 @@ class MapStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -16123,7 +16123,7 @@ class MapStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -16141,7 +16141,7 @@ class MapStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -16214,7 +16214,7 @@ class MapStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -16232,7 +16232,7 @@ class MapStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -16305,7 +16305,7 @@ class MapStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -16323,7 +16323,7 @@ class MapStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -16396,7 +16396,7 @@ class MapStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -16414,7 +16414,7 @@ class MapStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -16487,7 +16487,7 @@ class MapStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -16505,7 +16505,7 @@ class MapStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -16578,7 +16578,7 @@ class MapStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -16596,7 +16596,7 @@ class MapStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -16669,7 +16669,7 @@ class MapWStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -16687,7 +16687,7 @@ class MapWStringShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -16760,7 +16760,7 @@ class MapWStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -16778,7 +16778,7 @@ class MapWStringUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -16851,7 +16851,7 @@ class MapWStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -16869,7 +16869,7 @@ class MapWStringLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -16942,7 +16942,7 @@ class MapWStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -16960,7 +16960,7 @@ class MapWStringULongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -17033,7 +17033,7 @@ class MapWStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -17051,7 +17051,7 @@ class MapWStringLongLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -17124,7 +17124,7 @@ class MapWStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -17142,7 +17142,7 @@ class MapWStringULongLongPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -17215,7 +17215,7 @@ class MapWStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -17233,7 +17233,7 @@ class MapWStringFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -17306,7 +17306,7 @@ class MapWStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -17324,7 +17324,7 @@ class MapWStringDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -17397,7 +17397,7 @@ class MapWStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -17415,7 +17415,7 @@ class MapWStringLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -17488,7 +17488,7 @@ class MapWStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -17506,7 +17506,7 @@ class MapWStringBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -17579,7 +17579,7 @@ class MapWStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -17597,7 +17597,7 @@ class MapWStringOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -17670,7 +17670,7 @@ class MapWStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -17688,7 +17688,7 @@ class MapWStringCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -17761,7 +17761,7 @@ class MapWStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -17779,7 +17779,7 @@ class MapWStringWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -17852,7 +17852,7 @@ class MapWStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -17870,7 +17870,7 @@ class MapWStringStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -17943,7 +17943,7 @@ class MapWStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -17961,7 +17961,7 @@ class MapWStringWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -18034,7 +18034,7 @@ class MapWStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -18052,7 +18052,7 @@ class MapWStringInnerAliasBoundedStringHelperPubSubType : public eprosima::fastd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -18125,7 +18125,7 @@ class MapWStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fast
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -18143,7 +18143,7 @@ class MapWStringInnerAliasBoundedWStringHelperPubSubType : public eprosima::fast
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -18216,7 +18216,7 @@ class MapWStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -18234,7 +18234,7 @@ class MapWStringInnerEnumHelperPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -18307,7 +18307,7 @@ class MapWStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -18325,7 +18325,7 @@ class MapWStringInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -18398,7 +18398,7 @@ class MapWStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -18416,7 +18416,7 @@ class MapWStringInnerAliasHelperPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -18489,7 +18489,7 @@ class MapWStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -18507,7 +18507,7 @@ class MapWStringInnerAliasArrayHelperPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -18580,7 +18580,7 @@ class MapWStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::d
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -18598,7 +18598,7 @@ class MapWStringInnerAliasSequenceHelperPubSubType : public eprosima::fastdds::d
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -18671,7 +18671,7 @@ class MapWStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -18689,7 +18689,7 @@ class MapWStringInnerAliasMapHelperPubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -18762,7 +18762,7 @@ class MapWStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -18780,7 +18780,7 @@ class MapWStringInnerUnionHelperPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -18853,7 +18853,7 @@ class MapWStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -18871,7 +18871,7 @@ class MapWStringInnerStructureHelperPubSubType : public eprosima::fastdds::dds::
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -18944,7 +18944,7 @@ class MapWStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -18962,7 +18962,7 @@ class MapWStringInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -19035,7 +19035,7 @@ class MapInnerAliasBoundedStringHelperShortPubSubType : public eprosima::fastdds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -19053,7 +19053,7 @@ class MapInnerAliasBoundedStringHelperShortPubSubType : public eprosima::fastdds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -19126,7 +19126,7 @@ class MapInnerAliasBoundedStringHelperUShortPubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -19144,7 +19144,7 @@ class MapInnerAliasBoundedStringHelperUShortPubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -19217,7 +19217,7 @@ class MapInnerAliasBoundedStringHelperLongPubSubType : public eprosima::fastdds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -19235,7 +19235,7 @@ class MapInnerAliasBoundedStringHelperLongPubSubType : public eprosima::fastdds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -19308,7 +19308,7 @@ class MapInnerAliasBoundedStringHelperULongPubSubType : public eprosima::fastdds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -19326,7 +19326,7 @@ class MapInnerAliasBoundedStringHelperULongPubSubType : public eprosima::fastdds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -19399,7 +19399,7 @@ class MapInnerAliasBoundedStringHelperLongLongPubSubType : public eprosima::fast
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -19417,7 +19417,7 @@ class MapInnerAliasBoundedStringHelperLongLongPubSubType : public eprosima::fast
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -19490,7 +19490,7 @@ class MapInnerAliasBoundedStringHelperULongLongPubSubType : public eprosima::fas
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -19508,7 +19508,7 @@ class MapInnerAliasBoundedStringHelperULongLongPubSubType : public eprosima::fas
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -19581,7 +19581,7 @@ class MapInnerAliasBoundedStringHelperFloatPubSubType : public eprosima::fastdds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -19599,7 +19599,7 @@ class MapInnerAliasBoundedStringHelperFloatPubSubType : public eprosima::fastdds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -19672,7 +19672,7 @@ class MapInnerAliasBoundedStringHelperDoublePubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -19690,7 +19690,7 @@ class MapInnerAliasBoundedStringHelperDoublePubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -19763,7 +19763,7 @@ class MapInnerAliasBoundedStringHelperLongDoublePubSubType : public eprosima::fa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -19781,7 +19781,7 @@ class MapInnerAliasBoundedStringHelperLongDoublePubSubType : public eprosima::fa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -19854,7 +19854,7 @@ class MapInnerAliasBoundedStringHelperBooleanPubSubType : public eprosima::fastd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -19872,7 +19872,7 @@ class MapInnerAliasBoundedStringHelperBooleanPubSubType : public eprosima::fastd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -19945,7 +19945,7 @@ class MapInnerAliasBoundedStringHelperOctetPubSubType : public eprosima::fastdds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -19963,7 +19963,7 @@ class MapInnerAliasBoundedStringHelperOctetPubSubType : public eprosima::fastdds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -20036,7 +20036,7 @@ class MapInnerAliasBoundedStringHelperCharPubSubType : public eprosima::fastdds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -20054,7 +20054,7 @@ class MapInnerAliasBoundedStringHelperCharPubSubType : public eprosima::fastdds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -20127,7 +20127,7 @@ class MapInnerAliasBoundedStringHelperWCharPubSubType : public eprosima::fastdds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -20145,7 +20145,7 @@ class MapInnerAliasBoundedStringHelperWCharPubSubType : public eprosima::fastdds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -20218,7 +20218,7 @@ class MapInnerAliasBoundedStringHelperStringPubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -20236,7 +20236,7 @@ class MapInnerAliasBoundedStringHelperStringPubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -20309,7 +20309,7 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -20327,7 +20327,7 @@ class MapInnerAliasBoundedStringHelperWStringPubSubType : public eprosima::fastd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -20400,7 +20400,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType :
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -20418,7 +20418,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedStringHelperPubSubType :
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -20491,7 +20491,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType :
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -20509,7 +20509,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasBoundedWStringHelperPubSubType :
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -20582,7 +20582,7 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType : public eprosim
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -20600,7 +20600,7 @@ class MapInnerAliasBoundedStringHelperInnerEnumHelperPubSubType : public eprosim
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -20673,7 +20673,7 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType : public epro
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -20691,7 +20691,7 @@ class MapInnerAliasBoundedStringHelperInnerBitMaskHelperPubSubType : public epro
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -20764,7 +20764,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType : public eprosi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -20782,7 +20782,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasHelperPubSubType : public eprosi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -20855,7 +20855,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType : public e
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -20873,7 +20873,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasArrayHelperPubSubType : public e
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -20946,7 +20946,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType : publi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -20964,7 +20964,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasSequenceHelperPubSubType : publi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -21037,7 +21037,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType : public epr
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -21055,7 +21055,7 @@ class MapInnerAliasBoundedStringHelperInnerAliasMapHelperPubSubType : public epr
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -21128,7 +21128,7 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType : public eprosi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -21146,7 +21146,7 @@ class MapInnerAliasBoundedStringHelperInnerUnionHelperPubSubType : public eprosi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -21219,7 +21219,7 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType : public ep
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -21237,7 +21237,7 @@ class MapInnerAliasBoundedStringHelperInnerStructureHelperPubSubType : public ep
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -21310,7 +21310,7 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType : public epros
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -21328,7 +21328,7 @@ class MapInnerAliasBoundedStringHelperInnerBitsetHelperPubSubType : public epros
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -21401,7 +21401,7 @@ class MapInnerAliasBoundedWStringHelperShortPubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -21419,7 +21419,7 @@ class MapInnerAliasBoundedWStringHelperShortPubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -21492,7 +21492,7 @@ class MapInnerAliasBoundedWStringHelperUShortPubSubType : public eprosima::fastd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -21510,7 +21510,7 @@ class MapInnerAliasBoundedWStringHelperUShortPubSubType : public eprosima::fastd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -21583,7 +21583,7 @@ class MapInnerAliasBoundedWStringHelperLongPubSubType : public eprosima::fastdds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -21601,7 +21601,7 @@ class MapInnerAliasBoundedWStringHelperLongPubSubType : public eprosima::fastdds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -21674,7 +21674,7 @@ class MapInnerAliasBoundedWStringHelperULongPubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -21692,7 +21692,7 @@ class MapInnerAliasBoundedWStringHelperULongPubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -21765,7 +21765,7 @@ class MapInnerAliasBoundedWStringHelperLongLongPubSubType : public eprosima::fas
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -21783,7 +21783,7 @@ class MapInnerAliasBoundedWStringHelperLongLongPubSubType : public eprosima::fas
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -21856,7 +21856,7 @@ class MapInnerAliasBoundedWStringHelperULongLongPubSubType : public eprosima::fa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -21874,7 +21874,7 @@ class MapInnerAliasBoundedWStringHelperULongLongPubSubType : public eprosima::fa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -21947,7 +21947,7 @@ class MapInnerAliasBoundedWStringHelperFloatPubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -21965,7 +21965,7 @@ class MapInnerAliasBoundedWStringHelperFloatPubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -22038,7 +22038,7 @@ class MapInnerAliasBoundedWStringHelperDoublePubSubType : public eprosima::fastd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -22056,7 +22056,7 @@ class MapInnerAliasBoundedWStringHelperDoublePubSubType : public eprosima::fastd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -22129,7 +22129,7 @@ class MapInnerAliasBoundedWStringHelperLongDoublePubSubType : public eprosima::f
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -22147,7 +22147,7 @@ class MapInnerAliasBoundedWStringHelperLongDoublePubSubType : public eprosima::f
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -22220,7 +22220,7 @@ class MapInnerAliasBoundedWStringHelperBooleanPubSubType : public eprosima::fast
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -22238,7 +22238,7 @@ class MapInnerAliasBoundedWStringHelperBooleanPubSubType : public eprosima::fast
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -22311,7 +22311,7 @@ class MapInnerAliasBoundedWStringHelperOctetPubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -22329,7 +22329,7 @@ class MapInnerAliasBoundedWStringHelperOctetPubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -22402,7 +22402,7 @@ class MapInnerAliasBoundedWStringHelperCharPubSubType : public eprosima::fastdds
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -22420,7 +22420,7 @@ class MapInnerAliasBoundedWStringHelperCharPubSubType : public eprosima::fastdds
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -22493,7 +22493,7 @@ class MapInnerAliasBoundedWStringHelperWCharPubSubType : public eprosima::fastdd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -22511,7 +22511,7 @@ class MapInnerAliasBoundedWStringHelperWCharPubSubType : public eprosima::fastdd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -22584,7 +22584,7 @@ class MapInnerAliasBoundedWStringHelperStringPubSubType : public eprosima::fastd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -22602,7 +22602,7 @@ class MapInnerAliasBoundedWStringHelperStringPubSubType : public eprosima::fastd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -22675,7 +22675,7 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -22693,7 +22693,7 @@ class MapInnerAliasBoundedWStringHelperWStringPubSubType : public eprosima::fast
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -22766,7 +22766,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType :
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -22784,7 +22784,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedStringHelperPubSubType :
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -22857,7 +22857,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -22875,7 +22875,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasBoundedWStringHelperPubSubType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -22948,7 +22948,7 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType : public eprosi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -22966,7 +22966,7 @@ class MapInnerAliasBoundedWStringHelperInnerEnumHelperPubSubType : public eprosi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -23039,7 +23039,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType : public epr
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -23057,7 +23057,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitMaskHelperPubSubType : public epr
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -23130,7 +23130,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType : public epros
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -23148,7 +23148,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasHelperPubSubType : public epros
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -23221,7 +23221,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType : public
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -23239,7 +23239,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasArrayHelperPubSubType : public
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -23312,7 +23312,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType : publ
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -23330,7 +23330,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasSequenceHelperPubSubType : publ
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -23403,7 +23403,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType : public ep
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -23421,7 +23421,7 @@ class MapInnerAliasBoundedWStringHelperInnerAliasMapHelperPubSubType : public ep
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -23494,7 +23494,7 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType : public epros
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -23512,7 +23512,7 @@ class MapInnerAliasBoundedWStringHelperInnerUnionHelperPubSubType : public epros
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -23585,7 +23585,7 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType : public e
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -23603,7 +23603,7 @@ class MapInnerAliasBoundedWStringHelperInnerStructureHelperPubSubType : public e
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -23676,7 +23676,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType : public epro
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -23694,7 +23694,7 @@ class MapInnerAliasBoundedWStringHelperInnerBitsetHelperPubSubType : public epro
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -23767,7 +23767,7 @@ class BoundedSmallMapPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -23785,7 +23785,7 @@ class BoundedSmallMapPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -23858,7 +23858,7 @@ class BoundedLargeMapPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -23876,10 +23876,10 @@ class BoundedLargeMapPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_MAPS_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__MAPS_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/mapsTypeObjectSupport.hpp b/test/dds-types-test/mapsTypeObjectSupport.hpp
index 22127289b88..9a635152b52 100644
--- a/test/dds-types-test/mapsTypeObjectSupport.hpp
+++ b/test/dds-types-test/mapsTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_MAPS_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_MAPS_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__MAPS_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__MAPS_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -3186,4 +3186,4 @@ eProsima_user_DllExport void register_BoundedLargeMap_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_MAPS_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__MAPS_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/member_id.hpp b/test/dds-types-test/member_id.hpp
index b9d226ded94..bf02e26e6de 100644
--- a/test/dds-types-test/member_id.hpp
+++ b/test/dds-types-test/member_id.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_MEMBER_ID_HPP_
-#define _FAST_DDS_GENERATED_MEMBER_ID_HPP_
+#ifndef FAST_DDS_GENERATED__MEMBER_ID_HPP
+#define FAST_DDS_GENERATED__MEMBER_ID_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/test/dds-types-test/member_idCdrAux.hpp b/test/dds-types-test/member_idCdrAux.hpp
index ae2d2a1a857..8f493789567 100644
--- a/test/dds-types-test/member_idCdrAux.hpp
+++ b/test/dds-types-test/member_idCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_MEMBER_IDCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_MEMBER_IDCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__MEMBER_IDCDRAUX_HPP
+#define FAST_DDS_GENERATED__MEMBER_IDCDRAUX_HPP
 
 #include "member_id.hpp"
 
@@ -119,5 +119,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_MEMBER_IDCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__MEMBER_IDCDRAUX_HPP
 
diff --git a/test/dds-types-test/member_idCdrAux.ipp b/test/dds-types-test/member_idCdrAux.ipp
index b5efed1d26e..76eca38ab7b 100644
--- a/test/dds-types-test/member_idCdrAux.ipp
+++ b/test/dds-types-test/member_idCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_MEMBER_IDCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_MEMBER_IDCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__MEMBER_IDCDRAUX_IPP
+#define FAST_DDS_GENERATED__MEMBER_IDCDRAUX_IPP
 
 #include "member_idCdrAux.hpp"
 
@@ -1422,5 +1422,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_MEMBER_IDCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__MEMBER_IDCDRAUX_IPP
 
diff --git a/test/dds-types-test/member_idPubSubTypes.cxx b/test/dds-types-test/member_idPubSubTypes.cxx
index 32f24ba8bfb..043b5dd6cc1 100644
--- a/test/dds-types-test/member_idPubSubTypes.cxx
+++ b/test/dds-types-test/member_idPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "member_idPubSubTypes.h"
+#include "member_idPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/member_idPubSubTypes.h b/test/dds-types-test/member_idPubSubTypes.hpp
similarity index 94%
rename from test/dds-types-test/member_idPubSubTypes.h
rename to test/dds-types-test/member_idPubSubTypes.hpp
index b61316c90fd..676c0df01cc 100644
--- a/test/dds-types-test/member_idPubSubTypes.h
+++ b/test/dds-types-test/member_idPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file member_idPubSubTypes.h
+ * @file member_idPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_MEMBER_ID_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_MEMBER_ID_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__MEMBER_ID_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__MEMBER_ID_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "member_id.hpp"
 
@@ -106,7 +106,7 @@ class FixIdPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,7 +124,7 @@ class FixIdPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -197,7 +197,7 @@ class FixHexIdPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -215,7 +215,7 @@ class FixHexIdPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -288,7 +288,7 @@ class FixHashidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -306,7 +306,7 @@ class FixHashidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -379,7 +379,7 @@ class FixHashidPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -397,7 +397,7 @@ class FixHashidPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -470,7 +470,7 @@ class FixMixPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -488,7 +488,7 @@ class FixMixPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -561,7 +561,7 @@ class AutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -579,7 +579,7 @@ class AutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -652,7 +652,7 @@ class AutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -670,7 +670,7 @@ class AutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -743,7 +743,7 @@ class AutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -761,7 +761,7 @@ class AutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -834,7 +834,7 @@ class DerivedAutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -852,7 +852,7 @@ class DerivedAutoidDefaultPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -925,7 +925,7 @@ class DerivedEmptyAutoidSequentialPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -943,7 +943,7 @@ class DerivedEmptyAutoidSequentialPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1016,7 +1016,7 @@ class DerivedAutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1034,7 +1034,7 @@ class DerivedAutoidSequentialPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1107,7 +1107,7 @@ class DerivedAutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1125,10 +1125,10 @@ class DerivedAutoidHashPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_MEMBER_ID_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__MEMBER_ID_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/member_idTypeObjectSupport.hpp b/test/dds-types-test/member_idTypeObjectSupport.hpp
index e2ab0b1b632..cea5a5bd76c 100644
--- a/test/dds-types-test/member_idTypeObjectSupport.hpp
+++ b/test/dds-types-test/member_idTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_MEMBER_ID_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_MEMBER_ID_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__MEMBER_ID_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__MEMBER_ID_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -185,4 +185,4 @@ eProsima_user_DllExport void register_DerivedAutoidHash_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_MEMBER_ID_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__MEMBER_ID_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/mutable.hpp b/test/dds-types-test/mutable.hpp
index 8dc55ab2b5b..1f071522595 100644
--- a/test/dds-types-test/mutable.hpp
+++ b/test/dds-types-test/mutable.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_MUTABLE_HPP_
-#define _FAST_DDS_GENERATED_MUTABLE_HPP_
+#ifndef FAST_DDS_GENERATED__MUTABLE_HPP
+#define FAST_DDS_GENERATED__MUTABLE_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/test/dds-types-test/mutableCdrAux.hpp b/test/dds-types-test/mutableCdrAux.hpp
index 24508245a32..95829037bfd 100644
--- a/test/dds-types-test/mutableCdrAux.hpp
+++ b/test/dds-types-test/mutableCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_MUTABLECDRAUX_HPP_
-#define _FAST_DDS_GENERATED_MUTABLECDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__MUTABLECDRAUX_HPP
+#define FAST_DDS_GENERATED__MUTABLECDRAUX_HPP
 
 #include "mutable.hpp"
 
@@ -182,5 +182,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_MUTABLECDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__MUTABLECDRAUX_HPP
 
diff --git a/test/dds-types-test/mutableCdrAux.ipp b/test/dds-types-test/mutableCdrAux.ipp
index 15ae59e7906..f58c3b7e402 100644
--- a/test/dds-types-test/mutableCdrAux.ipp
+++ b/test/dds-types-test/mutableCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_MUTABLECDRAUX_IPP_
-#define _FAST_DDS_GENERATED_MUTABLECDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__MUTABLECDRAUX_IPP
+#define FAST_DDS_GENERATED__MUTABLECDRAUX_IPP
 
 #include "mutableCdrAux.hpp"
 
@@ -1486,5 +1486,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_MUTABLECDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__MUTABLECDRAUX_IPP
 
diff --git a/test/dds-types-test/mutablePubSubTypes.cxx b/test/dds-types-test/mutablePubSubTypes.cxx
index 39048399a79..2b9db087693 100644
--- a/test/dds-types-test/mutablePubSubTypes.cxx
+++ b/test/dds-types-test/mutablePubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "mutablePubSubTypes.h"
+#include "mutablePubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/mutablePubSubTypes.h b/test/dds-types-test/mutablePubSubTypes.hpp
similarity index 95%
rename from test/dds-types-test/mutablePubSubTypes.h
rename to test/dds-types-test/mutablePubSubTypes.hpp
index 3b7a8e12766..5bb1f1652ca 100644
--- a/test/dds-types-test/mutablePubSubTypes.h
+++ b/test/dds-types-test/mutablePubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file mutablePubSubTypes.h
+ * @file mutablePubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_MUTABLE_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_MUTABLE_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__MUTABLE_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__MUTABLE_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "mutable.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class MutableShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,7 +125,7 @@ class MutableShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -198,7 +198,7 @@ class MutableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -216,7 +216,7 @@ class MutableUShortStructPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -289,7 +289,7 @@ class MutableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -307,7 +307,7 @@ class MutableLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -380,7 +380,7 @@ class MutableULongStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -398,7 +398,7 @@ class MutableULongStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -471,7 +471,7 @@ class MutableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -489,7 +489,7 @@ class MutableLongLongStructPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -562,7 +562,7 @@ class MutableULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -580,7 +580,7 @@ class MutableULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -653,7 +653,7 @@ class MutableFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -671,7 +671,7 @@ class MutableFloatStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -744,7 +744,7 @@ class MutableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -762,7 +762,7 @@ class MutableDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -835,7 +835,7 @@ class MutableLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -853,7 +853,7 @@ class MutableLongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -926,7 +926,7 @@ class MutableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -944,7 +944,7 @@ class MutableBooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1017,7 +1017,7 @@ class MutableOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1035,7 +1035,7 @@ class MutableOctetStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1108,7 +1108,7 @@ class MutableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1126,7 +1126,7 @@ class MutableCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1199,7 +1199,7 @@ class MutableWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1217,7 +1217,7 @@ class MutableWCharStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1290,7 +1290,7 @@ class MutableUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1308,7 +1308,7 @@ class MutableUnionStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1381,7 +1381,7 @@ class MutableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1399,7 +1399,7 @@ class MutableEmptyStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1472,7 +1472,7 @@ class MutableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1490,7 +1490,7 @@ class MutableEmptyInheritanceStructPubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1563,7 +1563,7 @@ class MutableInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1581,7 +1581,7 @@ class MutableInheritanceStructPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1654,7 +1654,7 @@ class MutableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1672,7 +1672,7 @@ class MutableInheritanceEmptyStructPubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1745,7 +1745,7 @@ class MutableExtensibilityInheritancePubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1763,10 +1763,10 @@ class MutableExtensibilityInheritancePubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_MUTABLE_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__MUTABLE_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/mutableTypeObjectSupport.hpp b/test/dds-types-test/mutableTypeObjectSupport.hpp
index a765a6224a5..587c4b21eb8 100644
--- a/test/dds-types-test/mutableTypeObjectSupport.hpp
+++ b/test/dds-types-test/mutableTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_MUTABLE_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_MUTABLE_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__MUTABLE_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__MUTABLE_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -270,4 +270,4 @@ eProsima_user_DllExport void register_MutableExtensibilityInheritance_type_ident
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_MUTABLE_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__MUTABLE_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/optional.hpp b/test/dds-types-test/optional.hpp
index 5d9db2c372a..9f068e6a90e 100644
--- a/test/dds-types-test/optional.hpp
+++ b/test/dds-types-test/optional.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_OPTIONAL_HPP_
-#define _FAST_DDS_GENERATED_OPTIONAL_HPP_
+#ifndef FAST_DDS_GENERATED__OPTIONAL_HPP
+#define FAST_DDS_GENERATED__OPTIONAL_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/test/dds-types-test/optionalCdrAux.hpp b/test/dds-types-test/optionalCdrAux.hpp
index 35dff888d89..9bcbf970bec 100644
--- a/test/dds-types-test/optionalCdrAux.hpp
+++ b/test/dds-types-test/optionalCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_OPTIONALCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_OPTIONALCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__OPTIONALCDRAUX_HPP
+#define FAST_DDS_GENERATED__OPTIONALCDRAUX_HPP
 
 #include "optional.hpp"
 
@@ -617,5 +617,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_OPTIONALCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__OPTIONALCDRAUX_HPP
 
diff --git a/test/dds-types-test/optionalCdrAux.ipp b/test/dds-types-test/optionalCdrAux.ipp
index b9aa77c8250..26018f10847 100644
--- a/test/dds-types-test/optionalCdrAux.ipp
+++ b/test/dds-types-test/optionalCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_OPTIONALCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_OPTIONALCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__OPTIONALCDRAUX_IPP
+#define FAST_DDS_GENERATED__OPTIONALCDRAUX_IPP
 
 #include "optionalCdrAux.hpp"
 
@@ -6682,5 +6682,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_OPTIONALCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__OPTIONALCDRAUX_IPP
 
diff --git a/test/dds-types-test/optionalPubSubTypes.cxx b/test/dds-types-test/optionalPubSubTypes.cxx
index de7fc63ace9..9ecfe9f8a92 100644
--- a/test/dds-types-test/optionalPubSubTypes.cxx
+++ b/test/dds-types-test/optionalPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "optionalPubSubTypes.h"
+#include "optionalPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/optionalPubSubTypes.h b/test/dds-types-test/optionalPubSubTypes.hpp
similarity index 95%
rename from test/dds-types-test/optionalPubSubTypes.h
rename to test/dds-types-test/optionalPubSubTypes.hpp
index f056c0f89da..6adef3dac91 100644
--- a/test/dds-types-test/optionalPubSubTypes.h
+++ b/test/dds-types-test/optionalPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file optionalPubSubTypes.h
+ * @file optionalPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_OPTIONAL_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_OPTIONAL_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__OPTIONAL_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__OPTIONAL_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "optional.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,7 +125,7 @@ class short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -198,7 +198,7 @@ class ushort_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -216,7 +216,7 @@ class ushort_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -289,7 +289,7 @@ class long_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -307,7 +307,7 @@ class long_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -380,7 +380,7 @@ class ulong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -398,7 +398,7 @@ class ulong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -471,7 +471,7 @@ class longlong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -489,7 +489,7 @@ class longlong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -562,7 +562,7 @@ class ulonglong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -580,7 +580,7 @@ class ulonglong_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -653,7 +653,7 @@ class float_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -671,7 +671,7 @@ class float_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -744,7 +744,7 @@ class double_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -762,7 +762,7 @@ class double_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -835,7 +835,7 @@ class longdouble_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -853,7 +853,7 @@ class longdouble_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -926,7 +926,7 @@ class boolean_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -944,7 +944,7 @@ class boolean_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1017,7 +1017,7 @@ class octet_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1035,7 +1035,7 @@ class octet_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1108,7 +1108,7 @@ class char_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1126,7 +1126,7 @@ class char_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1199,7 +1199,7 @@ class wchar_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1217,7 +1217,7 @@ class wchar_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1290,7 +1290,7 @@ class short_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1308,7 +1308,7 @@ class short_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1381,7 +1381,7 @@ class short_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1399,7 +1399,7 @@ class short_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1472,7 +1472,7 @@ class short_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1490,7 +1490,7 @@ class short_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1563,7 +1563,7 @@ class ushort_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1581,7 +1581,7 @@ class ushort_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1654,7 +1654,7 @@ class ushort_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1672,7 +1672,7 @@ class ushort_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1745,7 +1745,7 @@ class ushort_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1763,7 +1763,7 @@ class ushort_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1836,7 +1836,7 @@ class long_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1854,7 +1854,7 @@ class long_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1927,7 +1927,7 @@ class long_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1945,7 +1945,7 @@ class long_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2018,7 +2018,7 @@ class long_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2036,7 +2036,7 @@ class long_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2109,7 +2109,7 @@ class ulong_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2127,7 +2127,7 @@ class ulong_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2200,7 +2200,7 @@ class ulong_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2218,7 +2218,7 @@ class ulong_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2291,7 +2291,7 @@ class ulong_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2309,7 +2309,7 @@ class ulong_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2382,7 +2382,7 @@ class longlong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2400,7 +2400,7 @@ class longlong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2473,7 +2473,7 @@ class longlong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2491,7 +2491,7 @@ class longlong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2564,7 +2564,7 @@ class longlong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2582,7 +2582,7 @@ class longlong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2655,7 +2655,7 @@ class ulonglong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2673,7 +2673,7 @@ class ulonglong_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2746,7 +2746,7 @@ class ulonglong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2764,7 +2764,7 @@ class ulonglong_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2837,7 +2837,7 @@ class ulonglong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2855,7 +2855,7 @@ class ulonglong_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2928,7 +2928,7 @@ class float_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2946,7 +2946,7 @@ class float_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3019,7 +3019,7 @@ class float_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3037,7 +3037,7 @@ class float_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3110,7 +3110,7 @@ class float_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3128,7 +3128,7 @@ class float_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3201,7 +3201,7 @@ class double_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3219,7 +3219,7 @@ class double_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3292,7 +3292,7 @@ class double_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3310,7 +3310,7 @@ class double_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3383,7 +3383,7 @@ class double_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3401,7 +3401,7 @@ class double_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3474,7 +3474,7 @@ class longdouble_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3492,7 +3492,7 @@ class longdouble_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3565,7 +3565,7 @@ class longdouble_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3583,7 +3583,7 @@ class longdouble_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3656,7 +3656,7 @@ class longdouble_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3674,7 +3674,7 @@ class longdouble_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3747,7 +3747,7 @@ class boolean_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3765,7 +3765,7 @@ class boolean_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3838,7 +3838,7 @@ class boolean_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3856,7 +3856,7 @@ class boolean_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3929,7 +3929,7 @@ class boolean_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3947,7 +3947,7 @@ class boolean_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4020,7 +4020,7 @@ class octet_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4038,7 +4038,7 @@ class octet_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4111,7 +4111,7 @@ class octet_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4129,7 +4129,7 @@ class octet_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4202,7 +4202,7 @@ class octet_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4220,7 +4220,7 @@ class octet_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4293,7 +4293,7 @@ class char_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4311,7 +4311,7 @@ class char_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4384,7 +4384,7 @@ class char_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4402,7 +4402,7 @@ class char_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4475,7 +4475,7 @@ class char_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4493,7 +4493,7 @@ class char_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4566,7 +4566,7 @@ class wchar_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4584,7 +4584,7 @@ class wchar_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4657,7 +4657,7 @@ class wchar_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4675,7 +4675,7 @@ class wchar_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4748,7 +4748,7 @@ class wchar_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4766,7 +4766,7 @@ class wchar_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4839,7 +4839,7 @@ class sequence_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4857,7 +4857,7 @@ class sequence_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -4930,7 +4930,7 @@ class sequence_short_align_1_optionalPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -4948,7 +4948,7 @@ class sequence_short_align_1_optionalPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5021,7 +5021,7 @@ class sequence_short_align_2_optionalPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5039,7 +5039,7 @@ class sequence_short_align_2_optionalPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5112,7 +5112,7 @@ class sequence_short_align_4_optionalPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5130,7 +5130,7 @@ class sequence_short_align_4_optionalPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5203,7 +5203,7 @@ class string_unbounded_optionalPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5221,7 +5221,7 @@ class string_unbounded_optionalPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5294,7 +5294,7 @@ class string_unbounded_align_1_optionalPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5312,7 +5312,7 @@ class string_unbounded_align_1_optionalPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5385,7 +5385,7 @@ class string_unbounded_align_2_optionalPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5403,7 +5403,7 @@ class string_unbounded_align_2_optionalPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5476,7 +5476,7 @@ class string_unbounded_align_4_optionalPubSubType : public eprosima::fastdds::dd
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5494,7 +5494,7 @@ class string_unbounded_align_4_optionalPubSubType : public eprosima::fastdds::dd
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5567,7 +5567,7 @@ class string_bounded_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5585,7 +5585,7 @@ class string_bounded_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5658,7 +5658,7 @@ class string_bounded_align_1_optionalPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5676,7 +5676,7 @@ class string_bounded_align_1_optionalPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5749,7 +5749,7 @@ class string_bounded_align_2_optionalPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5767,7 +5767,7 @@ class string_bounded_align_2_optionalPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5840,7 +5840,7 @@ class string_bounded_align_4_optionalPubSubType : public eprosima::fastdds::dds:
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5858,7 +5858,7 @@ class string_bounded_align_4_optionalPubSubType : public eprosima::fastdds::dds:
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -5931,7 +5931,7 @@ class map_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -5949,7 +5949,7 @@ class map_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6022,7 +6022,7 @@ class map_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6040,7 +6040,7 @@ class map_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6113,7 +6113,7 @@ class map_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6131,7 +6131,7 @@ class map_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6204,7 +6204,7 @@ class map_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6222,7 +6222,7 @@ class map_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6295,7 +6295,7 @@ class array_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6313,7 +6313,7 @@ class array_short_optionalPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6386,7 +6386,7 @@ class array_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6404,7 +6404,7 @@ class array_short_align_1_optionalPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6477,7 +6477,7 @@ class array_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6495,7 +6495,7 @@ class array_short_align_2_optionalPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6568,7 +6568,7 @@ class array_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::To
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6586,7 +6586,7 @@ class array_short_align_4_optionalPubSubType : public eprosima::fastdds::dds::To
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6659,7 +6659,7 @@ class struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6677,7 +6677,7 @@ class struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6750,7 +6750,7 @@ class struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6768,7 +6768,7 @@ class struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6841,7 +6841,7 @@ class struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6859,7 +6859,7 @@ class struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -6932,7 +6932,7 @@ class struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -6950,7 +6950,7 @@ class struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7023,7 +7023,7 @@ class InnerStructOptionalPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7041,7 +7041,7 @@ class InnerStructOptionalPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7114,7 +7114,7 @@ class opt_struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7132,7 +7132,7 @@ class opt_struct_optionalPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7205,7 +7205,7 @@ class opt_struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7223,7 +7223,7 @@ class opt_struct_align_1_optionalPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7296,7 +7296,7 @@ class opt_struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7314,7 +7314,7 @@ class opt_struct_align_2_optionalPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -7387,7 +7387,7 @@ class opt_struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -7405,10 +7405,10 @@ class opt_struct_align_4_optionalPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_OPTIONAL_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__OPTIONAL_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/optionalTypeObjectSupport.hpp b/test/dds-types-test/optionalTypeObjectSupport.hpp
index 7d063772281..82d03413d87 100644
--- a/test/dds-types-test/optionalTypeObjectSupport.hpp
+++ b/test/dds-types-test/optionalTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_OPTIONAL_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_OPTIONAL_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__OPTIONAL_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__OPTIONAL_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -1014,4 +1014,4 @@ eProsima_user_DllExport void register_opt_struct_align_4_optional_type_identifie
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_OPTIONAL_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__OPTIONAL_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/primitives.hpp b/test/dds-types-test/primitives.hpp
index f093e94e0f8..041ad148aca 100644
--- a/test/dds-types-test/primitives.hpp
+++ b/test/dds-types-test/primitives.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_PRIMITIVES_HPP_
-#define _FAST_DDS_GENERATED_PRIMITIVES_HPP_
+#ifndef FAST_DDS_GENERATED__PRIMITIVES_HPP
+#define FAST_DDS_GENERATED__PRIMITIVES_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/test/dds-types-test/primitivesCdrAux.hpp b/test/dds-types-test/primitivesCdrAux.hpp
index 66385930c3a..5003564a0eb 100644
--- a/test/dds-types-test/primitivesCdrAux.hpp
+++ b/test/dds-types-test/primitivesCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_PRIMITIVESCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_PRIMITIVESCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__PRIMITIVESCDRAUX_HPP
+#define FAST_DDS_GENERATED__PRIMITIVESCDRAUX_HPP
 
 #include "primitives.hpp"
 
@@ -182,5 +182,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_PRIMITIVESCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__PRIMITIVESCDRAUX_HPP
 
diff --git a/test/dds-types-test/primitivesCdrAux.ipp b/test/dds-types-test/primitivesCdrAux.ipp
index bfd6fa90a78..693f8362d62 100644
--- a/test/dds-types-test/primitivesCdrAux.ipp
+++ b/test/dds-types-test/primitivesCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_PRIMITIVESCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_PRIMITIVESCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__PRIMITIVESCDRAUX_IPP
+#define FAST_DDS_GENERATED__PRIMITIVESCDRAUX_IPP
 
 #include "primitivesCdrAux.hpp"
 
@@ -1634,5 +1634,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_PRIMITIVESCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__PRIMITIVESCDRAUX_IPP
 
diff --git a/test/dds-types-test/primitivesPubSubTypes.cxx b/test/dds-types-test/primitivesPubSubTypes.cxx
index d92569b8679..67da733d761 100644
--- a/test/dds-types-test/primitivesPubSubTypes.cxx
+++ b/test/dds-types-test/primitivesPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "primitivesPubSubTypes.h"
+#include "primitivesPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/primitivesPubSubTypes.h b/test/dds-types-test/primitivesPubSubTypes.hpp
similarity index 95%
rename from test/dds-types-test/primitivesPubSubTypes.h
rename to test/dds-types-test/primitivesPubSubTypes.hpp
index c2fc8e05c3e..af517f9d0f5 100644
--- a/test/dds-types-test/primitivesPubSubTypes.h
+++ b/test/dds-types-test/primitivesPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file primitivesPubSubTypes.h
+ * @file primitivesPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_PRIMITIVES_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_PRIMITIVES_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__PRIMITIVES_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__PRIMITIVES_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "primitives.hpp"
 
@@ -106,7 +106,7 @@ class ShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,7 +124,7 @@ class ShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -197,7 +197,7 @@ class UShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -215,7 +215,7 @@ class UShortStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -288,7 +288,7 @@ class LongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -306,7 +306,7 @@ class LongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -379,7 +379,7 @@ class ULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -397,7 +397,7 @@ class ULongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -470,7 +470,7 @@ class LongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -488,7 +488,7 @@ class LongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -561,7 +561,7 @@ class ULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -579,7 +579,7 @@ class ULongLongStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -652,7 +652,7 @@ class FloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -670,7 +670,7 @@ class FloatStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -743,7 +743,7 @@ class DoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -761,7 +761,7 @@ class DoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -834,7 +834,7 @@ class LongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -852,7 +852,7 @@ class LongDoubleStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -925,7 +925,7 @@ class BooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -943,7 +943,7 @@ class BooleanStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1016,7 +1016,7 @@ class OctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1034,7 +1034,7 @@ class OctetStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1107,7 +1107,7 @@ class CharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1125,7 +1125,7 @@ class CharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1198,7 +1198,7 @@ class WCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1216,7 +1216,7 @@ class WCharStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1289,7 +1289,7 @@ class Int8StructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1307,7 +1307,7 @@ class Int8StructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1380,7 +1380,7 @@ class Uint8StructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1398,7 +1398,7 @@ class Uint8StructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1471,7 +1471,7 @@ class Int16StructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1489,7 +1489,7 @@ class Int16StructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1562,7 +1562,7 @@ class Uint16StructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1580,7 +1580,7 @@ class Uint16StructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1653,7 +1653,7 @@ class Int32StructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1671,7 +1671,7 @@ class Int32StructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1744,7 +1744,7 @@ class Uint32StructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1762,7 +1762,7 @@ class Uint32StructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1835,7 +1835,7 @@ class Int64StructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1853,7 +1853,7 @@ class Int64StructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1926,7 +1926,7 @@ class Uint64StructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1944,10 +1944,10 @@ class Uint64StructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_PRIMITIVES_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__PRIMITIVES_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/primitivesTypeObjectSupport.hpp b/test/dds-types-test/primitivesTypeObjectSupport.hpp
index cd1e99ef755..9e03c0905db 100644
--- a/test/dds-types-test/primitivesTypeObjectSupport.hpp
+++ b/test/dds-types-test/primitivesTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_PRIMITIVES_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_PRIMITIVES_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__PRIMITIVES_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__PRIMITIVES_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -293,4 +293,4 @@ eProsima_user_DllExport void register_Uint64Struct_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_PRIMITIVES_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__PRIMITIVES_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/relative_path_include.hpp b/test/dds-types-test/relative_path_include.hpp
index 75028ab6e38..92b0f212674 100644
--- a/test/dds-types-test/relative_path_include.hpp
+++ b/test/dds-types-test/relative_path_include.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDE_HPP_
-#define _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDE_HPP_
+#ifndef FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDE_HPP
+#define FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDE_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/test/dds-types-test/relative_path_includeCdrAux.hpp b/test/dds-types-test/relative_path_includeCdrAux.hpp
index 8dd1fdf2663..a8c51274052 100644
--- a/test/dds-types-test/relative_path_includeCdrAux.hpp
+++ b/test/dds-types-test/relative_path_includeCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDECDRAUX_HPP_
-#define _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDECDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDECDRAUX_HPP
+#define FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDECDRAUX_HPP
 
 #include "relative_path_include.hpp"
 
@@ -51,5 +51,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDECDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDECDRAUX_HPP
 
diff --git a/test/dds-types-test/relative_path_includeCdrAux.ipp b/test/dds-types-test/relative_path_includeCdrAux.ipp
index 7f27d700e84..53748362515 100644
--- a/test/dds-types-test/relative_path_includeCdrAux.ipp
+++ b/test/dds-types-test/relative_path_includeCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDECDRAUX_IPP_
-#define _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDECDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDECDRAUX_IPP
+#define FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDECDRAUX_IPP
 
 #include "relative_path_includeCdrAux.hpp"
 
@@ -114,5 +114,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDECDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDECDRAUX_IPP
 
diff --git a/test/dds-types-test/relative_path_includePubSubTypes.cxx b/test/dds-types-test/relative_path_includePubSubTypes.cxx
index 3a5f3e0df0d..98eb2c99806 100644
--- a/test/dds-types-test/relative_path_includePubSubTypes.cxx
+++ b/test/dds-types-test/relative_path_includePubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "relative_path_includePubSubTypes.h"
+#include "relative_path_includePubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/relative_path_includePubSubTypes.h b/test/dds-types-test/relative_path_includePubSubTypes.hpp
similarity index 87%
rename from test/dds-types-test/relative_path_includePubSubTypes.h
rename to test/dds-types-test/relative_path_includePubSubTypes.hpp
index 29f3a09b80f..a3a64030f8a 100644
--- a/test/dds-types-test/relative_path_includePubSubTypes.h
+++ b/test/dds-types-test/relative_path_includePubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file relative_path_includePubSubTypes.h
+ * @file relative_path_includePubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDE_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDE_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDE_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDE_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "relative_path_include.hpp"
 
-#include "../IDL/helpers/basic_inner_typesPubSubTypes.h"
+#include "../IDL/helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class RelativePathIncludeStructPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,10 +125,10 @@ class RelativePathIncludeStructPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDE_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDE_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/relative_path_includeTypeObjectSupport.hpp b/test/dds-types-test/relative_path_includeTypeObjectSupport.hpp
index 22bb6762fe0..54e6717d575 100644
--- a/test/dds-types-test/relative_path_includeTypeObjectSupport.hpp
+++ b/test/dds-types-test/relative_path_includeTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDE_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDE_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDE_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDE_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -54,4 +54,4 @@ eProsima_user_DllExport void register_RelativePathIncludeStruct_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_RELATIVE_PATH_INCLUDE_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__RELATIVE_PATH_INCLUDE_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/sequences.hpp b/test/dds-types-test/sequences.hpp
index 2d846026a5e..90fcdcf5ec0 100644
--- a/test/dds-types-test/sequences.hpp
+++ b/test/dds-types-test/sequences.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SEQUENCES_HPP_
-#define _FAST_DDS_GENERATED_SEQUENCES_HPP_
+#ifndef FAST_DDS_GENERATED__SEQUENCES_HPP
+#define FAST_DDS_GENERATED__SEQUENCES_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/test/dds-types-test/sequencesCdrAux.hpp b/test/dds-types-test/sequencesCdrAux.hpp
index 4bca55d419f..06ec29c77a1 100644
--- a/test/dds-types-test/sequencesCdrAux.hpp
+++ b/test/dds-types-test/sequencesCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SEQUENCESCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_SEQUENCESCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__SEQUENCESCDRAUX_HPP
+#define FAST_DDS_GENERATED__SEQUENCESCDRAUX_HPP
 
 #include "sequences.hpp"
 
@@ -245,5 +245,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_SEQUENCESCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__SEQUENCESCDRAUX_HPP
 
diff --git a/test/dds-types-test/sequencesCdrAux.ipp b/test/dds-types-test/sequencesCdrAux.ipp
index 571ef64cd83..bd1ae967472 100644
--- a/test/dds-types-test/sequencesCdrAux.ipp
+++ b/test/dds-types-test/sequencesCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SEQUENCESCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_SEQUENCESCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__SEQUENCESCDRAUX_IPP
+#define FAST_DDS_GENERATED__SEQUENCESCDRAUX_IPP
 
 #include "sequencesCdrAux.hpp"
 
@@ -2182,5 +2182,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_SEQUENCESCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__SEQUENCESCDRAUX_IPP
 
diff --git a/test/dds-types-test/sequencesPubSubTypes.cxx b/test/dds-types-test/sequencesPubSubTypes.cxx
index a63e86fca80..fa8daeddeaf 100644
--- a/test/dds-types-test/sequencesPubSubTypes.cxx
+++ b/test/dds-types-test/sequencesPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "sequencesPubSubTypes.h"
+#include "sequencesPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/sequencesPubSubTypes.h b/test/dds-types-test/sequencesPubSubTypes.hpp
similarity index 95%
rename from test/dds-types-test/sequencesPubSubTypes.h
rename to test/dds-types-test/sequencesPubSubTypes.hpp
index b3529f0eb7f..1026cb42b25 100644
--- a/test/dds-types-test/sequencesPubSubTypes.h
+++ b/test/dds-types-test/sequencesPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file sequencesPubSubTypes.h
+ * @file sequencesPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_SEQUENCES_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_SEQUENCES_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__SEQUENCES_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__SEQUENCES_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "sequences.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class SequenceShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,7 +125,7 @@ class SequenceShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -198,7 +198,7 @@ class SequenceUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -216,7 +216,7 @@ class SequenceUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -289,7 +289,7 @@ class SequenceLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -307,7 +307,7 @@ class SequenceLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -380,7 +380,7 @@ class SequenceULongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -398,7 +398,7 @@ class SequenceULongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -471,7 +471,7 @@ class SequenceLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -489,7 +489,7 @@ class SequenceLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -562,7 +562,7 @@ class SequenceULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -580,7 +580,7 @@ class SequenceULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -653,7 +653,7 @@ class SequenceFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -671,7 +671,7 @@ class SequenceFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -744,7 +744,7 @@ class SequenceDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -762,7 +762,7 @@ class SequenceDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -835,7 +835,7 @@ class SequenceLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -853,7 +853,7 @@ class SequenceLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -926,7 +926,7 @@ class SequenceBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -944,7 +944,7 @@ class SequenceBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1017,7 +1017,7 @@ class SequenceOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1035,7 +1035,7 @@ class SequenceOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1108,7 +1108,7 @@ class SequenceCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1126,7 +1126,7 @@ class SequenceCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1199,7 +1199,7 @@ class SequenceWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1217,7 +1217,7 @@ class SequenceWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1290,7 +1290,7 @@ class SequenceStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1308,7 +1308,7 @@ class SequenceStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1381,7 +1381,7 @@ class SequenceWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1399,7 +1399,7 @@ class SequenceWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1472,7 +1472,7 @@ class SequenceStringBoundedPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1490,7 +1490,7 @@ class SequenceStringBoundedPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1563,7 +1563,7 @@ class SequenceWStringBoundedPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1581,7 +1581,7 @@ class SequenceWStringBoundedPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1654,7 +1654,7 @@ class SequenceEnumPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1672,7 +1672,7 @@ class SequenceEnumPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1745,7 +1745,7 @@ class SequenceBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1763,7 +1763,7 @@ class SequenceBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1836,7 +1836,7 @@ class SequenceAliasPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1854,7 +1854,7 @@ class SequenceAliasPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1927,7 +1927,7 @@ class SequenceShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1945,7 +1945,7 @@ class SequenceShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2018,7 +2018,7 @@ class SequenceSequencePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2036,7 +2036,7 @@ class SequenceSequencePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2109,7 +2109,7 @@ class SequenceMapPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2127,7 +2127,7 @@ class SequenceMapPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2200,7 +2200,7 @@ class SequenceUnionPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2218,7 +2218,7 @@ class SequenceUnionPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2291,7 +2291,7 @@ class SequenceStructurePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2309,7 +2309,7 @@ class SequenceStructurePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2382,7 +2382,7 @@ class SequenceBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2400,7 +2400,7 @@ class SequenceBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2473,7 +2473,7 @@ class BoundedSmallSequencesPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2491,7 +2491,7 @@ class BoundedSmallSequencesPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2564,7 +2564,7 @@ class BoundedBigSequencesPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2582,10 +2582,10 @@ class BoundedBigSequencesPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_SEQUENCES_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__SEQUENCES_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/sequencesTypeObjectSupport.hpp b/test/dds-types-test/sequencesTypeObjectSupport.hpp
index d1cb66830c5..32ef55fde85 100644
--- a/test/dds-types-test/sequencesTypeObjectSupport.hpp
+++ b/test/dds-types-test/sequencesTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_SEQUENCES_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_SEQUENCES_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__SEQUENCES_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__SEQUENCES_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -378,4 +378,4 @@ eProsima_user_DllExport void register_BoundedBigSequences_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_SEQUENCES_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__SEQUENCES_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/strings.hpp b/test/dds-types-test/strings.hpp
index f96470e260a..1ea3b4c16c9 100644
--- a/test/dds-types-test/strings.hpp
+++ b/test/dds-types-test/strings.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_STRINGS_HPP_
-#define _FAST_DDS_GENERATED_STRINGS_HPP_
+#ifndef FAST_DDS_GENERATED__STRINGS_HPP
+#define FAST_DDS_GENERATED__STRINGS_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/test/dds-types-test/stringsCdrAux.hpp b/test/dds-types-test/stringsCdrAux.hpp
index b15bd82844b..6e43cb58a54 100644
--- a/test/dds-types-test/stringsCdrAux.hpp
+++ b/test/dds-types-test/stringsCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_STRINGSCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_STRINGSCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__STRINGSCDRAUX_HPP
+#define FAST_DDS_GENERATED__STRINGSCDRAUX_HPP
 
 #include "strings.hpp"
 
@@ -77,5 +77,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_STRINGSCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__STRINGSCDRAUX_HPP
 
diff --git a/test/dds-types-test/stringsCdrAux.ipp b/test/dds-types-test/stringsCdrAux.ipp
index 2379f133332..bd79f7deb4f 100644
--- a/test/dds-types-test/stringsCdrAux.ipp
+++ b/test/dds-types-test/stringsCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_STRINGSCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_STRINGSCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__STRINGSCDRAUX_IPP
+#define FAST_DDS_GENERATED__STRINGSCDRAUX_IPP
 
 #include "stringsCdrAux.hpp"
 
@@ -494,5 +494,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_STRINGSCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__STRINGSCDRAUX_IPP
 
diff --git a/test/dds-types-test/stringsPubSubTypes.cxx b/test/dds-types-test/stringsPubSubTypes.cxx
index 01ecae15d1f..5413c56d906 100644
--- a/test/dds-types-test/stringsPubSubTypes.cxx
+++ b/test/dds-types-test/stringsPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "stringsPubSubTypes.h"
+#include "stringsPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/stringsPubSubTypes.h b/test/dds-types-test/stringsPubSubTypes.hpp
similarity index 94%
rename from test/dds-types-test/stringsPubSubTypes.h
rename to test/dds-types-test/stringsPubSubTypes.hpp
index 80e7986844f..d05e089cec4 100644
--- a/test/dds-types-test/stringsPubSubTypes.h
+++ b/test/dds-types-test/stringsPubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file stringsPubSubTypes.h
+ * @file stringsPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_STRINGS_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_STRINGS_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__STRINGS_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__STRINGS_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "strings.hpp"
 
@@ -106,7 +106,7 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,7 +124,7 @@ class StringStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -197,7 +197,7 @@ class WStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -215,7 +215,7 @@ class WStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -288,7 +288,7 @@ class SmallStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -306,7 +306,7 @@ class SmallStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -379,7 +379,7 @@ class SmallWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -397,7 +397,7 @@ class SmallWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -470,7 +470,7 @@ class LargeStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -488,7 +488,7 @@ class LargeStringStructPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -561,7 +561,7 @@ class LargeWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -579,10 +579,10 @@ class LargeWStringStructPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_STRINGS_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__STRINGS_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/stringsTypeObjectSupport.hpp b/test/dds-types-test/stringsTypeObjectSupport.hpp
index e8f24054fc1..4d0941cd12a 100644
--- a/test/dds-types-test/stringsTypeObjectSupport.hpp
+++ b/test/dds-types-test/stringsTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_STRINGS_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_STRINGS_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__STRINGS_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__STRINGS_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -113,4 +113,4 @@ eProsima_user_DllExport void register_LargeWStringStruct_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_STRINGS_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__STRINGS_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/structures.hpp b/test/dds-types-test/structures.hpp
index 5bb4099adfb..79d509019f2 100644
--- a/test/dds-types-test/structures.hpp
+++ b/test/dds-types-test/structures.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_STRUCTURES_HPP_
-#define _FAST_DDS_GENERATED_STRUCTURES_HPP_
+#ifndef FAST_DDS_GENERATED__STRUCTURES_HPP
+#define FAST_DDS_GENERATED__STRUCTURES_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/test/dds-types-test/structuresCdrAux.hpp b/test/dds-types-test/structuresCdrAux.hpp
index 1b373daa02d..f43babb4d5b 100644
--- a/test/dds-types-test/structuresCdrAux.hpp
+++ b/test/dds-types-test/structuresCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_STRUCTURESCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_STRUCTURESCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__STRUCTURESCDRAUX_HPP
+#define FAST_DDS_GENERATED__STRUCTURESCDRAUX_HPP
 
 #include "structures.hpp"
 
@@ -287,5 +287,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_STRUCTURESCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__STRUCTURESCDRAUX_HPP
 
diff --git a/test/dds-types-test/structuresCdrAux.ipp b/test/dds-types-test/structuresCdrAux.ipp
index ff78a413d42..08b6ea06099 100644
--- a/test/dds-types-test/structuresCdrAux.ipp
+++ b/test/dds-types-test/structuresCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_STRUCTURESCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_STRUCTURESCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__STRUCTURESCDRAUX_IPP
+#define FAST_DDS_GENERATED__STRUCTURESCDRAUX_IPP
 
 #include "structuresCdrAux.hpp"
 
@@ -2866,5 +2866,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_STRUCTURESCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__STRUCTURESCDRAUX_IPP
 
diff --git a/test/dds-types-test/structuresPubSubTypes.cxx b/test/dds-types-test/structuresPubSubTypes.cxx
index b331c820f7e..73fb45440ad 100644
--- a/test/dds-types-test/structuresPubSubTypes.cxx
+++ b/test/dds-types-test/structuresPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "structuresPubSubTypes.h"
+#include "structuresPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/structuresPubSubTypes.h b/test/dds-types-test/structuresPubSubTypes.hpp
similarity index 95%
rename from test/dds-types-test/structuresPubSubTypes.h
rename to test/dds-types-test/structuresPubSubTypes.hpp
index d0c91726eaf..aeac8ffe3f1 100644
--- a/test/dds-types-test/structuresPubSubTypes.h
+++ b/test/dds-types-test/structuresPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file structuresPubSubTypes.h
+ * @file structuresPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_STRUCTURES_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_STRUCTURES_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__STRUCTURES_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__STRUCTURES_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "structures.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class StructShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,7 +125,7 @@ class StructShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -198,7 +198,7 @@ class StructUnsignedShortPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -216,7 +216,7 @@ class StructUnsignedShortPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -289,7 +289,7 @@ class StructLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -307,7 +307,7 @@ class StructLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -380,7 +380,7 @@ class StructUnsignedLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -398,7 +398,7 @@ class StructUnsignedLongPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -471,7 +471,7 @@ class StructLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -489,7 +489,7 @@ class StructLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -562,7 +562,7 @@ class StructUnsignedLongLongPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -580,7 +580,7 @@ class StructUnsignedLongLongPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -653,7 +653,7 @@ class StructFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -671,7 +671,7 @@ class StructFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -744,7 +744,7 @@ class StructDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -762,7 +762,7 @@ class StructDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -835,7 +835,7 @@ class StructLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -853,7 +853,7 @@ class StructLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -926,7 +926,7 @@ class StructBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -944,7 +944,7 @@ class StructBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1017,7 +1017,7 @@ class StructOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1035,7 +1035,7 @@ class StructOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1108,7 +1108,7 @@ class StructChar8PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1126,7 +1126,7 @@ class StructChar8PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1199,7 +1199,7 @@ class StructChar16PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1217,7 +1217,7 @@ class StructChar16PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1290,7 +1290,7 @@ class StructStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1308,7 +1308,7 @@ class StructStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1381,7 +1381,7 @@ class StructWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1399,7 +1399,7 @@ class StructWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1472,7 +1472,7 @@ class StructBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1490,7 +1490,7 @@ class StructBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1563,7 +1563,7 @@ class StructBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1581,7 +1581,7 @@ class StructBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1654,7 +1654,7 @@ class StructEnumPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1672,7 +1672,7 @@ class StructEnumPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1745,7 +1745,7 @@ class StructBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1763,7 +1763,7 @@ class StructBitMaskPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1836,7 +1836,7 @@ class StructAliasPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1854,7 +1854,7 @@ class StructAliasPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1927,7 +1927,7 @@ class StructShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1945,7 +1945,7 @@ class StructShortArrayPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2018,7 +2018,7 @@ class StructSequencePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2036,7 +2036,7 @@ class StructSequencePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2109,7 +2109,7 @@ class StructMapPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2127,7 +2127,7 @@ class StructMapPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2200,7 +2200,7 @@ class StructUnionPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2218,7 +2218,7 @@ class StructUnionPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2291,7 +2291,7 @@ class StructStructurePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2309,7 +2309,7 @@ class StructStructurePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2382,7 +2382,7 @@ class StructBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2400,7 +2400,7 @@ class StructBitsetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2473,7 +2473,7 @@ class StructEmptyPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2491,7 +2491,7 @@ class StructEmptyPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2564,7 +2564,7 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2582,7 +2582,7 @@ class StructuresPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2657,7 +2657,7 @@ namespace testing_1
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -2675,7 +2675,7 @@ namespace testing_1
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -2751,7 +2751,7 @@ namespace testing_2
         }
 
         eProsima_user_DllExport inline bool is_plain(
-            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+                eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
         {
             static_cast<void>(data_representation);
             return false;
@@ -2769,7 +2769,7 @@ namespace testing_2
 
     #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-        MD5 m_md5;
+        eprosima::fastdds::MD5 m_md5;
         unsigned char* m_keyBuffer;
 
     };
@@ -2843,7 +2843,7 @@ class barPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2861,7 +2861,7 @@ class barPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2934,7 +2934,7 @@ class root1PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2952,7 +2952,7 @@ class root1PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3025,7 +3025,7 @@ class root2PubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3043,7 +3043,7 @@ class root2PubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3116,7 +3116,7 @@ class rootPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3134,10 +3134,10 @@ class rootPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_STRUCTURES_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__STRUCTURES_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/structuresTypeObjectSupport.hpp b/test/dds-types-test/structuresTypeObjectSupport.hpp
index b5a5472038b..dc22d704026 100644
--- a/test/dds-types-test/structuresTypeObjectSupport.hpp
+++ b/test/dds-types-test/structuresTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_STRUCTURES_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_STRUCTURES_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__STRUCTURES_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__STRUCTURES_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -456,4 +456,4 @@ eProsima_user_DllExport void register_root_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_STRUCTURES_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__STRUCTURES_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds-types-test/unions.hpp b/test/dds-types-test/unions.hpp
index 999494b6cb8..e8468560480 100644
--- a/test/dds-types-test/unions.hpp
+++ b/test/dds-types-test/unions.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_UNIONS_HPP_
-#define _FAST_DDS_GENERATED_UNIONS_HPP_
+#ifndef FAST_DDS_GENERATED__UNIONS_HPP
+#define FAST_DDS_GENERATED__UNIONS_HPP
 
 #include <cstdint>
 #include <functional>
diff --git a/test/dds-types-test/unionsCdrAux.hpp b/test/dds-types-test/unionsCdrAux.hpp
index 1a36afff430..11aa5f78da6 100644
--- a/test/dds-types-test/unionsCdrAux.hpp
+++ b/test/dds-types-test/unionsCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_UNIONSCDRAUX_HPP_
-#define _FAST_DDS_GENERATED_UNIONSCDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__UNIONSCDRAUX_HPP
+#define FAST_DDS_GENERATED__UNIONSCDRAUX_HPP
 
 #include "unions.hpp"
 
@@ -378,5 +378,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_UNIONSCDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__UNIONSCDRAUX_HPP
 
diff --git a/test/dds-types-test/unionsCdrAux.ipp b/test/dds-types-test/unionsCdrAux.ipp
index 44a2073ef80..c3c6b7ae3a1 100644
--- a/test/dds-types-test/unionsCdrAux.ipp
+++ b/test/dds-types-test/unionsCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_UNIONSCDRAUX_IPP_
-#define _FAST_DDS_GENERATED_UNIONSCDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__UNIONSCDRAUX_IPP
+#define FAST_DDS_GENERATED__UNIONSCDRAUX_IPP
 
 #include "unionsCdrAux.hpp"
 
@@ -8083,5 +8083,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_UNIONSCDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__UNIONSCDRAUX_IPP
 
diff --git a/test/dds-types-test/unionsPubSubTypes.cxx b/test/dds-types-test/unionsPubSubTypes.cxx
index fd4a15b66b9..e8c498eea9f 100644
--- a/test/dds-types-test/unionsPubSubTypes.cxx
+++ b/test/dds-types-test/unionsPubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "unionsPubSubTypes.h"
+#include "unionsPubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/dds-types-test/unionsPubSubTypes.h b/test/dds-types-test/unionsPubSubTypes.hpp
similarity index 95%
rename from test/dds-types-test/unionsPubSubTypes.h
rename to test/dds-types-test/unionsPubSubTypes.hpp
index ddca584615b..cb2a01caeff 100644
--- a/test/dds-types-test/unionsPubSubTypes.h
+++ b/test/dds-types-test/unionsPubSubTypes.hpp
@@ -13,25 +13,25 @@
 // limitations under the License.
 
 /*!
- * @file unionsPubSubTypes.h
+ * @file unionsPubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_UNIONS_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_UNIONS_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__UNIONS_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__UNIONS_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "unions.hpp"
 
-#include "helpers/basic_inner_typesPubSubTypes.h"
+#include "helpers/basic_inner_typesPubSubTypes.hpp"
 
 #if !defined(GEN_API_VER) || (GEN_API_VER != 2)
 #error \
@@ -107,7 +107,7 @@ class UnionShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -125,7 +125,7 @@ class UnionShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -198,7 +198,7 @@ class UnionUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -216,7 +216,7 @@ class UnionUShortPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -289,7 +289,7 @@ class UnionLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -307,7 +307,7 @@ class UnionLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -380,7 +380,7 @@ class UnionULongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -398,7 +398,7 @@ class UnionULongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -471,7 +471,7 @@ class UnionLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -489,7 +489,7 @@ class UnionLongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -562,7 +562,7 @@ class UnionULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -580,7 +580,7 @@ class UnionULongLongPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -653,7 +653,7 @@ class UnionFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -671,7 +671,7 @@ class UnionFloatPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -744,7 +744,7 @@ class UnionDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -762,7 +762,7 @@ class UnionDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -835,7 +835,7 @@ class UnionLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -853,7 +853,7 @@ class UnionLongDoublePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -926,7 +926,7 @@ class UnionBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -944,7 +944,7 @@ class UnionBooleanPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1017,7 +1017,7 @@ class UnionOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1035,7 +1035,7 @@ class UnionOctetPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1108,7 +1108,7 @@ class UnionCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1126,7 +1126,7 @@ class UnionCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1199,7 +1199,7 @@ class UnionWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1217,7 +1217,7 @@ class UnionWCharPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1290,7 +1290,7 @@ class UnionStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1308,7 +1308,7 @@ class UnionStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1381,7 +1381,7 @@ class UnionWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1399,7 +1399,7 @@ class UnionWStringPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1472,7 +1472,7 @@ class UnionBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1490,7 +1490,7 @@ class UnionBoundedStringPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1563,7 +1563,7 @@ class UnionBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1581,7 +1581,7 @@ class UnionBoundedWStringPubSubType : public eprosima::fastdds::dds::TopicDataTy
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1654,7 +1654,7 @@ class UnionInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDataT
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1672,7 +1672,7 @@ class UnionInnerEnumHelperPubSubType : public eprosima::fastdds::dds::TopicDataT
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1745,7 +1745,7 @@ class UnionInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1763,7 +1763,7 @@ class UnionInnerBitMaskHelperPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1836,7 +1836,7 @@ class UnionInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1854,7 +1854,7 @@ class UnionInnerAliasHelperPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -1927,7 +1927,7 @@ class UnionArrayPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -1945,7 +1945,7 @@ class UnionArrayPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2018,7 +2018,7 @@ class UnionSequencePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2036,7 +2036,7 @@ class UnionSequencePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2109,7 +2109,7 @@ class UnionMapPubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2127,7 +2127,7 @@ class UnionMapPubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2200,7 +2200,7 @@ class UnionInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2218,7 +2218,7 @@ class UnionInnerUnionHelperPubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2291,7 +2291,7 @@ class UnionInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2309,7 +2309,7 @@ class UnionInnerStructureHelperPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2382,7 +2382,7 @@ class UnionInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2400,7 +2400,7 @@ class UnionInnerBitsetHelperPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2473,7 +2473,7 @@ class UnionDiscriminatorShortPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2491,7 +2491,7 @@ class UnionDiscriminatorShortPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2564,7 +2564,7 @@ class UnionDiscriminatorUShortPubSubType : public eprosima::fastdds::dds::TopicD
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2582,7 +2582,7 @@ class UnionDiscriminatorUShortPubSubType : public eprosima::fastdds::dds::TopicD
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2655,7 +2655,7 @@ class UnionDiscriminatorLongPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2673,7 +2673,7 @@ class UnionDiscriminatorLongPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2746,7 +2746,7 @@ class UnionDiscriminatorULongPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2764,7 +2764,7 @@ class UnionDiscriminatorULongPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2837,7 +2837,7 @@ class UnionDiscriminatorLongLongPubSubType : public eprosima::fastdds::dds::Topi
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2855,7 +2855,7 @@ class UnionDiscriminatorLongLongPubSubType : public eprosima::fastdds::dds::Topi
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -2928,7 +2928,7 @@ class UnionDiscriminatorULongLongPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -2946,7 +2946,7 @@ class UnionDiscriminatorULongLongPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3019,7 +3019,7 @@ class UnionDiscriminatorBooleanPubSubType : public eprosima::fastdds::dds::Topic
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3037,7 +3037,7 @@ class UnionDiscriminatorBooleanPubSubType : public eprosima::fastdds::dds::Topic
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3110,7 +3110,7 @@ class UnionDiscriminatorOctetPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3128,7 +3128,7 @@ class UnionDiscriminatorOctetPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3201,7 +3201,7 @@ class UnionDiscriminatorCharPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3219,7 +3219,7 @@ class UnionDiscriminatorCharPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3292,7 +3292,7 @@ class UnionDiscriminatorWCharPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3310,7 +3310,7 @@ class UnionDiscriminatorWCharPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3383,7 +3383,7 @@ class UnionDiscriminatorEnumPubSubType : public eprosima::fastdds::dds::TopicDat
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3401,7 +3401,7 @@ class UnionDiscriminatorEnumPubSubType : public eprosima::fastdds::dds::TopicDat
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3474,7 +3474,7 @@ class UnionDiscriminatorEnumLabelPubSubType : public eprosima::fastdds::dds::Top
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3492,7 +3492,7 @@ class UnionDiscriminatorEnumLabelPubSubType : public eprosima::fastdds::dds::Top
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3565,7 +3565,7 @@ class UnionDiscriminatorAliasPubSubType : public eprosima::fastdds::dds::TopicDa
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3583,7 +3583,7 @@ class UnionDiscriminatorAliasPubSubType : public eprosima::fastdds::dds::TopicDa
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3656,7 +3656,7 @@ class UnionSeveralFieldsPubSubType : public eprosima::fastdds::dds::TopicDataTyp
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3674,7 +3674,7 @@ class UnionSeveralFieldsPubSubType : public eprosima::fastdds::dds::TopicDataTyp
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -3747,7 +3747,7 @@ class UnionSeveralFieldsWithDefaultPubSubType : public eprosima::fastdds::dds::T
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -3765,10 +3765,10 @@ class UnionSeveralFieldsWithDefaultPubSubType : public eprosima::fastdds::dds::T
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_UNIONS_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__UNIONS_PUBSUBTYPES_HPP
 
diff --git a/test/dds-types-test/unionsTypeObjectSupport.hpp b/test/dds-types-test/unionsTypeObjectSupport.hpp
index 41438137bdb..16bfdd8dd63 100644
--- a/test/dds-types-test/unionsTypeObjectSupport.hpp
+++ b/test/dds-types-test/unionsTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_UNIONS_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_UNIONS_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__UNIONS_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__UNIONS_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -1026,4 +1026,4 @@ eProsima_user_DllExport void register_UnionSeveralFieldsWithDefault_type_identif
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_UNIONS_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__UNIONS_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/dds/communication/PublisherModule.hpp b/test/dds/communication/PublisherModule.hpp
index 54a8b8e415c..9598e8acfad 100644
--- a/test/dds/communication/PublisherModule.hpp
+++ b/test/dds/communication/PublisherModule.hpp
@@ -22,10 +22,10 @@
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/publisher/PublisherListener.hpp>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 
-#include "types/FixedSizedPubSubTypes.h"
-#include "types/HelloWorldPubSubTypes.h"
+#include "types/FixedSizedPubSubTypes.hpp"
+#include "types/HelloWorldPubSubTypes.hpp"
 
 #include <mutex>
 #include <condition_variable>
diff --git a/test/dds/communication/SubscriberModule.hpp b/test/dds/communication/SubscriberModule.hpp
index 3528b20e684..9e315f03121 100644
--- a/test/dds/communication/SubscriberModule.hpp
+++ b/test/dds/communication/SubscriberModule.hpp
@@ -22,10 +22,10 @@
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/subscriber/SubscriberListener.hpp>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 
-#include "types/FixedSizedPubSubTypes.h"
-#include "types/HelloWorldPubSubTypes.h"
+#include "types/FixedSizedPubSubTypes.hpp"
+#include "types/HelloWorldPubSubTypes.hpp"
 
 #include <mutex>
 #include <condition_variable>
diff --git a/test/dds/communication/security/PublisherModule.hpp b/test/dds/communication/security/PublisherModule.hpp
index 046dc0be9cf..3c3de5f46be 100644
--- a/test/dds/communication/security/PublisherModule.hpp
+++ b/test/dds/communication/security/PublisherModule.hpp
@@ -22,10 +22,10 @@
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/publisher/PublisherListener.hpp>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 
-#include "types/FixedSizedPubSubTypes.h"
-#include "types/HelloWorldPubSubTypes.h"
+#include "types/FixedSizedPubSubTypes.hpp"
+#include "types/HelloWorldPubSubTypes.hpp"
 
 #include <mutex>
 #include <condition_variable>
diff --git a/test/dds/communication/security/SubscriberModule.hpp b/test/dds/communication/security/SubscriberModule.hpp
index 2fd6e06b0dd..c7630654f8c 100644
--- a/test/dds/communication/security/SubscriberModule.hpp
+++ b/test/dds/communication/security/SubscriberModule.hpp
@@ -22,10 +22,10 @@
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/subscriber/SubscriberListener.hpp>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 
-#include "types/FixedSizedPubSubTypes.h"
-#include "types/HelloWorldPubSubTypes.h"
+#include "types/FixedSizedPubSubTypes.hpp"
+#include "types/HelloWorldPubSubTypes.hpp"
 
 #include <mutex>
 #include <condition_variable>
diff --git a/test/dds/discovery/ParticipantModule.cpp b/test/dds/discovery/ParticipantModule.cpp
index 092f294a0df..efe2526f018 100644
--- a/test/dds/discovery/ParticipantModule.cpp
+++ b/test/dds/discovery/ParticipantModule.cpp
@@ -25,10 +25,10 @@
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/test/dds/discovery/ParticipantModule.hpp b/test/dds/discovery/ParticipantModule.hpp
index c4011d50267..31cafa66d1b 100644
--- a/test/dds/discovery/ParticipantModule.hpp
+++ b/test/dds/discovery/ParticipantModule.hpp
@@ -23,9 +23,9 @@
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
-#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
+#include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp b/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp
index 0ec09d548eb..11f24002514 100644
--- a/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp
+++ b/test/feature/dynamic_types/DynamicTypesDDSTypesTest.hpp
@@ -23,7 +23,7 @@
 #include <fastdds/dds/xtypes/dynamic_types/DynamicPubSubType.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicType.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp>
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp
index ecae01d5931..f01558a524c 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesAliasesDDSTypesTests.cpp
@@ -18,7 +18,7 @@
 
 #include "../DynamicTypesDDSTypesTest.hpp"
 #include "../../../dds-types-test/helpers/basic_inner_types.hpp"
-#include "../../../dds-types-test/aliasesPubSubTypes.h"
+#include "../../../dds-types-test/aliasesPubSubTypes.hpp"
 #include "../../../dds-types-test/aliasesTypeObjectSupport.hpp"
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesAnnotationsDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesAnnotationsDDSTypesTests.cpp
index a542c1d6a9a..fc53fd359c3 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesAnnotationsDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesAnnotationsDDSTypesTests.cpp
@@ -18,7 +18,7 @@
 
 #include "../DynamicTypesDDSTypesTest.hpp"
 #include "../../../dds-types-test/helpers/basic_inner_types.hpp"
-#include "../../../dds-types-test/annotationsPubSubTypes.h"
+#include "../../../dds-types-test/annotationsPubSubTypes.hpp"
 #include "../../../dds-types-test/annotationsTypeObjectSupport.hpp"
 #include <fastdds/dds/xtypes/dynamic_types/AnnotationDescriptor.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesAppendableDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesAppendableDDSTypesTests.cpp
index 467b4faa25c..3af63df6b55 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesAppendableDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesAppendableDDSTypesTests.cpp
@@ -16,7 +16,7 @@
 
 #include "../DynamicTypesDDSTypesTest.hpp"
 #include "../../../dds-types-test/helpers/basic_inner_types.hpp"
-#include "../../../dds-types-test/appendablePubSubTypes.h"
+#include "../../../dds-types-test/appendablePubSubTypes.hpp"
 #include "../../../dds-types-test/appendableTypeObjectSupport.hpp"
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp
index 1276267d276..222385c95f2 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesArraysDDSTypesTests.cpp
@@ -18,7 +18,7 @@
 
 #include "../DynamicTypesDDSTypesTest.hpp"
 #include "../../../dds-types-test/helpers/basic_inner_types.hpp"
-#include "../../../dds-types-test/arraysPubSubTypes.h"
+#include "../../../dds-types-test/arraysPubSubTypes.hpp"
 #include "../../../dds-types-test/arraysTypeObjectSupport.hpp"
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesBitsetsDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesBitsetsDDSTypesTests.cpp
index 8ef3615a290..5733edd180f 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesBitsetsDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesBitsetsDDSTypesTests.cpp
@@ -15,8 +15,8 @@
 #include <gtest/gtest.h>
 
 #include "../DynamicTypesDDSTypesTest.hpp"
-#include "../../../dds-types-test/helpers/basic_inner_typesPubSubTypes.h"
-#include "../../../dds-types-test/bitsetsPubSubTypes.h"
+#include "../../../dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp"
+#include "../../../dds-types-test/bitsetsPubSubTypes.hpp"
 #include "../../../dds-types-test/bitsetsTypeObjectSupport.hpp"
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesEnumerationsDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesEnumerationsDDSTypesTests.cpp
index 0a85a00a361..c68064183c5 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesEnumerationsDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesEnumerationsDDSTypesTests.cpp
@@ -17,8 +17,8 @@
 #include <gtest/gtest.h>
 
 #include "../DynamicTypesDDSTypesTest.hpp"
-#include "../../../dds-types-test/helpers/basic_inner_typesPubSubTypes.h"
-#include "../../../dds-types-test/enumerationsPubSubTypes.h"
+#include "../../../dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp"
+#include "../../../dds-types-test/enumerationsPubSubTypes.hpp"
 #include "../../../dds-types-test/enumerationsTypeObjectSupport.hpp"
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesFinalDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesFinalDDSTypesTests.cpp
index 9cb2f845d87..d42a30ebddb 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesFinalDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesFinalDDSTypesTests.cpp
@@ -16,7 +16,7 @@
 
 #include "../DynamicTypesDDSTypesTest.hpp"
 #include "../../../dds-types-test/helpers/basic_inner_types.hpp"
-#include "../../../dds-types-test/finalPubSubTypes.h"
+#include "../../../dds-types-test/finalPubSubTypes.hpp"
 #include "../../../dds-types-test/finalTypeObjectSupport.hpp"
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesInheritanceDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesInheritanceDDSTypesTests.cpp
index e4814230e86..57c2dd04037 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesInheritanceDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesInheritanceDDSTypesTests.cpp
@@ -16,7 +16,7 @@
 
 #include "../DynamicTypesDDSTypesTest.hpp"
 #include "../../../dds-types-test/helpers/basic_inner_types.hpp"
-#include "../../../dds-types-test/inheritancePubSubTypes.h"
+#include "../../../dds-types-test/inheritancePubSubTypes.hpp"
 #include "../../../dds-types-test/inheritanceTypeObjectSupport.hpp"
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesMapsDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesMapsDDSTypesTests.cpp
index ea7aa5f8b46..1e9adaeb60b 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesMapsDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesMapsDDSTypesTests.cpp
@@ -22,7 +22,7 @@
 
 #include "../DynamicTypesDDSTypesTest.hpp"
 #include "../../../dds-types-test/helpers/basic_inner_types.hpp"
-#include "../../../dds-types-test/mapsPubSubTypes.h"
+#include "../../../dds-types-test/mapsPubSubTypes.hpp"
 #include "../../../dds-types-test/mapsTypeObjectSupport.hpp"
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesMutableDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesMutableDDSTypesTests.cpp
index b1628ff1295..3899c311f60 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesMutableDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesMutableDDSTypesTests.cpp
@@ -16,7 +16,7 @@
 
 #include "../DynamicTypesDDSTypesTest.hpp"
 #include "../../../dds-types-test/helpers/basic_inner_types.hpp"
-#include "../../../dds-types-test/mutablePubSubTypes.h"
+#include "../../../dds-types-test/mutablePubSubTypes.hpp"
 #include "../../../dds-types-test/mutableTypeObjectSupport.hpp"
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesPrimitivesDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesPrimitivesDDSTypesTests.cpp
index 7d13d57532d..a1f9ee61fe8 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesPrimitivesDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesPrimitivesDDSTypesTests.cpp
@@ -15,7 +15,7 @@
 #include <gtest/gtest.h>
 
 #include "../DynamicTypesDDSTypesTest.hpp"
-#include "../../../dds-types-test/primitivesPubSubTypes.h"
+#include "../../../dds-types-test/primitivesPubSubTypes.hpp"
 #include "../../../dds-types-test/primitivesTypeObjectSupport.hpp"
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesSequencesDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesSequencesDDSTypesTests.cpp
index 0387902a9e7..8279ca58272 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesSequencesDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesSequencesDDSTypesTests.cpp
@@ -17,8 +17,8 @@
 #include <gtest/gtest.h>
 
 #include "../DynamicTypesDDSTypesTest.hpp"
-#include "../../../dds-types-test/helpers/basic_inner_typesPubSubTypes.h"
-#include "../../../dds-types-test/sequencesPubSubTypes.h"
+#include "../../../dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp"
+#include "../../../dds-types-test/sequencesPubSubTypes.hpp"
 #include "../../../dds-types-test/sequencesTypeObjectSupport.hpp"
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesStringsDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesStringsDDSTypesTests.cpp
index 45df87f7a4a..32a9d3a4225 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesStringsDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesStringsDDSTypesTests.cpp
@@ -17,7 +17,7 @@
 #include <gtest/gtest.h>
 
 #include "../DynamicTypesDDSTypesTest.hpp"
-#include "../../../dds-types-test/stringsPubSubTypes.h"
+#include "../../../dds-types-test/stringsPubSubTypes.hpp"
 #include "../../../dds-types-test/stringsTypeObjectSupport.hpp"
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesStructuresDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesStructuresDDSTypesTests.cpp
index f627e65ad65..dca74ca7cdc 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesStructuresDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesStructuresDDSTypesTests.cpp
@@ -18,7 +18,7 @@
 
 #include "../DynamicTypesDDSTypesTest.hpp"
 #include "../../../dds-types-test/helpers/basic_inner_types.hpp"
-#include "../../../dds-types-test/structuresPubSubTypes.h"
+#include "../../../dds-types-test/structuresPubSubTypes.hpp"
 #include "../../../dds-types-test/structuresTypeObjectSupport.hpp"
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
diff --git a/test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp b/test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp
index 7e9af1c1ca2..ed928453242 100644
--- a/test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp
+++ b/test/feature/dynamic_types/dds_types_tests/DynamicTypesUnionsDDSTypesTests.cpp
@@ -17,8 +17,8 @@
 #include <gtest/gtest.h>
 
 #include "../DynamicTypesDDSTypesTest.hpp"
-#include "../../../dds-types-test/helpers/basic_inner_typesPubSubTypes.h"
-#include "../../../dds-types-test/unionsPubSubTypes.h"
+#include "../../../dds-types-test/helpers/basic_inner_typesPubSubTypes.hpp"
+#include "../../../dds-types-test/unionsPubSubTypes.hpp"
 #include "../../../dds-types-test/unionsTypeObjectSupport.hpp"
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp>
diff --git a/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp b/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp
index 4bd387f0ca3..e9a21cb3a5c 100644
--- a/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp
+++ b/test/mock/dds/DataWriterHistory/fastdds/publisher/DataWriterHistory.hpp
@@ -12,24 +12,24 @@
 // See the License for the specific language governing permissiones and
 // limitations under the License.
 
-#ifndef _FASTDDS_PUBLISHER_DATAWRITERHISTORY_HPP_
-#define _FASTDDS_PUBLISHER_DATAWRITERHISTORY_HPP_
+#ifndef FASTDDS_PUBLISHER__DATAWRITERHISTORY_HPP
+#define FASTDDS_PUBLISHER__DATAWRITERHISTORY_HPP
 
 #include <chrono>
 #include <mutex>
 
 #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>
-#include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
 #include <fastdds/rtps/attributes/ResourceManagement.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/common/ChangeKind_t.hpp>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 
 #include <fastdds/publisher/history/DataWriterInstance.hpp>
@@ -325,8 +325,8 @@ class DataWriterHistory : public WriterHistory
 
 };
 
-} // dds
-} // fastdds
-} // eprosima
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif // _FASTDDS_PUBLISHER_DATAWRITERHISTORY_HPP_
+#endif // FASTDDS_PUBLISHER__DATAWRITERHISTORY_HPP
diff --git a/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp b/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp
index 54ad1a05204..ae156d11419 100644
--- a/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp
+++ b/test/mock/dds/DomainParticipantFactory/fastdds/dds/domain/DomainParticipantFactory.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_
-#define _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_
+#ifndef FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTFACTORY_HPP
+#define FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTFACTORY_HPP
 
 #include <memory>
 
@@ -66,4 +66,4 @@ class DomainParticipantFactory
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif /* _FASTDDS_DDS_DOMAIN_DOMAINPARTICIPANT_FACTORY_HPP_*/
+#endif // FASTDDS_DDS_DOMAIN__DOMAINPARTICIPANTFACTORY_HPP
diff --git a/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp b/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp
index e09206c9934..45e785a54ff 100644
--- a/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp
+++ b/test/mock/dds/DomainParticipantImpl/fastdds/domain/DomainParticipantImpl.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_PARTICIPANTIMPL_HPP_
-#define _FASTDDS_PARTICIPANTIMPL_HPP_
+#ifndef FASTDDS_DOMAIN__DOMAINPARTICIPANTIMPL_HPP
+#define FASTDDS_DOMAIN__DOMAINPARTICIPANTIMPL_HPP
 
 #include <atomic>
 #include <map>
@@ -36,13 +36,13 @@
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/publisher/PublisherImpl.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>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
 #include <fastdds/subscriber/SubscriberImpl.hpp>
 #include <fastdds/topic/TopicImpl.hpp>
 #include <fastdds/topic/TopicProxy.hpp>
@@ -782,8 +782,8 @@ class DomainParticipantImpl
 
 };
 
-} // dds
-} // fastdds
-} // eprosima
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_PARTICIPANTIMPL_HPP_ */
+#endif // FASTDDS_DOMAIN__DOMAINPARTICIPANTIMPL_HPP
diff --git a/test/mock/dds/Publisher/fastdds/dds/publisher/Publisher.hpp b/test/mock/dds/Publisher/fastdds/dds/publisher/Publisher.hpp
index 208b1d9fdb8..90417b3a23d 100644
--- a/test/mock/dds/Publisher/fastdds/dds/publisher/Publisher.hpp
+++ b/test/mock/dds/Publisher/fastdds/dds/publisher/Publisher.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_PUBLISHER_HPP_
-#define _FASTDDS_PUBLISHER_HPP_
+#ifndef FASTDDS_DDS_PUBLISHER__PUBLISHER_HPP
+#define FASTDDS_DDS_PUBLISHER__PUBLISHER_HPP
 
 #include <string>
 #include <vector>
@@ -25,7 +25,7 @@
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/publisher/qos/PublisherQos.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
 
 #include <fastdds/publisher/PublisherImpl.hpp>
 
@@ -153,8 +153,8 @@ class Publisher : public Entity
     PublisherImpl* impl_;
 };
 
-} // dds
-} // fastdds
-} // eprosima
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_PUBLISHER_HPP_ */
+#endif // FASTDDS_DDS_PUBLISHER__PUBLISHER_HPP
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 4253c24bd3e..36c8888d352 100644
--- a/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp
+++ b/test/mock/dds/QosPolicies/fastdds/dds/core/policy/QosPolicies.hpp
@@ -13,19 +13,19 @@
 // limitations under the License.
 
 /**
- * @file QosPolicies.h
+ * @file QosPolicies.hpp
  *
  */
 
-#ifndef _FASTDDS_DDS_QOS_QOSPOLICIES_HPP_
-#define _FASTDDS_DDS_QOS_QOSPOLICIES_HPP_
+#ifndef FASTDDS_DDS_CORE_POLICY__QOSPOLICIES_HPP
+#define FASTDDS_DDS_CORE_POLICY__QOSPOLICIES_HPP
 
 #include <bitset>
 #include <vector>
 
 #include <fastdds/dds/core/policy/ParameterTypes.hpp>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
 namespace eprosima {
@@ -1615,4 +1615,4 @@ class TypeInformationParameter : public Parameter_t, public QosPolicy
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_DDS_QOS_QOSPOLICIES_HPP_
+#endif // FASTDDS_DDS_CORE_POLICY__QOSPOLICIES_HPP
diff --git a/test/mock/dds/Topic/fastdds/dds/topic/Topic.hpp b/test/mock/dds/Topic/fastdds/dds/topic/Topic.hpp
index 0b190c371f9..36416a2a60d 100644
--- a/test/mock/dds/Topic/fastdds/dds/topic/Topic.hpp
+++ b/test/mock/dds/Topic/fastdds/dds/topic/Topic.hpp
@@ -16,8 +16,8 @@
  * @file Topic.hpp
  */
 
-#ifndef _FASTDDS_TOPIC_HPP_
-#define _FASTDDS_TOPIC_HPP_
+#ifndef FASTDDS_DDS_TOPIC__TOPIC_HPP
+#define FASTDDS_DDS_TOPIC__TOPIC_HPP
 
 #include <fastdds/dds/core/Entity.hpp>
 #include <fastdds/dds/core/status/BaseStatus.hpp>
@@ -50,4 +50,4 @@ class Topic : public TopicDescription
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TOPIC_HPP_
+#endif // FASTDDS_DDS_TOPIC__TOPIC_HPP
diff --git a/test/mock/dds/TypeObjectRegistry/fastdds/xtypes/type_representation/TypeObjectRegistry.hpp b/test/mock/dds/TypeObjectRegistry/fastdds/xtypes/type_representation/TypeObjectRegistry.hpp
index 7e22649897a..cddf755fedb 100644
--- a/test/mock/dds/TypeObjectRegistry/fastdds/xtypes/type_representation/TypeObjectRegistry.hpp
+++ b/test/mock/dds/TypeObjectRegistry/fastdds/xtypes/type_representation/TypeObjectRegistry.hpp
@@ -17,8 +17,8 @@
  * This file contains the required classes to keep a TypeObject/TypeIdentifier registry.
  */
 
-#ifndef _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTREGISTRY_HPP_
-#define _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTREGISTRY_HPP_
+#ifndef FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECTREGISTRY_HPP
+#define FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECTREGISTRY_HPP
 
 #include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicType.hpp>
@@ -61,9 +61,9 @@ class TypeObjectRegistry : public ITypeObjectRegistry
 
 };
 
-} // xtypes
-} // dds
-} // fastdds
-} // eprosima
+} // namespace xtypes
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif // _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTREGISTRY_HPP_
+#endif // FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECTREGISTRY_HPP
diff --git a/test/mock/dds/TypeObjectUtils/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp b/test/mock/dds/TypeObjectUtils/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp
index 158cecdd8d8..84b7881c759 100644
--- a/test/mock/dds/TypeObjectUtils/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp
+++ b/test/mock/dds/TypeObjectUtils/fastdds/dds/xtypes/type_representation/TypeObjectUtils.hpp
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 /*!
- * @file
+ * @file TypeObjectUtils.hpp
  * This file contains static functions to help build a TypeObject.
  */
 
-#ifndef _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP_
-#define _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP_
+#ifndef FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECTUTILS_HPP
+#define FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECTUTILS_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -50,9 +50,9 @@ class TypeObjectUtils
 
 };
 
-} // xtypes
-} // dds
-} // fastdds
-} // eprosima
+} // namespace xtypes
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
 
-#endif // _FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION_TYPEOBJECTUTILS_HPP_
+#endif // FASTDDS_DDS_XTYPES_TYPE_REPRESENTATION__TYPEOBJECTUTILS_HPP
diff --git a/test/mock/dds/TypeSupport/fastdds/dds/topic/TypeSupport.hpp b/test/mock/dds/TypeSupport/fastdds/dds/topic/TypeSupport.hpp
index e9000c02f54..eea8b69f991 100644
--- a/test/mock/dds/TypeSupport/fastdds/dds/topic/TypeSupport.hpp
+++ b/test/mock/dds/TypeSupport/fastdds/dds/topic/TypeSupport.hpp
@@ -16,8 +16,8 @@
  * @file TypeSupport.hpp
  */
 
-#ifndef _FASTDDS_TYPE_SUPPORT_HPP_
-#define _FASTDDS_TYPE_SUPPORT_HPP_
+#ifndef FASTDDS_DDS_TOPIC__TYPESUPPORT_HPP
+#define FASTDDS_DDS_TOPIC__TYPESUPPORT_HPP
 
 #include <fastdds/dds/topic/TopicDataType.hpp>
 
@@ -43,4 +43,4 @@ class TypeSupport : public std::shared_ptr<fastdds::dds::TopicDataType>
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TYPE_SUPPORT_HPP_
+#endif // FASTDDS_DDS_TOPIC__TYPESUPPORT_HPP
diff --git a/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h b/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h
index b911c59d17c..91f737d76b6 100644
--- a/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h
+++ b/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h
@@ -13,14 +13,14 @@
 // limitations under the License.
 
 /**
- * @file BiultinProtocols.h
+ * @file BuiltinProtocols.h
  */
 
-#ifndef _FASTDDS_RTPS_BUILTINPROTOCOLS_H_
-#define _FASTDDS_RTPS_BUILTINPROTOCOLS_H_
+#ifndef FASTDDS_RTPS_BUILTIN__BUILTINPROTOCOLS_H
+#define FASTDDS_RTPS_BUILTIN__BUILTINPROTOCOLS_H
 
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 
@@ -70,4 +70,4 @@ class BuiltinProtocols
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_ENDPOINT_H_
+#endif // FASTDDS_RTPS_BUILTIN__BUILTINPROTOCOLS_H
diff --git a/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/DataSharingPayloadPool.hpp b/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/DataSharingPayloadPool.hpp
index ecb20077dd7..5bc5a792115 100644
--- a/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/DataSharingPayloadPool.hpp
+++ b/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/DataSharingPayloadPool.hpp
@@ -16,11 +16,11 @@
  * @file DataSharingPayloadPool.hpp
  */
 
-#ifndef RTPS_HISTORY_DATASHARINGPAYLOADPOOL_HPP
-#define RTPS_HISTORY_DATASHARINGPAYLOADPOOL_HPP
+#ifndef FASTDDS_RTPS_DATASHARING__DATASHARINGPAYLOADPOOL_HPP
+#define FASTDDS_RTPS_DATASHARING__DATASHARINGPAYLOADPOOL_HPP
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 #include <rtps/history/PoolConfig.h>
 
 namespace eprosima {
@@ -165,4 +165,4 @@ class DataSharingPayloadPool : public IPayloadPool
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // RTPS_HISTORY_DATASHARINGPAYLOADPOOL_HPP
+#endif  // FASTDDS_RTPS_DATASHARING__DATASHARINGPAYLOADPOOL_HPP
diff --git a/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/ReaderPool.hpp b/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/ReaderPool.hpp
index 9798fc21ed8..0340a3858f2 100644
--- a/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/ReaderPool.hpp
+++ b/test/mock/rtps/DataSharingPayloadPool/rtps/DataSharing/ReaderPool.hpp
@@ -16,8 +16,8 @@
  * @file ReaderPool.hpp
  */
 
-#ifndef RTPS_DATASHARING_READERPOOL_HPP
-#define RTPS_DATASHARING_READERPOOL_HPP
+#ifndef FASTDDS_RTPS_DATASHARING__READERPOOL_HPP
+#define FASTDDS_RTPS_DATASHARING__READERPOOL_HPP
 
 #include <rtps/DataSharing/DataSharingPayloadPool.hpp>
 
@@ -37,4 +37,4 @@ class ReaderPool : public DataSharingPayloadPool
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // RTPS_DATASHARING_DATASHARINGPAYLOADPOOLIMPL_READERPOOL_HPP
+#endif  // FASTDDS_RTPS_DATASHARING__READERPOOL_HPP
diff --git a/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h b/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h
index 0e6f265fe27..da2c4faca39 100644
--- a/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h
+++ b/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h
@@ -16,13 +16,13 @@
  * @file EDP.h
  */
 
-#ifndef _FASTDDS_RTPS_EDP_H_
-#define _FASTDDS_RTPS_EDP_H_
+#ifndef FASTDDS_RTPS_BUILTIN_DISCOVERY_ENDPOINT_EDP_H
+#define FASTDDS_RTPS_BUILTIN_DISCOVERY_ENDPOINT_EDP_H
 #include <gmock/gmock.h>
 
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <rtps/messages/CDRMessage.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
@@ -134,4 +134,4 @@ class EDP
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_RTPS_EDP_H_
+#endif // FASTDDS_RTPS_BUILTIN_DISCOVERY_ENDPOINT_EDP_H
diff --git a/test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.h b/test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.hpp
similarity index 87%
rename from test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.h
rename to test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.hpp
index 502dc75ee66..e9a817d5188 100644
--- a/test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.h
+++ b/test/mock/rtps/Endpoint/fastdds/rtps/Endpoint.hpp
@@ -13,14 +13,14 @@
 // limitations under the License.
 
 /**
- * @file Endpoint.h
+ * @file Endpoint.hpp
  */
 
-#ifndef _FASTDDS_RTPS_ENDPOINT_H_
-#define _FASTDDS_RTPS_ENDPOINT_H_
+#ifndef FASTDDS_RTPS__ENDPOINT_HPP
+#define FASTDDS_RTPS__ENDPOINT_HPP
 
 #include <fastdds/utils/TimedMutex.hpp>
-#include <fastdds/rtps/attributes/EndpointAttributes.h>
+#include <fastdds/rtps/attributes/EndpointAttributes.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -64,4 +64,4 @@ class Endpoint
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_ENDPOINT_H_
+#endif // FASTDDS_RTPS__ENDPOINT_HPP
diff --git a/test/mock/rtps/Log/fastdds/dds/log/FileConsumer.hpp b/test/mock/rtps/Log/fastdds/dds/log/FileConsumer.hpp
index 1588308c2d0..664bfbdd66e 100644
--- a/test/mock/rtps/Log/fastdds/dds/log/FileConsumer.hpp
+++ b/test/mock/rtps/Log/fastdds/dds/log/FileConsumer.hpp
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 /**
- * @file FileConsumer.h
+ * @file FileConsumer.hpp
  *
  */
 
-#ifndef _FASTDDS_DDS_LOG_FILECONSUMER_HPP_
-#define _FASTDDS_DDS_LOG_FILECONSUMER_HPP_
+#ifndef FASTDDS_DDS_LOG__FILECONSUMER_HPP
+#define FASTDDS_DDS_LOG__FILECONSUMER_HPP
 
 #include <gmock/gmock.h>
 
@@ -54,4 +54,4 @@ MATCHER(IsFileConsumer, "Argument is a FileConsumer object?")
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_LOG_FILECONSUMER_HPP_
+#endif // FASTDDS_DDS_LOG__FILECONSUMER_HPP
diff --git a/test/mock/rtps/Log/fastdds/dds/log/Log.hpp b/test/mock/rtps/Log/fastdds/dds/log/Log.hpp
index 5f84e08fa69..5450bd53e1b 100644
--- a/test/mock/rtps/Log/fastdds/dds/log/Log.hpp
+++ b/test/mock/rtps/Log/fastdds/dds/log/Log.hpp
@@ -12,9 +12,14 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
-#ifndef _FASTDDS_DDS_LOG_LOG_HPP_
-#define _FASTDDS_DDS_LOG_LOG_HPP_
+
+/**
+ * @file Log.hpp
+ *
+ */
+
+#ifndef FASTDDS_DDS_LOG__LOG_HPP
+#define FASTDDS_DDS_LOG__LOG_HPP
 
 #include <functional>
 #include <memory>
@@ -118,4 +123,4 @@ class LogMock
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_LOG_LOG_HPP_
+#endif // FASTDDS_DDS_LOG__LOG_HPP
diff --git a/test/mock/rtps/Log/fastdds/dds/log/OStreamConsumer.hpp b/test/mock/rtps/Log/fastdds/dds/log/OStreamConsumer.hpp
index 001f75eb77f..0e3b9a6a06a 100644
--- a/test/mock/rtps/Log/fastdds/dds/log/OStreamConsumer.hpp
+++ b/test/mock/rtps/Log/fastdds/dds/log/OStreamConsumer.hpp
@@ -12,8 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_DDS_LOG_OSTREAMCONSUMER_HPP_
-#define _FASTDDS_DDS_LOG_OSTREAMCONSUMER_HPP_
+/**
+ * @file OStreamConsumer.hpp
+ *
+ */
+
+#ifndef FASTDDS_DDS_LOG__OSTREAMCONSUMER_HPP
+#define FASTDDS_DDS_LOG__OSTREAMCONSUMER_HPP
 
 #include <fastdds/dds/log/Log.hpp>
 
@@ -29,4 +34,4 @@ class OStreamConsumer : public LogConsumer
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // ifndef _FASTDDS_DDS_LOG_OSTREAMCONSUMER_HPP_
+#endif // FASTDDS_DDS_LOG__OSTREAMCONSUMER_HPP
diff --git a/test/mock/rtps/Log/fastdds/dds/log/StdoutConsumer.hpp b/test/mock/rtps/Log/fastdds/dds/log/StdoutConsumer.hpp
index c2461c6e9a6..90248db608c 100644
--- a/test/mock/rtps/Log/fastdds/dds/log/StdoutConsumer.hpp
+++ b/test/mock/rtps/Log/fastdds/dds/log/StdoutConsumer.hpp
@@ -12,8 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_DDS_LOG_STDOUTCONSUMER_HPP_
-#define _FASTDDS_DDS_LOG_STDOUTCONSUMER_HPP_
+/**
+ * @file StdoutConsumer.hpp
+ *
+ */
+
+#ifndef FASTDDS_DDS_LOG__STDOUTCONSUMER_HPP
+#define FASTDDS_DDS_LOG__STDOUTCONSUMER_HPP
 
 #include <fastdds/dds/log/Log.hpp>
 
@@ -32,4 +37,4 @@ class StdoutConsumer : public LogConsumer
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // ifndef _FASTDDS_DDS_LOG_STDOUTCONSUMER_HPP_
+#endif // FASTDDS_DDS_LOG__STDOUTCONSUMER_HPP
diff --git a/test/mock/rtps/Log/fastdds/dds/log/StdoutErrConsumer.hpp b/test/mock/rtps/Log/fastdds/dds/log/StdoutErrConsumer.hpp
index 0d00d1cfb19..26c56466c30 100644
--- a/test/mock/rtps/Log/fastdds/dds/log/StdoutErrConsumer.hpp
+++ b/test/mock/rtps/Log/fastdds/dds/log/StdoutErrConsumer.hpp
@@ -12,8 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_DDS_LOG_STDOUTERRCONSUMER_HPP_
-#define _FASTDDS_DDS_LOG_STDOUTERRCONSUMER_HPP_
+/**
+ * @file StdoutErrConsumer.hpp
+ *
+ */
+
+#ifndef FASTDDS_DDS_LOG__STDOUTERRCONSUMER_HPP
+#define FASTDDS_DDS_LOG__STDOUTERRCONSUMER_HPP
 
 #include <gmock/gmock.h>
 
@@ -51,4 +56,4 @@ MATCHER(IsStdoutErrConsumer, "Argument is a StdoutErrConsumer object?")
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_DDS_LOG_STDOUTERRCONSUMER_HPP_
+#endif // FASTDDS_DDS_LOG__STDOUTERRCONSUMER_HPP
diff --git a/test/mock/rtps/MessageReceiver/rtps/messages/MessageReceiver.h b/test/mock/rtps/MessageReceiver/rtps/messages/MessageReceiver.h
index bbbe37b162e..b5c1706970f 100644
--- a/test/mock/rtps/MessageReceiver/rtps/messages/MessageReceiver.h
+++ b/test/mock/rtps/MessageReceiver/rtps/messages/MessageReceiver.h
@@ -18,12 +18,12 @@
 
 
 
-#ifndef _FASTDDS_RTPS_MESSAGERECEIVER_H_
-#define _FASTDDS_RTPS_MESSAGERECEIVER_H_
+#ifndef FASTDDS_RTPS_MESSAGES__MESSAGERECEIVER_H
+#define FASTDDS_RTPS_MESSAGES__MESSAGERECEIVER_H
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
 
 #include <rtps/writer/StatefulWriter.hpp>
 #include <rtps/writer/StatelessWriter.hpp>
@@ -78,7 +78,7 @@ class MessageReceiver
 
 };
 } // namespace rtps
-} /* namespace rtps */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace eprosima
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_MESSAGERECEIVER_H_*/
+#endif // FASTDDS_RTPS_MESSAGES__MESSAGERECEIVER_H
diff --git a/test/mock/rtps/NetworkFactory/rtps/network/NetworkFactory.h b/test/mock/rtps/NetworkFactory/rtps/network/NetworkFactory.h
index fb303d7f7b3..37f911d0682 100644
--- a/test/mock/rtps/NetworkFactory/rtps/network/NetworkFactory.h
+++ b/test/mock/rtps/NetworkFactory/rtps/network/NetworkFactory.h
@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _RTPS_NETWORK_NETWORKFACTORY_H_
-#define _RTPS_NETWORK_NETWORKFACTORY_H_
+#ifndef FASTDDS_RTPS_NETWORK__NETWORKFACTORY_H
+#define FASTDDS_RTPS_NETWORK__NETWORKFACTORY_H
 
 #include <memory>
 #include <vector>
 
 #include <fastdds/rtps/common/LocatorSelector.hpp>
-#include <fastdds/rtps/transport/SenderResource.h>
-#include <fastdds/rtps/transport/TransportInterface.h>
+#include <fastdds/rtps/transport/SenderResource.hpp>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
 
 #include <rtps/messages/MessageReceiver.h>
 #include <rtps/network/ReceiverResource.h>
@@ -112,4 +112,4 @@ class NetworkFactory
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // ifndef _RTPS_NETWORK_NETWORKFACTORY_H_
+#endif // FASTDDS_RTPS_NETWORK__NETWORKFACTORY_H
diff --git a/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h b/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h
index 1342306a27d..fa715adc6e2 100644
--- a/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h
+++ b/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h
@@ -16,8 +16,8 @@
  * @file PDP.h
  */
 
-#ifndef _FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDP_H_
-#define _FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDP_H_
+#ifndef FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDP_H
+#define FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDP_H
 
 #include <gmock/gmock.h>
 
@@ -126,4 +126,4 @@ class PDP
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDP_H_
+#endif // FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDP_H
diff --git a/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h b/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h
index 4f02c5547c5..53a44058b4d 100644
--- a/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h
+++ b/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h
@@ -16,8 +16,8 @@
  * @file PDPSimple.h
  */
 
-#ifndef _FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDPSIMPLE_H_
-#define _FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDPSIMPLE_H_
+#ifndef FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDPSIMPLE_H
+#define FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDPSIMPLE_H
 
 #include <gmock/gmock.h>
 
@@ -49,8 +49,8 @@ class PDPSimple
     EDP edp_;
 };
 
-} //namespace rtps
-} //namespace fastdds
-} //namespace eprosima
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif // _FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT_PDPSIMPLE_H_
+#endif // FASTDDS_RTPS_BUILTIN_DISCOVERY_PARTICIPANT__PDPSIMPLE_H
diff --git a/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp b/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp
index 55456217519..cab27c46ebe 100644
--- a/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp
+++ b/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp
@@ -15,15 +15,15 @@
 /**
  * @file ParticipantProxyData.hpp
  */
-#ifndef _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_
-#define _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_
+#ifndef FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
+#define FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
 
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
-#include <fastdds/rtps/common/CDRMessage_t.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/common/RemoteLocators.hpp>
-#include <fastdds/rtps/common/Token.h>
+#include <fastdds/rtps/common/Token.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #if HAVE_SECURITY
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
@@ -81,4 +81,4 @@ class ParticipantProxyData
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_BUILTIN_DATA_PARTICIPANTPROXYDATA_HPP_
+#endif // FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
diff --git a/test/mock/rtps/RTPSDomain/fastdds/rtps/RTPSDomain.h b/test/mock/rtps/RTPSDomain/fastdds/rtps/RTPSDomain.hpp
similarity index 92%
rename from test/mock/rtps/RTPSDomain/fastdds/rtps/RTPSDomain.h
rename to test/mock/rtps/RTPSDomain/fastdds/rtps/RTPSDomain.hpp
index 32cee263adf..38f03ddbfa5 100644
--- a/test/mock/rtps/RTPSDomain/fastdds/rtps/RTPSDomain.h
+++ b/test/mock/rtps/RTPSDomain/fastdds/rtps/RTPSDomain.hpp
@@ -12,16 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_RTPS_DOMAIN_H_
-#define _FASTDDS_RTPS_DOMAIN_H_
+/**
+ * @file RTPSDomain.hpp
+ *
+ */
 
-#include <fastdds/rtps/common/Types.h>
+#ifndef FASTDDS_RTPS__RTPSDOMAIN_HPP
+#define FASTDDS_RTPS__RTPSDOMAIN_HPP
+
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <gmock/gmock.h>
 
@@ -192,4 +197,4 @@ class RTPSDomain
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_DOMAIN_H_*/
+#endif // FASTDDS_RTPS__RTPSDOMAIN_HPP
diff --git a/test/mock/rtps/RTPSDomainImpl/rtps/RTPSDomainImpl.hpp b/test/mock/rtps/RTPSDomainImpl/rtps/RTPSDomainImpl.hpp
index d7becee4a44..db1bc03dd84 100644
--- a/test/mock/rtps/RTPSDomainImpl/rtps/RTPSDomainImpl.hpp
+++ b/test/mock/rtps/RTPSDomainImpl/rtps/RTPSDomainImpl.hpp
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _RTPS_RTPSDOMAINIMPL_HPP_
-#define _RTPS_RTPSDOMAINIMPL_HPP_
+#ifndef FASTDDS_RTPS__RTPSDOMAINIMPL_HPP
+#define FASTDDS_RTPS__RTPSDOMAINIMPL_HPP
 
 #include <memory>
 
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
 #include <fastdds/xtypes/type_representation/TypeObjectRegistry.hpp>
 
 namespace eprosima {
@@ -144,4 +144,4 @@ class RTPSDomainImpl
 } // namespace fastdds
 } // namespace eprosima
 
-#endif  // _RTPS_RTPSDOMAINIMPL_HPP_
+#endif  // FASTDDS_RTPS__RTPSDOMAINIMPL_HPP
diff --git a/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp b/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp
index cce1333aa3a..939111ff216 100644
--- a/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp
+++ b/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp
@@ -17,11 +17,11 @@
  *
  */
 
-#ifndef RTPSGAPBUILDER_HPP
-#define RTPSGAPBUILDER_HPP
+#ifndef FASTDDS_RTPS_MESSAGES__RTPSGAPBUILDER_HPP
+#define FASTDDS_RTPS_MESSAGES__RTPSGAPBUILDER_HPP
 
-#include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 
 #include <rtps/messages/RTPSMessageGroup.hpp>
 
@@ -89,8 +89,8 @@ class RTPSGapBuilder
     MOCK_METHOD0(flush, bool());
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* RTPSGAPBUILDER_HPP */
+#endif // FASTDDS_RTPS_MESSAGES__RTPSGAPBUILDER_HPP
diff --git a/test/mock/rtps/RTPSMessageGroup/rtps/messages/RTPSMessageGroup.hpp b/test/mock/rtps/RTPSMessageGroup/rtps/messages/RTPSMessageGroup.hpp
index 503a9add256..2205830b65b 100644
--- a/test/mock/rtps/RTPSMessageGroup/rtps/messages/RTPSMessageGroup.hpp
+++ b/test/mock/rtps/RTPSMessageGroup/rtps/messages/RTPSMessageGroup.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_RTPSMESSAGEGROUP_H_
-#define _FASTDDS_RTPS_RTPSMESSAGEGROUP_H_
+#ifndef FASTDDS_RTPS_MESSAGES__RTPSMESSAGEGROUP_H
+#define FASTDDS_RTPS_MESSAGES__RTPSMESSAGEGROUP_H
 
 #include <chrono>
 
@@ -85,4 +85,4 @@ class RTPSMessageGroup
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_RTPSMESSAGEGROUP_H_
+#endif // FASTDDS_RTPS_MESSAGES__RTPSMESSAGEGROUP_H
diff --git a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.hpp
similarity index 94%
rename from test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h
rename to test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.hpp
index 05db3168be4..50242b7a475 100644
--- a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h
+++ b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.hpp
@@ -12,9 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+/**
+ * @file RTPSParticipant.hpp
+ *
+ */
 
-#ifndef _FASTDDS_RTPS_RTPSParticipant_H_
-#define _FASTDDS_RTPS_RTPSParticipant_H_
+#ifndef FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANT_HPP
+#define FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANT_HPP
 
 #include <cstdlib>
 #include <memory>
@@ -24,9 +28,9 @@
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 
 #include <rtps/reader/StatefulReader.hpp>
 #include <rtps/resources/ResourceEvent.h>
@@ -252,8 +256,8 @@ class FASTDDS_EXPORTED_API RTPSParticipant
     RTPSParticipantImpl* mp_impl;
 };
 
-} /* namespace rtps */
-} /* namespace fastdds */
-} /* namespace eprosima */
+} // namespace rtps
+} // namespace fastdds
+} // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_RTPSParticipant_H_ */
+#endif // FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANT_HPP
diff --git a/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h b/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.hpp
similarity index 97%
rename from test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h
rename to test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.hpp
index e2a9cb2893a..da946d6ce03 100644
--- a/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.h
+++ b/test/mock/rtps/RTPSParticipantAttributes/fastdds/rtps/attributes/RTPSParticipantAttributes.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file RTPSParticipantAttributes.h
+ * @file RTPSParticipantAttributes.hpp
  */
 
-#ifndef _FASTDDS_RTPSPARTICIPANTPARAMETERS_H_
-#define _FASTDDS_RTPSPARTICIPANTPARAMETERS_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__RTPSPARTICIPANTATTRIBUTES_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__RTPSPARTICIPANTATTRIBUTES_HPP
 
 #include <memory>
 #include <sstream>
@@ -26,19 +26,19 @@
 
 #include <fastdds/rtps/attributes/BuiltinTransports.hpp>
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
-#include <fastdds/rtps/attributes/ServerAttributes.h>
+#include <fastdds/rtps/attributes/ServerAttributes.hpp>
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/common/PortParameters.h>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/common/PortParameters.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp>
-#include <fastdds/rtps/attributes/ResourceManagement.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
-#include <fastdds/rtps/transport/TransportInterface.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 #include <fastdds/fastdds_dll.hpp>
 
 namespace eprosima {
@@ -634,4 +634,4 @@ class RTPSParticipantAttributes
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // _FASTDDS_RTPSPARTICIPANTPARAMETERS_H_
+#endif  // FASTDDS_RTPS_ATTRIBUTES__RTPSPARTICIPANTATTRIBUTES_HPP
diff --git a/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h b/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
index 918e441a15b..dd8843720fc 100644
--- a/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
+++ b/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
@@ -16,8 +16,8 @@
  * @file RTPSParticipantImpl.h
  */
 
-#ifndef _RTPS_PARTICIPANT_RTPSPARTICIPANTIMPL_H_
-#define _RTPS_PARTICIPANT_RTPSPARTICIPANTIMPL_H_
+#ifndef FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANTIMPL_H
+#define FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANTIMPL_H
 
 #include <atomic>
 #include <map>
@@ -26,12 +26,12 @@
 #include <gmock/gmock.h>
 
 // Include first possible mocks (depending on include on CMakeLists.txt)
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/history/IChangePool.h>
-#include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/history/IChangePool.hpp>
+#include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <rtps/network/NetworkFactory.h>
 #include <rtps/reader/BaseReader.hpp>
@@ -443,4 +443,4 @@ class RTPSParticipantImpl
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _RTPS_PARTICIPANT_RTPSPARTICIPANTIMPL_H_
+#endif // FASTDDS_RTPS_PARTICIPANT__RTPSPARTICIPANTIMPL_H
diff --git a/test/mock/rtps/RTPSReader/fastdds/rtps/reader/RTPSReader.h b/test/mock/rtps/RTPSReader/fastdds/rtps/reader/RTPSReader.hpp
similarity index 88%
rename from test/mock/rtps/RTPSReader/fastdds/rtps/reader/RTPSReader.h
rename to test/mock/rtps/RTPSReader/fastdds/rtps/reader/RTPSReader.hpp
index 292bd11f162..19a5f0941ea 100644
--- a/test/mock/rtps/RTPSReader/fastdds/rtps/reader/RTPSReader.h
+++ b/test/mock/rtps/RTPSReader/fastdds/rtps/reader/RTPSReader.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /**
- * @file RTPSReader.h
+ * @file RTPSReader.hpp
  */
 
-#ifndef _FASTDDS_RTPS_READER_RTPSREADER_H_
-#define _FASTDDS_RTPS_READER_RTPSREADER_H_
+#ifndef FASTDDS_RTPS_READER__RTPSREADER_HPP
+#define FASTDDS_RTPS_READER__RTPSREADER_HPP
 
 #include <gmock/gmock.h>
 
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/Endpoint.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/Endpoint.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/reader/ReaderListener.h>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -161,4 +161,4 @@ class RTPSReader : public Endpoint
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_READER_RTPSREADER_H_
+#endif // FASTDDS_RTPS_READER__RTPSREADER_HPP
diff --git a/test/mock/rtps/RTPSReader/rtps/reader/BaseReader.hpp b/test/mock/rtps/RTPSReader/rtps/reader/BaseReader.hpp
index 1655c5ba6b4..9eea8c379ac 100644
--- a/test/mock/rtps/RTPSReader/rtps/reader/BaseReader.hpp
+++ b/test/mock/rtps/RTPSReader/rtps/reader/BaseReader.hpp
@@ -16,19 +16,19 @@
  * @file BaseReader.hpp
  */
 
-#ifndef RTPS_READER__BASEREADER_HPP
-#define RTPS_READER__BASEREADER_HPP
+#ifndef FASTDDS_RTPS_READER__BASEREADER_HPP
+#define FASTDDS_RTPS_READER__BASEREADER_HPP
 
 #include <gmock/gmock.h>
 
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/Endpoint.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/Endpoint.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/reader/ReaderListener.h>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
 
 namespace eprosima {
 
@@ -163,4 +163,4 @@ class BaseReader : public fastdds::rtps::RTPSReader
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif // RTPS_READER__BASEREADER_HPP
+#endif // FASTDDS_RTPS_READER__BASEREADER_HPP
diff --git a/test/mock/rtps/RTPSWriter/fastdds/rtps/writer/RTPSWriter.h b/test/mock/rtps/RTPSWriter/fastdds/rtps/writer/RTPSWriter.hpp
similarity index 95%
rename from test/mock/rtps/RTPSWriter/fastdds/rtps/writer/RTPSWriter.h
rename to test/mock/rtps/RTPSWriter/fastdds/rtps/writer/RTPSWriter.hpp
index b827df7d005..d5c2f05f4ea 100644
--- a/test/mock/rtps/RTPSWriter/fastdds/rtps/writer/RTPSWriter.h
+++ b/test/mock/rtps/RTPSWriter/fastdds/rtps/writer/RTPSWriter.hpp
@@ -16,8 +16,8 @@
  * @file RTPSWriter.h
  */
 
-#ifndef _FASTDDS_RTPS_RTPSWRITER_H_
-#define _FASTDDS_RTPS_RTPSWRITER_H_
+#ifndef FASTDDS_RTPS_WRITER__RTPSWRITER_HPP
+#define FASTDDS_RTPS_WRITER__RTPSWRITER_HPP
 
 #include <condition_variable>
 #include <vector>
@@ -25,14 +25,14 @@
 #include <gmock/gmock.h>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastdds/rtps/Endpoint.h>
+#include <fastdds/rtps/Endpoint.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
 #include <fastdds/rtps/writer/DeliveryRetCode.hpp>
 #include <fastdds/rtps/writer/LocatorSelectorSender.hpp>
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 #include <rtps/messages/RTPSMessageGroup.hpp>
 
 namespace eprosima {
@@ -294,4 +294,4 @@ class RTPSWriter : public Endpoint
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_RTPSWRITER_H_
+#endif // FASTDDS_RTPS_WRITER__RTPSWRITER_HPP
diff --git a/test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h b/test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.hpp
similarity index 94%
rename from test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h
rename to test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.hpp
index 80d65aa224a..69c085d4be3 100644
--- a/test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.h
+++ b/test/mock/rtps/ReaderHistory/fastdds/rtps/history/ReaderHistory.hpp
@@ -13,19 +13,19 @@
 // limitations under the License.
 
 /**
- * @file ReaderHistory.h
+ * @file ReaderHistory.hpp
  */
 
-#ifndef _FASTDDS_RTPS_READERHISTORY_H_
-#define _FASTDDS_RTPS_READERHISTORY_H_
+#ifndef FASTDDS_RTPS_HISTORY__READERHISTORY_HPP
+#define FASTDDS_RTPS_HISTORY__READERHISTORY_HPP
 
 #include <mutex>
 
 #include <gmock/gmock.h>
 
 #include <fastdds/dds/core/status/SampleRejectedStatus.hpp>
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 
 namespace eprosima {
@@ -221,4 +221,4 @@ class ReaderHistory
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_READERHISTORY_H_
+#endif // FASTDDS_RTPS_HISTORY__READERHISTORY_HPP
diff --git a/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp b/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp
index 20c3bd13a1a..6e964c39127 100644
--- a/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp
+++ b/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp
@@ -16,15 +16,15 @@
  * @file ReaderLocator.hpp
  */
 
-#ifndef RTPS_WRITER__READERLOCATOR_HPP
-#define RTPS_WRITER__READERLOCATOR_HPP
+#ifndef FASTDDS_RTPS_WRITER__READERLOCATOR_HPP
+#define FASTDDS_RTPS_WRITER__READERLOCATOR_HPP
 
 #include <vector>
 
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
-#include <fastdds/rtps/common/SequenceNumber.h>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
 #include <fastdds/rtps/messages/RTPSMessageSenderInterface.hpp>
 
 namespace eprosima {
@@ -256,4 +256,4 @@ class ReaderLocator : public RTPSMessageSenderInterface
 } /* namespace fastdds */
 } /* namespace eprosima */
 
-#endif // RTPS_WRITER__READERLOCATOR_HPP
+#endif // FASTDDS_RTPS_WRITER__READERLOCATOR_HPP
diff --git a/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.h b/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.hpp
similarity index 95%
rename from test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.h
rename to test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.hpp
index f76bf9ce8a9..a4a284c9872 100644
--- a/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.h
+++ b/test/mock/rtps/ReaderProxyData/fastdds/rtps/builtin/data/ReaderProxyData.hpp
@@ -13,24 +13,24 @@
 // limitations under the License.
 
 /**
- * @file ReaderProxyData.h
+ * @file ReaderProxyData.hpp
  */
 
-#ifndef _FASTDDS_RTPS_BUILTIN_DATA_READERPROXYDATA_H_
-#define _FASTDDS_RTPS_BUILTIN_DATA_READERPROXYDATA_H_
+#ifndef FASTDDS_RTPS_BUILTIN_DATA__READERPROXYDATA_HPP
+#define FASTDDS_RTPS_BUILTIN_DATA__READERPROXYDATA_HPP
 
 #include <gmock/gmock.h>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
 #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/attributes/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.hpp>
 #endif // if HAVE_SECURITY
 
 namespace eprosima {
@@ -356,4 +356,4 @@ class ReaderProxyData
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_BUILTIN_DATA_READERPROXYDATA_H_
+#endif // FASTDDS_RTPS_BUILTIN_DATA__READERPROXYDATA_HPP
diff --git a/test/mock/rtps/ReceiverResource/rtps/network/ReceiverResource.h b/test/mock/rtps/ReceiverResource/rtps/network/ReceiverResource.h
index 68ae5b40d9b..9ddf72b6bed 100644
--- a/test/mock/rtps/ReceiverResource/rtps/network/ReceiverResource.h
+++ b/test/mock/rtps/ReceiverResource/rtps/network/ReceiverResource.h
@@ -12,15 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_RTPS_RECEIVER_RESOURCE_H
-#define _FASTDDS_RTPS_RECEIVER_RESOURCE_H
+/**
+ * @file ReceiverResource.h
+ *
+ */
+
+#ifndef FASTDDS_RTPS_NETWORK__RECEIVERRESOURCE_H
+#define FASTDDS_RTPS_NETWORK__RECEIVERRESOURCE_H
 
 #include <functional>
 #include <memory>
 #include <vector>
 
-#include <fastdds/rtps/Endpoint.h>
-#include <fastdds/rtps/transport/TransportInterface.h>
+#include <fastdds/rtps/Endpoint.hpp>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -142,4 +147,4 @@ class ReceiverResource : public fastdds::rtps::TransportReceiverInterface
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // ifndef _FASTDDS_RTPS_RECEIVER_RESOURCE_H
+#endif // FASTDDS_RTPS_NETWORK__RECEIVERRESOURCE_H
diff --git a/test/mock/rtps/ResourceEvent/rtps/resources/ResourceEvent.h b/test/mock/rtps/ResourceEvent/rtps/resources/ResourceEvent.h
index 114d890e853..93de8b24ed7 100644
--- a/test/mock/rtps/ResourceEvent/rtps/resources/ResourceEvent.h
+++ b/test/mock/rtps/ResourceEvent/rtps/resources/ResourceEvent.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_RESOURCES_RESOURCEEVENT_H_
-#define _FASTDDS_RTPS_RESOURCES_RESOURCEEVENT_H_
+#ifndef FASTDDS_RTPS_RESOURCES__RESOURCEEVENT_H
+#define FASTDDS_RTPS_RESOURCES__RESOURCEEVENT_H
 
 #include <gmock/gmock.h>
 
@@ -53,5 +53,5 @@ class ResourceEvent
 } // namespace fastdds
 } // namespace eprosima
 
-#endif //_FASTDDS_RTPS_RESOURCES_RESOURCEEVENT_H_
+#endif //FASTDDS_RTPS_RESOURCES__RESOURCEEVENT_H
 
diff --git a/test/mock/rtps/SecurityManager/rtps/security/SecurityManager.h b/test/mock/rtps/SecurityManager/rtps/security/SecurityManager.h
index 92f5c0de9c7..c54c1cd9069 100644
--- a/test/mock/rtps/SecurityManager/rtps/security/SecurityManager.h
+++ b/test/mock/rtps/SecurityManager/rtps/security/SecurityManager.h
@@ -15,13 +15,13 @@
 /*!
  * @file SecurityPluginFactory.h
  */
-#ifndef _RTPS_SECURITY_SECURITYMANAGER_H_
-#define _RTPS_SECURITY_SECURITYMANAGER_H_
+#ifndef FASTDDS_RTPS_SECURITY__SECURITYMANAGER_H
+#define FASTDDS_RTPS_SECURITY__SECURITYMANAGER_H
 
 #include <gmock/gmock.h>
 
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -83,4 +83,4 @@ class SecurityManager
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _RTPS_SECURITY_SECURITYMANAGER_H_
+#endif // FASTDDS_RTPS_SECURITY__SECURITYMANAGER_H
diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h
index 0b8358b26ba..2806b56c983 100644
--- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h
+++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h
@@ -16,11 +16,11 @@
  * @file MockAccessControlPlugin.h
  */
 
-#ifndef _SECURITY_MOCKACCESSCONTROLPLUGIN_H_
-#define _SECURITY_MOCKACCESSCONTROLPLUGIN_H_
+#ifndef FASTDDS_RTPS_SECURITY__MOCKACCESSCONTROLPLUGIN_H
+#define FASTDDS_RTPS_SECURITY__MOCKACCESSCONTROLPLUGIN_H
 
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 
 #include <rtps/security/accesscontrol/AccessControl.h>
@@ -151,4 +151,4 @@ class MockAccessControlPlugin : public AccessControl
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _SECURITY_MOCKACCESSCONTROLPLUGIN_H_
+#endif // FASTDDS_RTPS_SECURITY__MOCKACCESSCONTROLPLUGIN_H
diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAuthenticationPlugin.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAuthenticationPlugin.h
index 042ffbcf938..51c372655c9 100644
--- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAuthenticationPlugin.h
+++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAuthenticationPlugin.h
@@ -16,8 +16,8 @@
  * @file MockAuthenticationPlugin.h
  */
 
-#ifndef _SECURITY_MOCKAUTHENTICATIONPLUGIN_H_
-#define _SECURITY_MOCKAUTHENTICATIONPLUGIN_H_
+#ifndef FASTDDS_RTPS_SECURITY__MOCKAUTHENTICATIONPLUGIN_H
+#define FASTDDS_RTPS_SECURITY__MOCKAUTHENTICATIONPLUGIN_H
 
 // TODO(Ricardo) Change when GMock supports r-values.
 
@@ -186,4 +186,4 @@ class MockAuthenticationPlugin : public Authentication
 
 #pragma warning(pop)
 
-#endif // _SECURITY_MOCKAUTHENTICATIONPLUGIN_H_
+#endif // FASTDDS_RTPS_SECURITY__MOCKAUTHENTICATIONPLUGIN_H
diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyExchange.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyExchange.h
index 68a7f11a424..6a2ee5b4cf2 100644
--- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyExchange.h
+++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyExchange.h
@@ -15,8 +15,8 @@
 /*!
  * @file MockCryptoKeyExchange.h
  */
-#ifndef _RTPS_SECURITY_MOCKCRYPTOKEYEXCHANGE_H_
-#define _RTPS_SECURITY_MOCKCRYPTOKEYEXCHANGE_H_
+#ifndef FASTDDS_RTPS_SECURITY__MOCKCRYPTOKEYEXCHANGE_H
+#define FASTDDS_RTPS_SECURITY__MOCKCRYPTOKEYEXCHANGE_H
 
 #include <gmock/gmock.h>
 
@@ -83,4 +83,4 @@ class MockCryptoKeyExchange : public CryptoKeyExchange
 } //namespace fastdds
 } //namespace eprosima
 
-#endif //_RTPS_SECURITY_MOCKCRYPTOKEYEXCHANGE_H_
+#endif //FASTDDS_RTPS_SECURITY__MOCKCRYPTOKEYEXCHANGE_H
diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyFactory.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyFactory.h
index 28bf05034c4..d157e0f1e7a 100644
--- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyFactory.h
+++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoKeyFactory.h
@@ -15,8 +15,8 @@
 /*!
  * @file MockCryptoKeyFactory.h
  */
-#ifndef _RTPS_SECURITY_MOCKCRYPTOKEYFACTORY_H_
-#define _RTPS_SECURITY_MOCKCRYPTOKEYFACTORY_H_
+#ifndef FASTDDS_RTPS_SECURITY__MOCKCRYPTOKEYFACTORY_H
+#define FASTDDS_RTPS_SECURITY__MOCKCRYPTOKEYFACTORY_H
 
 #include <gmock/gmock.h>
 
@@ -123,4 +123,4 @@ class MockCryptoKeyFactory : public CryptoKeyFactory
 
 #pragma warning(pop)
 
-#endif // _RTPS_SECURITY_MOCKCRYPTOKEYFACTORY_H_
+#endif // FASTDDS_RTPS_SECURITY__MOCKCRYPTOKEYFACTORY_H
diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoTransform.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoTransform.h
index 895727b3149..0f0e3d9b63c 100644
--- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoTransform.h
+++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptoTransform.h
@@ -15,8 +15,8 @@
 /*!
  * @file MockCryptoTransform.h
  */
-#ifndef _RTPS_SECURITY_MOCKCRYPTOTRANSFORM_H_
-#define _RTPS_SECURITY_MOCKCRYPTOTRANSFORM_H_
+#ifndef FASTDDS_RTPS_SECURITY__MOCKCRYPTOTRANSFORM_H
+#define FASTDDS_RTPS_SECURITY__MOCKCRYPTOTRANSFORM_H
 
 #include <gmock/gmock.h>
 
@@ -127,4 +127,4 @@ class MockCryptoTransform : public CryptoTransform
 } //namespace fastdds
 } //namespace eprosima
 
-#endif //_RTPS_SECURITY_MOCKCRYPTOTRANSFORM_H_
+#endif //FASTDDS_RTPS_SECURITY__MOCKCRYPTOTRANSFORM_H
diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptographyPlugin.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptographyPlugin.h
index f1f453d3bfe..ff5ca4b10c6 100644
--- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptographyPlugin.h
+++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockCryptographyPlugin.h
@@ -16,8 +16,8 @@
  * @file MockCryptographyPlugin.h
  */
 
-#ifndef _RTPS_SECURITY_MOCKCRYPTOGRAPHYPLUGIN_H_
-#define _RTPS_SECURITY_MOCKCRYPTOGRAPHYPLUGIN_H_
+#ifndef FASTDDS_RTPS_SECURITY__MOCKCRYPTOGRAPHYPLUGIN_H
+#define FASTDDS_RTPS_SECURITY__MOCKCRYPTOGRAPHYPLUGIN_H
 
 
 #include <rtps/security/cryptography/Cryptography.h>
@@ -59,4 +59,4 @@ class MockCryptographyPlugin : public Cryptography
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _RTPS_SECURITY_MOCKCRYPTOGRAPHYPLUGIN_H_
+#endif // FASTDDS_RTPS_SECURITY__MOCKCRYPTOGRAPHYPLUGIN_H
diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.h
index 00e5e08b80e..daad43eafd9 100644
--- a/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.h
+++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/SecurityPluginFactory.h
@@ -15,10 +15,10 @@
 /*!
  * @file SecurityPluginFactory.h
  */
-#ifndef _RTPS_SECURITY_SECURITYPLUGINFACTORY_H_
-#define _RTPS_SECURITY_SECURITYPLUGINFACTORY_H_
+#ifndef FASTDDS_RTPS_SECURITY__SECURITYPLUGINFACTORY_H
+#define FASTDDS_RTPS_SECURITY__SECURITYPLUGINFACTORY_H
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 #include <rtps/security/accesscontrol/AccessControl.h>
 #include <rtps/security/authentication/Authentication.h>
 #include <rtps/security/cryptography/Cryptography.h>
@@ -82,4 +82,4 @@ class SecurityPluginFactory : public ISecurityPluginFactory
 } //namespace fastdds
 } //namespace eprosima
 
-#endif // _RTPS_SECURITY_SECURITYPLUGINFACTORY_H_
+#endif // FASTDDS_RTPS_SECURITY__SECURITYPLUGINFACTORY_H
diff --git a/test/mock/rtps/ServerAttributes/fastdds/rtps/attributes/ServerAttributes.h b/test/mock/rtps/ServerAttributes/fastdds/rtps/attributes/ServerAttributes.hpp
similarity index 89%
rename from test/mock/rtps/ServerAttributes/fastdds/rtps/attributes/ServerAttributes.h
rename to test/mock/rtps/ServerAttributes/fastdds/rtps/attributes/ServerAttributes.hpp
index c2b2b1800a4..1de873728c1 100644
--- a/test/mock/rtps/ServerAttributes/fastdds/rtps/attributes/ServerAttributes.h
+++ b/test/mock/rtps/ServerAttributes/fastdds/rtps/attributes/ServerAttributes.hpp
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 /**
- * @file ServerAttributes.h
+ * @file ServerAttributes.hpp
  *
  */
 
-#ifndef _FASTDDS_SERVERATTRIBUTES_H_
-#define _FASTDDS_SERVERATTRIBUTES_H_
+#ifndef FASTDDS_RTPS_ATTRIBUTES__SERVERATTRIBUTES_HPP
+#define FASTDDS_RTPS_ATTRIBUTES__SERVERATTRIBUTES_HPP
 
 #include <list>
 
@@ -79,4 +79,4 @@ std::basic_ostream<charT>& operator <<(
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* _FASTDDS_SERVERATTRIBUTES_H_ */
+#endif // FASTDDS_RTPS_ATTRIBUTES__SERVERATTRIBUTES_HPP
diff --git a/test/mock/rtps/SharedMemSegment/utils/shared_memory/SharedMemSegment.hpp b/test/mock/rtps/SharedMemSegment/utils/shared_memory/SharedMemSegment.hpp
index 17bf8f4704c..80df1863900 100644
--- a/test/mock/rtps/SharedMemSegment/utils/shared_memory/SharedMemSegment.hpp
+++ b/test/mock/rtps/SharedMemSegment/utils/shared_memory/SharedMemSegment.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_SHAREDMEM_SEGMENT_H_
-#define _FASTDDS_SHAREDMEM_SEGMENT_H_
+#ifndef FASTDDS_UTILS_SHARED_MEMORY__SHAREDMEMSEGMENT_HPP
+#define FASTDDS_UTILS_SHARED_MEMORY__SHAREDMEMSEGMENT_HPP
 
 #include <boostconfig.hpp>
 
@@ -484,4 +484,4 @@ using SharedFileSegment = SharedSegment<
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_SHAREDMEM_SEGMENT_H_
+#endif // FASTDDS_UTILS_SHARED_MEMORY__SHAREDMEMSEGMENT_HPP
diff --git a/test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h b/test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp
similarity index 92%
rename from test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h
rename to test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp
index 828471ea89f..1d1d0d2b509 100644
--- a/test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h
+++ b/test/mock/rtps/SharedMemTransportDescriptor/fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp
@@ -12,8 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_SHAREDMEM_TRANSPORT_DESCRIPTOR_
-#define _FASTDDS_SHAREDMEM_TRANSPORT_DESCRIPTOR_
+/**
+ * @file SharedMemTransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT_SHARED_MEM__SHAREDMEMTRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT_SHARED_MEM__SHAREDMEMTRANSPORTDESCRIPTOR_HPP
 
 #include <cstdint>
 #include <string>
@@ -137,4 +142,4 @@ typedef struct SharedMemTransportDescriptor : public PortBasedTransportDescripto
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_SHAREDMEM_TRANSPORT_DESCRIPTOR_
+#endif // FASTDDS_RTPS_TRANSPORT_SHARED_MEM__SHAREDMEMTRANSPORTDESCRIPTOR_HPP
diff --git a/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp b/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp
index 7f0eea69813..d8e05b16530 100644
--- a/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp
+++ b/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp
@@ -16,13 +16,13 @@
  * @file StatefulReader.hpp
  */
 
-#ifndef RTPS_READER__STATEFULREADER_HPP
-#define RTPS_READER__STATEFULREADER_HPP
+#ifndef FASTDDS_RTPS_READER__STATEFULREADER_HPP
+#define FASTDDS_RTPS_READER__STATEFULREADER_HPP
 
 #include <vector>
 
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <rtps/reader/BaseReader.hpp>
 #include <fastdds/rtps/transport/NetworkBuffer.hpp>
 #include <rtps/resources/ResourceEvent.h>
@@ -126,4 +126,4 @@ class StatefulReader : public fastdds::rtps::BaseReader
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // RTPS_READER__STATEFULREADER_HPP
+#endif // FASTDDS_RTPS_READER__STATEFULREADER_HPP
diff --git a/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp b/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp
index 53adefdf6ba..97470152431 100644
--- a/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp
+++ b/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp
@@ -16,12 +16,12 @@
  * @file StatefulWriter.hpp
  */
 
-#ifndef RTPS_WRITER__STATEFULWRITER_HPP
-#define RTPS_WRITER__STATEFULWRITER_HPP
+#ifndef FASTDDS_RTPS_WRITER__STATEFULWRITER_HPP
+#define FASTDDS_RTPS_WRITER__STATEFULWRITER_HPP
 
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -129,4 +129,4 @@ class StatefulWriter : public RTPSWriter
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // RTPS_WRITER__STATEFULWRITER_HPP
+#endif // FASTDDS_RTPS_WRITER__STATEFULWRITER_HPP
diff --git a/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp b/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp
index a6de57a6065..2813965f4cf 100644
--- a/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp
+++ b/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp
@@ -16,8 +16,8 @@
  * @file StatelessReader.hpp
  */
 
-#ifndef RTPS_READER__STATELESSREADER_HPP
-#define RTPS_READER__STATELESSREADER_HPP
+#ifndef FASTDDS_RTPS_READER__STATELESSREADER_HPP
+#define FASTDDS_RTPS_READER__STATELESSREADER_HPP
 
 #include <rtps/reader/BaseReader.hpp>
 
@@ -55,4 +55,4 @@ class StatelessReader : public fastdds::rtps::BaseReader
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // RTPS_READER__STATELESSREADER_HPP
+#endif // FASTDDS_RTPS_READER__STATELESSREADER_HPP
diff --git a/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp b/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp
index a243a2cd9a3..08a3d1c9d00 100644
--- a/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp
+++ b/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp
@@ -16,10 +16,10 @@
  * @file StatelessWriter.hpp
  */
 
-#ifndef RTPS_WRITER__STATELESSWRITER_HPP
-#define RTPS_WRITER__STATELESSWRITER_HPP
+#ifndef FASTDDS_RTPS_WRITER__STATELESSWRITER_HPP
+#define FASTDDS_RTPS_WRITER__STATELESSWRITER_HPP
 
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/mock/rtps/TCPTransportDescriptor/fastdds/rtps/transport/TCPTransportDescriptor.h b/test/mock/rtps/TCPTransportDescriptor/fastdds/rtps/transport/TCPTransportDescriptor.hpp
similarity index 95%
rename from test/mock/rtps/TCPTransportDescriptor/fastdds/rtps/transport/TCPTransportDescriptor.h
rename to test/mock/rtps/TCPTransportDescriptor/fastdds/rtps/transport/TCPTransportDescriptor.hpp
index eec718b334c..204c008ac42 100644
--- a/test/mock/rtps/TCPTransportDescriptor/fastdds/rtps/transport/TCPTransportDescriptor.h
+++ b/test/mock/rtps/TCPTransportDescriptor/fastdds/rtps/transport/TCPTransportDescriptor.hpp
@@ -12,10 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_TCP_TRANSPORT_DESCRIPTOR_H_
-#define _FASTDDS_TCP_TRANSPORT_DESCRIPTOR_H_
+/**
+ * @file TCPTransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__TCPTRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__TCPTRANSPORTDESCRIPTOR_HPP
 
-#include <fastdds/rtps/transport/SocketTransportDescriptor.h>
+#include <fastdds/rtps/transport/SocketTransportDescriptor.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -210,4 +215,4 @@ struct TCPTransportDescriptor : public SocketTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TCP_TRANSPORT_DESCRIPTOR_H_
+#endif // FASTDDS_RTPS_TRANSPORT__TCPTRANSPORTDESCRIPTOR_HPP
diff --git a/test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.h b/test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.hpp
similarity index 86%
rename from test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.h
rename to test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.hpp
index 6b4efa4bf71..9e89046956b 100644
--- a/test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.h
+++ b/test/mock/rtps/TCPv4TransportDescriptor/fastdds/rtps/transport/TCPv4TransportDescriptor.hpp
@@ -12,11 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_TCPV4_TRANSPORT_DESCRIPTOR_
-#define _FASTDDS_TCPV4_TRANSPORT_DESCRIPTOR_
+/**
+ * @file TCPv4TransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__TCPV4TRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__TCPV4TRANSPORTDESCRIPTOR_HPP
 
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/transport/TCPTransportDescriptor.h>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/transport/TCPTransportDescriptor.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -83,4 +88,4 @@ typedef struct TCPv4TransportDescriptor : public TCPTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TCPV4_TRANSPORT_DESCRIPTOR_
+#endif // FASTDDS_RTPS_TRANSPORT__TCPV4TRANSPORTDESCRIPTOR_HPP
diff --git a/test/mock/rtps/TCPv6TransportDescriptor/fastdds/rtps/transport/TCPv6TransportDescriptor.h b/test/mock/rtps/TCPv6TransportDescriptor/fastdds/rtps/transport/TCPv6TransportDescriptor.hpp
similarity index 83%
rename from test/mock/rtps/TCPv6TransportDescriptor/fastdds/rtps/transport/TCPv6TransportDescriptor.h
rename to test/mock/rtps/TCPv6TransportDescriptor/fastdds/rtps/transport/TCPv6TransportDescriptor.hpp
index dc9d8820bf0..87e4f4dad1b 100644
--- a/test/mock/rtps/TCPv6TransportDescriptor/fastdds/rtps/transport/TCPv6TransportDescriptor.h
+++ b/test/mock/rtps/TCPv6TransportDescriptor/fastdds/rtps/transport/TCPv6TransportDescriptor.hpp
@@ -12,10 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_TCPV6_TRANSPORT_DESCRIPTOR_
-#define _FASTDDS_TCPV6_TRANSPORT_DESCRIPTOR_
+/**
+ * @file TCPv6TransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__TCPV6TRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__TCPV6TRANSPORTDESCRIPTOR_HPP
 
-#include <fastdds/rtps/transport/TCPTransportDescriptor.h>
+#include <fastdds/rtps/transport/TCPTransportDescriptor.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -62,4 +67,4 @@ struct TCPv6TransportDescriptor : public TCPTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_TCPV6_TRANSPORT_DESCRIPTOR_
+#endif // FASTDDS_RTPS_TRANSPORT__TCPV6TRANSPORTDESCRIPTOR_HPP
diff --git a/test/mock/rtps/TimedEvent/rtps/resources/TimedEvent.h b/test/mock/rtps/TimedEvent/rtps/resources/TimedEvent.h
index 1f0521938a6..ad16c148984 100644
--- a/test/mock/rtps/TimedEvent/rtps/resources/TimedEvent.h
+++ b/test/mock/rtps/TimedEvent/rtps/resources/TimedEvent.h
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_RTPS_RESOURCES_TIMEDEVENT_H_
-#define _FASTDDS_RTPS_RESOURCES_TIMEDEVENT_H_
+#ifndef FASTDDS_RTPS_RESOURCES__TIMEDEVENT_H
+#define FASTDDS_RTPS_RESOURCES__TIMEDEVENT_H
 
 #include <chrono>
 
 #include <gmock/gmock.h>
 
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -52,5 +52,5 @@ class TimedEvent
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_RESOURCES_TIMEDEVENT_H_
+#endif // FASTDDS_RTPS_RESOURCES__TIMEDEVENT_H
 
diff --git a/test/mock/rtps/TopicPayloadPoolProxy/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp b/test/mock/rtps/TopicPayloadPoolProxy/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp
index c8fa7b5efe0..622da5d437e 100644
--- a/test/mock/rtps/TopicPayloadPoolProxy/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp
+++ b/test/mock/rtps/TopicPayloadPoolProxy/rtps/history/TopicPayloadPoolRegistry_impl/TopicPayloadPoolProxy.hpp
@@ -16,8 +16,8 @@
  * @file TopicPayloadPoolProxy.hpp
  */
 
-#ifndef RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL_TOPICPAYLOADPOOLPROXY_HPP
-#define RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL_TOPICPAYLOADPOOLPROXY_HPP
+#ifndef FASTDDS_RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL__TOPICPAYLOADPOOLPROXY_HPP
+#define FASTDDS_RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL__TOPICPAYLOADPOOLPROXY_HPP
 
 #include <rtps/history/TopicPayloadPool.hpp>
 
@@ -142,4 +142,4 @@ class TopicPayloadPoolProxy : public ITopicPayloadPool
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif  // RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL_TOPICPAYLOADPOOLPROXY_HPP
+#endif  // FASTDDS_RTPS_HISTORY_TOPICPAYLOADPOOLREGISTRY_IMPL__TOPICPAYLOADPOOLPROXY_HPP
diff --git a/test/mock/rtps/TypeLookupManager/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp b/test/mock/rtps/TypeLookupManager/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp
index 6091979fbb5..1ebacf1af87 100644
--- a/test/mock/rtps/TypeLookupManager/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp
+++ b/test/mock/rtps/TypeLookupManager/fastdds/builtin/type_lookup_service/TypeLookupManager.hpp
@@ -12,9 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+/**
+ * @file TypeLookupManager.hpp
+ *
+ */
 
-#ifndef _FASTDDS_TYPELOOKUP_SERVICE_MANAGER_HPP
-#define _FASTDDS_TYPELOOKUP_SERVICE_MANAGER_HPP
+#ifndef FASTDDS_FASTDDS_BUILTIN_TYPE_LOOKUP_SERVICE__TYPELOOKUPMANAGER_HPP
+#define FASTDDS_FASTDDS_BUILTIN_TYPE_LOOKUP_SERVICE__TYPELOOKUPMANAGER_HPP
 
 #include <vector>
 
@@ -78,8 +82,8 @@ class TypeLookupManager
 
 };
 
-} /* namespace builtin */
-} /* namespace dds */
-} /* namespace fastdds */
-} /* namespace eprosima */
-#endif /* _FASTDDS_TYPELOOKUP_SERVICE_MANAGER_HPP */
+} // namespace builtin
+} // namespace dds
+} // namespace fastdds
+} // namespace eprosima
+#endif // FASTDDS_FASTDDS_BUILTIN_TYPE_LOOKUP_SERVICE__TYPELOOKUPMANAGER_HPP
diff --git a/test/mock/rtps/UDPTransportDescriptor/fastdds/rtps/transport/UDPTransportDescriptor.h b/test/mock/rtps/UDPTransportDescriptor/fastdds/rtps/transport/UDPTransportDescriptor.hpp
similarity index 85%
rename from test/mock/rtps/UDPTransportDescriptor/fastdds/rtps/transport/UDPTransportDescriptor.h
rename to test/mock/rtps/UDPTransportDescriptor/fastdds/rtps/transport/UDPTransportDescriptor.hpp
index 243cf2364f2..e6bddcb49d5 100644
--- a/test/mock/rtps/UDPTransportDescriptor/fastdds/rtps/transport/UDPTransportDescriptor.h
+++ b/test/mock/rtps/UDPTransportDescriptor/fastdds/rtps/transport/UDPTransportDescriptor.hpp
@@ -12,10 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_UDP_TRANSPORT_DESCRIPTOR_
-#define _FASTDDS_UDP_TRANSPORT_DESCRIPTOR_
+/**
+ * @file UDPTransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__UDPTRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__UDPTRANSPORTDESCRIPTOR_HPP
 
-#include <fastdds/rtps/transport/SocketTransportDescriptor.h>
+#include <fastdds/rtps/transport/SocketTransportDescriptor.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -66,4 +71,4 @@ typedef struct UDPTransportDescriptor : public SocketTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_UDP_TRANSPORT_DESCRIPTOR_
+#endif // FASTDDS_RTPS_TRANSPORT__UDPTRANSPORTDESCRIPTOR_HPP
diff --git a/test/mock/rtps/UDPv4TransportDescriptor/fastdds/rtps/transport/UDPv4TransportDescriptor.h b/test/mock/rtps/UDPv4TransportDescriptor/fastdds/rtps/transport/UDPv4TransportDescriptor.hpp
similarity index 83%
rename from test/mock/rtps/UDPv4TransportDescriptor/fastdds/rtps/transport/UDPv4TransportDescriptor.h
rename to test/mock/rtps/UDPv4TransportDescriptor/fastdds/rtps/transport/UDPv4TransportDescriptor.hpp
index bff26ea53e3..84cc16ddf49 100644
--- a/test/mock/rtps/UDPv4TransportDescriptor/fastdds/rtps/transport/UDPv4TransportDescriptor.h
+++ b/test/mock/rtps/UDPv4TransportDescriptor/fastdds/rtps/transport/UDPv4TransportDescriptor.hpp
@@ -12,10 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_UDPV4_TRANSPORT_DESCRIPTOR
-#define _FASTDDS_UDPV4_TRANSPORT_DESCRIPTOR
+/**
+ * @file UDPv4TransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__UDPV4TRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__UDPV4TRANSPORTDESCRIPTOR_HPP
 
-#include <fastdds/rtps/transport/UDPTransportDescriptor.h>
+#include <fastdds/rtps/transport/UDPTransportDescriptor.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -58,4 +63,4 @@ typedef struct UDPv4TransportDescriptor : public UDPTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_UDPV4_TRANSPORT_DESCRIPTOR
+#endif // FASTDDS_RTPS_TRANSPORT__UDPV4TRANSPORTDESCRIPTOR_HPP
diff --git a/test/mock/rtps/UDPv6TransportDescriptor/fastdds/rtps/transport/UDPv6TransportDescriptor.h b/test/mock/rtps/UDPv6TransportDescriptor/fastdds/rtps/transport/UDPv6TransportDescriptor.hpp
similarity index 83%
rename from test/mock/rtps/UDPv6TransportDescriptor/fastdds/rtps/transport/UDPv6TransportDescriptor.h
rename to test/mock/rtps/UDPv6TransportDescriptor/fastdds/rtps/transport/UDPv6TransportDescriptor.hpp
index d774685e5e0..563d25eae0d 100644
--- a/test/mock/rtps/UDPv6TransportDescriptor/fastdds/rtps/transport/UDPv6TransportDescriptor.h
+++ b/test/mock/rtps/UDPv6TransportDescriptor/fastdds/rtps/transport/UDPv6TransportDescriptor.hpp
@@ -12,10 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_UDPV6_TRANSPORT_DESCRIPTOR_
-#define _FASTDDS_UDPV6_TRANSPORT_DESCRIPTOR_
+/**
+ * @file UDPv6TransportDescriptor.hpp
+ *
+ */
+
+#ifndef FASTDDS_RTPS_TRANSPORT__UDPV6TRANSPORTDESCRIPTOR_HPP
+#define FASTDDS_RTPS_TRANSPORT__UDPV6TRANSPORTDESCRIPTOR_HPP
 
-#include <fastdds/rtps/transport/UDPTransportDescriptor.h>
+#include <fastdds/rtps/transport/UDPTransportDescriptor.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -58,4 +63,4 @@ typedef struct UDPv6TransportDescriptor : public UDPTransportDescriptor
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_UDPV6_TRANSPORT_DESCRIPTOR_
+#endif // FASTDDS_RTPS_TRANSPORT__UDPV6TRANSPORTDESCRIPTOR_HPP
diff --git a/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp b/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp
index b4425f4ad8d..992b3b5059c 100644
--- a/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp
+++ b/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef _FASTDDS_RTPS_WLP_HPP_
-#define _FASTDDS_RTPS_WLP_HPP_
+#ifndef FASTDDS_RTPS_BUILTIN_LIVELINESS__WLP_HPP
+#define FASTDDS_RTPS_BUILTIN_LIVELINESS__WLP_HPP
 
 #include <mutex>
 #include <vector>
@@ -26,7 +26,7 @@
 #include <gmock/gmock.h>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -70,4 +70,4 @@ class WLP
 } /* namespace fastdds */
 } /* namespace eprosima */
 
-#endif /* _FASTDDS_RTPS_WLP_HPP_ */
+#endif /* FASTDDS_RTPS_BUILTIN_LIVELINESS__WLP_HPP */
diff --git a/test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.h b/test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.hpp
similarity index 94%
rename from test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.h
rename to test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.hpp
index c78e55e3ff3..99ac2e726ab 100644
--- a/test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.h
+++ b/test/mock/rtps/WriterHistory/fastdds/rtps/history/WriterHistory.hpp
@@ -13,19 +13,19 @@
 // limitations under the License.
 
 /**
- * @file WriterHistory.h
+ * @file WriterHistory.hpp
  */
 
-#ifndef _FASTDDS_RTPS_WRITERHISTORY_H_
-#define _FASTDDS_RTPS_WRITERHISTORY_H_
+#ifndef FASTDDS_RTPS_HISTORY__WRITERHISTORY_HPP
+#define FASTDDS_RTPS_HISTORY__WRITERHISTORY_HPP
 
 #include <condition_variable>
 
 #include <gmock/gmock.h>
 
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 
 namespace eprosima {
@@ -218,4 +218,4 @@ class WriterHistory
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_WRITERHISTORY_H_
+#endif // FASTDDS_RTPS_HISTORY__WRITERHISTORY_HPP
diff --git a/test/mock/rtps/WriterProxyData/fastdds/rtps/builtin/data/WriterProxyData.h b/test/mock/rtps/WriterProxyData/fastdds/rtps/builtin/data/WriterProxyData.hpp
similarity index 95%
rename from test/mock/rtps/WriterProxyData/fastdds/rtps/builtin/data/WriterProxyData.h
rename to test/mock/rtps/WriterProxyData/fastdds/rtps/builtin/data/WriterProxyData.hpp
index 878c68f9161..97e5ac2eafc 100644
--- a/test/mock/rtps/WriterProxyData/fastdds/rtps/builtin/data/WriterProxyData.h
+++ b/test/mock/rtps/WriterProxyData/fastdds/rtps/builtin/data/WriterProxyData.hpp
@@ -13,23 +13,23 @@
 // limitations under the License.
 
 /**
- * @file WriterProxyData.h
+ * @file WriterProxyData.hpp
  */
 
-#ifndef _FASTDDS_RTPS_BUILTIN_DATA_WRITERPROXYDATA_H_
-#define _FASTDDS_RTPS_BUILTIN_DATA_WRITERPROXYDATA_H_
+#ifndef FASTDDS_RTPS_BUILTIN_DATA__WRITERPROXYDATA_HPP
+#define FASTDDS_RTPS_BUILTIN_DATA__WRITERPROXYDATA_HPP
 
 #include <gmock/gmock.h>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/RemoteLocators.hpp>
 
 #if HAVE_SECURITY
-#include <fastdds/rtps/attributes/EndpointSecurityAttributes.h>
+#include <fastdds/rtps/attributes/EndpointSecurityAttributes.hpp>
 #endif // if HAVE_SECURITY
 
 namespace eprosima {
@@ -327,5 +327,5 @@ class WriterProxyData
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_BUILTIN_DATA_WRITERPROXYDATA_H_
+#endif // FASTDDS_RTPS_BUILTIN_DATA__WRITERPROXYDATA_HPP
 
diff --git a/test/mock/rtps/XMLEndPointParser/xmlparser/XMLEndpointParser.h b/test/mock/rtps/XMLEndPointParser/xmlparser/XMLEndpointParser.h
index 038d54336aa..476997a7c3d 100644
--- a/test/mock/rtps/XMLEndPointParser/xmlparser/XMLEndpointParser.h
+++ b/test/mock/rtps/XMLEndPointParser/xmlparser/XMLEndpointParser.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef XMLENDPOINTPARSER_H_
-#define XMLENDPOINTPARSER_H_
+#ifndef FASTDDS_XMLPARSER__XMLENDPOINTPARSER_H
+#define FASTDDS_XMLPARSER__XMLENDPOINTPARSER_H
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <xmlparser/XMLParserCommon.h>
@@ -59,9 +59,9 @@ class XMLEndpointParser
 };
 
 
-} /* xmlparser */
-} /* namespace */
-} /* namespace eprosima */
+} // namespace xmlparser
+} // namespace fastdds
+} // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* XMLENDPOINTPARSER_H_ */
+#endif // FASTDDS_XMLPARSER__XMLENDPOINTPARSER_H
diff --git a/test/mock/rtps/XMLProfileManager/xmlparser/XMLProfileManager.h b/test/mock/rtps/XMLProfileManager/xmlparser/XMLProfileManager.h
index 9f22c7c4565..3298dd7347c 100644
--- a/test/mock/rtps/XMLProfileManager/xmlparser/XMLProfileManager.h
+++ b/test/mock/rtps/XMLProfileManager/xmlparser/XMLProfileManager.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#ifndef XML_PROFILE_MANAGER_H_
-#define XML_PROFILE_MANAGER_H_
+#ifndef FASTDDS_XMLPARSER__XMLPROFILEMANAGER_H
+#define FASTDDS_XMLPARSER__XMLPROFILEMANAGER_H
 
 #include <xmlparser/XMLParser.h>
 
@@ -37,4 +37,4 @@ class XMLProfileManager
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // XML_PROFILE_MANAGER_H_
+#endif // FASTDDS_XMLPARSER__XMLPROFILEMANAGER_H
diff --git a/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp b/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp
index 50808ba197d..87015354927 100644
--- a/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp
+++ b/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp
@@ -16,13 +16,13 @@
  * @file external_locators.hpp
  */
 
-#ifndef _RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP_
-#define _RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP_
+#ifndef FASTDDS_RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP
+#define FASTDDS_RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP
 
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 
@@ -130,4 +130,4 @@ void filter_remote_locators(
 } // namespace fastdds
 } // namespace eprosima
 
-#endif  // _RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP_
+#endif  // FASTDDS_RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP
diff --git a/test/performance/latency/LatencyTestPublisher.cpp b/test/performance/latency/LatencyTestPublisher.cpp
index b203fddea57..3fa0212b8f6 100644
--- a/test/performance/latency/LatencyTestPublisher.cpp
+++ b/test/performance/latency/LatencyTestPublisher.cpp
@@ -38,8 +38,8 @@
 #include <fastdds/dds/xtypes/dynamic_types/MemberDescriptor.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/TypeDescriptor.hpp>
 #include <fastdds/dds/subscriber/DataReader.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
 #define TIME_LIMIT_US 10000
 
diff --git a/test/performance/latency/LatencyTestSubscriber.cpp b/test/performance/latency/LatencyTestSubscriber.cpp
index 00e6029af26..1a0723206a5 100644
--- a/test/performance/latency/LatencyTestSubscriber.cpp
+++ b/test/performance/latency/LatencyTestSubscriber.cpp
@@ -33,9 +33,9 @@
 #include <fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/MemberDescriptor.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/TypeDescriptor.hpp>
-#include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/test/performance/latency/LatencyTestTypes.hpp b/test/performance/latency/LatencyTestTypes.hpp
index ca19a1d73a6..7c5e78aaa5b 100644
--- a/test/performance/latency/LatencyTestTypes.hpp
+++ b/test/performance/latency/LatencyTestTypes.hpp
@@ -26,8 +26,8 @@
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 
 #define MAX_TYPE_SIZE 10 * 1024 * 1024
 
diff --git a/test/performance/throughput/ThroughputPublisher.cpp b/test/performance/throughput/ThroughputPublisher.cpp
index 1df23413e6a..5f042ece964 100644
--- a/test/performance/throughput/ThroughputPublisher.cpp
+++ b/test/performance/throughput/ThroughputPublisher.cpp
@@ -37,8 +37,8 @@
 #include <fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/MemberDescriptor.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/TypeDescriptor.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/test/performance/throughput/ThroughputPublisher.hpp b/test/performance/throughput/ThroughputPublisher.hpp
index 7765de70c60..a73b780e39b 100644
--- a/test/performance/throughput/ThroughputPublisher.hpp
+++ b/test/performance/throughput/ThroughputPublisher.hpp
@@ -36,7 +36,7 @@
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 
 #include "../optionarg.hpp"
 #include "ThroughputTypes.hpp"
diff --git a/test/performance/throughput/ThroughputSubscriber.cpp b/test/performance/throughput/ThroughputSubscriber.cpp
index 6ef64f4fabe..6648c643b5a 100644
--- a/test/performance/throughput/ThroughputSubscriber.cpp
+++ b/test/performance/throughput/ThroughputSubscriber.cpp
@@ -35,8 +35,8 @@
 #include <fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/MemberDescriptor.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/TypeDescriptor.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/test/performance/throughput/ThroughputSubscriber.hpp b/test/performance/throughput/ThroughputSubscriber.hpp
index 48e89ca20ae..d30cf15e309 100644
--- a/test/performance/throughput/ThroughputSubscriber.hpp
+++ b/test/performance/throughput/ThroughputSubscriber.hpp
@@ -33,7 +33,7 @@
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 #include "ThroughputTypes.hpp"
 
 #include "../optionarg.hpp"
diff --git a/test/performance/video/VideoTestTypes.hpp b/test/performance/video/VideoTestTypes.hpp
index 68b212700d0..e98bd7ae9dd 100644
--- a/test/performance/video/VideoTestTypes.hpp
+++ b/test/performance/video/VideoTestTypes.hpp
@@ -38,11 +38,11 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 
-#include <fastdds/utils/IPFinder.h>
+#include <fastdds/utils/IPFinder.hpp>
 
 
 
diff --git a/test/profiling/allocations/AllocTestPublisher.cpp b/test/profiling/allocations/AllocTestPublisher.cpp
index 336cd211098..d28555e19e1 100644
--- a/test/profiling/allocations/AllocTestPublisher.cpp
+++ b/test/profiling/allocations/AllocTestPublisher.cpp
@@ -29,7 +29,7 @@
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
 
 #include "AllocTestCommon.h"
-#include "AllocTestTypePubSubTypes.h"
+#include "AllocTestTypePubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
 
diff --git a/test/profiling/allocations/AllocTestSubscriber.cpp b/test/profiling/allocations/AllocTestSubscriber.cpp
index 98a6816f35f..f9ef35cd877 100644
--- a/test/profiling/allocations/AllocTestSubscriber.cpp
+++ b/test/profiling/allocations/AllocTestSubscriber.cpp
@@ -35,7 +35,7 @@
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
 
 #include "AllocTestCommon.h"
-#include "AllocTestTypePubSubTypes.h"
+#include "AllocTestTypePubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
 
diff --git a/test/profiling/allocations/AllocTestType.hpp b/test/profiling/allocations/AllocTestType.hpp
index 46894facdf9..d38851818ac 100644
--- a/test/profiling/allocations/AllocTestType.hpp
+++ b/test/profiling/allocations/AllocTestType.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ALLOCTESTTYPE_HPP_
-#define _FAST_DDS_GENERATED_ALLOCTESTTYPE_HPP_
+#ifndef FAST_DDS_GENERATED__ALLOCTESTTYPE_HPP
+#define FAST_DDS_GENERATED__ALLOCTESTTYPE_HPP
 
 #include <cstdint>
 #include <utility>
diff --git a/test/profiling/allocations/AllocTestTypeCdrAux.hpp b/test/profiling/allocations/AllocTestTypeCdrAux.hpp
index aac0de264cf..42ae5d1dac5 100644
--- a/test/profiling/allocations/AllocTestTypeCdrAux.hpp
+++ b/test/profiling/allocations/AllocTestTypeCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ALLOCTESTTYPECDRAUX_HPP_
-#define _FAST_DDS_GENERATED_ALLOCTESTTYPECDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__ALLOCTESTTYPECDRAUX_HPP
+#define FAST_DDS_GENERATED__ALLOCTESTTYPECDRAUX_HPP
 
 #include "AllocTestType.hpp"
 
@@ -42,5 +42,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_ALLOCTESTTYPECDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__ALLOCTESTTYPECDRAUX_HPP
 
diff --git a/test/profiling/allocations/AllocTestTypeCdrAux.ipp b/test/profiling/allocations/AllocTestTypeCdrAux.ipp
index 81f40a1acdd..2489b451463 100644
--- a/test/profiling/allocations/AllocTestTypeCdrAux.ipp
+++ b/test/profiling/allocations/AllocTestTypeCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ALLOCTESTTYPECDRAUX_IPP_
-#define _FAST_DDS_GENERATED_ALLOCTESTTYPECDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__ALLOCTESTTYPECDRAUX_IPP
+#define FAST_DDS_GENERATED__ALLOCTESTTYPECDRAUX_IPP
 
 #include "AllocTestTypeCdrAux.hpp"
 
@@ -114,5 +114,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_ALLOCTESTTYPECDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__ALLOCTESTTYPECDRAUX_IPP
 
diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.cxx b/test/profiling/allocations/AllocTestTypePubSubTypes.cxx
index bdcd051e584..6d98c6d2bf2 100644
--- a/test/profiling/allocations/AllocTestTypePubSubTypes.cxx
+++ b/test/profiling/allocations/AllocTestTypePubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "AllocTestTypePubSubTypes.h"
+#include "AllocTestTypePubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/profiling/allocations/AllocTestTypePubSubTypes.h b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp
similarity index 89%
rename from test/profiling/allocations/AllocTestTypePubSubTypes.h
rename to test/profiling/allocations/AllocTestTypePubSubTypes.hpp
index 32b20c360d8..ffc3e93d584 100644
--- a/test/profiling/allocations/AllocTestTypePubSubTypes.h
+++ b/test/profiling/allocations/AllocTestTypePubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file AllocTestTypePubSubTypes.h
+ * @file AllocTestTypePubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_ALLOCTESTTYPE_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_ALLOCTESTTYPE_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__ALLOCTESTTYPE_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__ALLOCTESTTYPE_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "AllocTestType.hpp"
 
@@ -106,7 +106,7 @@ class AllocTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,10 +124,10 @@ class AllocTestTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_ALLOCTESTTYPE_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__ALLOCTESTTYPE_PUBSUBTYPES_HPP
 
diff --git a/test/profiling/allocations/AllocTestTypeTypeObjectSupport.hpp b/test/profiling/allocations/AllocTestTypeTypeObjectSupport.hpp
index 67bef3f528e..940057dc9ae 100644
--- a/test/profiling/allocations/AllocTestTypeTypeObjectSupport.hpp
+++ b/test/profiling/allocations/AllocTestTypeTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_ALLOCTESTTYPE_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_ALLOCTESTTYPE_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__ALLOCTESTTYPE_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__ALLOCTESTTYPE_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -53,4 +53,4 @@ eProsima_user_DllExport void register_AllocTestType_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_ALLOCTESTTYPE_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__ALLOCTESTTYPE_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/realtime/UserThreadNonBlockedTest.cpp b/test/realtime/UserThreadNonBlockedTest.cpp
index 0bc76969d6a..7e564e13c77 100644
--- a/test/realtime/UserThreadNonBlockedTest.cpp
+++ b/test/realtime/UserThreadNonBlockedTest.cpp
@@ -17,7 +17,7 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/LibrarySettings.hpp>
 #include <fastdds/rtps/flowcontrol/FlowControllerDescriptor.hpp>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
 #include "mutex_testing_tool/TMutex.hpp"
 #include <TimeConversion.hpp>
diff --git a/test/unittest/common/CustomPayloadPool.hpp b/test/unittest/common/CustomPayloadPool.hpp
index 40f51dab660..713c3dd8965 100644
--- a/test/unittest/common/CustomPayloadPool.hpp
+++ b/test/unittest/common/CustomPayloadPool.hpp
@@ -24,8 +24,8 @@
 #include <cstdio>
 #include <cstring>
 
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 
 class CustomPayloadPool : public eprosima::fastdds::rtps::IPayloadPool
 {
diff --git a/test/unittest/common/operators.hpp b/test/unittest/common/operators.hpp
index 831531e1d4d..73ed08ba580 100644
--- a/test/unittest/common/operators.hpp
+++ b/test/unittest/common/operators.hpp
@@ -15,7 +15,7 @@
 #include <algorithm>
 #include <cstdint>
 
-#include <fastdds/rtps/common/SequenceNumber.h>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/unittest/dds/core/condition/ConditionTests.cpp b/test/unittest/dds/core/condition/ConditionTests.cpp
index 387cd9172cc..d975f6dc706 100644
--- a/test/unittest/dds/core/condition/ConditionTests.cpp
+++ b/test/unittest/dds/core/condition/ConditionTests.cpp
@@ -24,7 +24,7 @@
 #include <fastdds/dds/core/Entity.hpp>
 #include <fastdds/dds/core/ReturnCode.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 #include "../../../logging/mock/MockConsumer.h"
 
diff --git a/test/unittest/dds/core/entity/EntityTests.cpp b/test/unittest/dds/core/entity/EntityTests.cpp
index ffe24fba0d6..2688091fca0 100644
--- a/test/unittest/dds/core/entity/EntityTests.cpp
+++ b/test/unittest/dds/core/entity/EntityTests.cpp
@@ -21,7 +21,7 @@
 #include <fastdds/dds/core/condition/StatusCondition.hpp>
 #include <fastdds/dds/core/condition/WaitSet.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 #include "../../../logging/mock/MockConsumer.h"
 #include "mock/MockEntity.hpp"
diff --git a/test/unittest/dds/participant/ParticipantTests.cpp b/test/unittest/dds/participant/ParticipantTests.cpp
index 4baa812e860..0f3cd586f17 100644
--- a/test/unittest/dds/participant/ParticipantTests.cpp
+++ b/test/unittest/dds/participant/ParticipantTests.cpp
@@ -51,16 +51,16 @@
 #include <fastdds/dds/xtypes/dynamic_types/MemberDescriptor.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/TypeDescriptor.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
-#include <fastdds/rtps/attributes/ServerAttributes.h>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/attributes/ServerAttributes.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <fastdds/domain/DomainParticipantImpl.hpp>
 #include <utils/SystemInfo.hpp>
diff --git a/test/unittest/dds/publisher/PublisherTests.cpp b/test/unittest/dds/publisher/PublisherTests.cpp
index e6a594c6f0f..8b857c02531 100644
--- a/test/unittest/dds/publisher/PublisherTests.cpp
+++ b/test/unittest/dds/publisher/PublisherTests.cpp
@@ -25,7 +25,7 @@
 #include <fastdds/dds/publisher/PublisherListener.hpp>
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/publisher/qos/PublisherQos.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/unittest/dds/status/ListenerTests.cpp b/test/unittest/dds/status/ListenerTests.cpp
index 3d4d498824b..4385bd39f3d 100644
--- a/test/unittest/dds/status/ListenerTests.cpp
+++ b/test/unittest/dds/status/ListenerTests.cpp
@@ -31,10 +31,10 @@
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TopicListener.hpp>
 
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
 
 
 using ::testing::StrictMock;
diff --git a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
index 29522bef42e..73924c24ec1 100644
--- a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
+++ b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
@@ -1,5 +1,5 @@
 #include <fastdds/subscriber/history/DataReaderHistory.hpp>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
diff --git a/test/unittest/dds/subscriber/DataReaderTests.cpp b/test/unittest/dds/subscriber/DataReaderTests.cpp
index 5ee0c5cca9d..4867f7fb189 100644
--- a/test/unittest/dds/subscriber/DataReaderTests.cpp
+++ b/test/unittest/dds/subscriber/DataReaderTests.cpp
@@ -54,9 +54,9 @@
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include "../../common/CustomPayloadPool.hpp"
 #include "../../logging/mock/MockConsumer.h"
diff --git a/test/unittest/dds/subscriber/SubscriberTests.cpp b/test/unittest/dds/subscriber/SubscriberTests.cpp
index b44cd7e88fe..15c45cf5fa4 100644
--- a/test/unittest/dds/subscriber/SubscriberTests.cpp
+++ b/test/unittest/dds/subscriber/SubscriberTests.cpp
@@ -27,8 +27,8 @@
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 #include <fastdds/dds/subscriber/SubscriberListener.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp b/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp
index f7dfc5fdd1f..a9ea31a13cc 100644
--- a/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp
+++ b/test/unittest/dds/topic/DDSSQLFilter/DDSSQLFilterTests.cpp
@@ -30,7 +30,7 @@
 #include "fastdds/dds/log/Log.hpp"
 
 #include "data_types/ContentFilterTestType.hpp"
-#include "data_types/ContentFilterTestTypePubSubTypes.h"
+#include "data_types/ContentFilterTestTypePubSubTypes.hpp"
 #include "data_types/ContentFilterTestTypeTypeObjectSupport.hpp"
 
 namespace eprosima {
diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestType.hpp b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestType.hpp
index 17de12509ff..4c3ee39d389 100644
--- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestType.hpp
+++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestType.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPE_HPP_
-#define _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPE_HPP_
+#ifndef FAST_DDS_GENERATED__CONTENTFILTERTESTTYPE_HPP
+#define FAST_DDS_GENERATED__CONTENTFILTERTESTTYPE_HPP
 
 #include <array>
 #include <cstdint>
diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.hpp b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.hpp
index c0276205e62..fac8f0bf499 100644
--- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.hpp
+++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPECDRAUX_HPP_
-#define _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPECDRAUX_HPP_
+#ifndef FAST_DDS_GENERATED__CONTENTFILTERTESTTYPECDRAUX_HPP
+#define FAST_DDS_GENERATED__CONTENTFILTERTESTTYPECDRAUX_HPP
 
 #include "ContentFilterTestType.hpp"
 
@@ -53,5 +53,5 @@ eProsima_user_DllExport void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPECDRAUX_HPP_
+#endif // FAST_DDS_GENERATED__CONTENTFILTERTESTTYPECDRAUX_HPP
 
diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.ipp b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.ipp
index 22665d4a663..6de4bb21040 100644
--- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.ipp
+++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeCdrAux.ipp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPECDRAUX_IPP_
-#define _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPECDRAUX_IPP_
+#ifndef FAST_DDS_GENERATED__CONTENTFILTERTESTTYPECDRAUX_IPP
+#define FAST_DDS_GENERATED__CONTENTFILTERTESTTYPECDRAUX_IPP
 
 #include "ContentFilterTestTypeCdrAux.hpp"
 
@@ -808,5 +808,5 @@ void serialize_key(
 } // namespace fastcdr
 } // namespace eprosima
 
-#endif // _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPECDRAUX_IPP_
+#endif // FAST_DDS_GENERATED__CONTENTFILTERTESTTYPECDRAUX_IPP
 
diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx
index 42d575cb6de..a44e2598272 100644
--- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx
+++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.cxx
@@ -19,7 +19,7 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#include "ContentFilterTestTypePubSubTypes.h"
+#include "ContentFilterTestTypePubSubTypes.hpp"
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.h b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp
similarity index 91%
rename from test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.h
rename to test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp
index 4bbb650ed02..ef6451890ec 100644
--- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.h
+++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypePubSubTypes.hpp
@@ -13,21 +13,21 @@
 // limitations under the License.
 
 /*!
- * @file ContentFilterTestTypePubSubTypes.h
+ * @file ContentFilterTestTypePubSubTypes.hpp
  * This header file contains the declaration of the serialization functions.
  *
  * This file was generated by the tool fastddsgen.
  */
 
 
-#ifndef _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPE_PUBSUBTYPES_H_
-#define _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPE_PUBSUBTYPES_H_
+#ifndef FAST_DDS_GENERATED__CONTENTFILTERTESTTYPE_PUBSUBTYPES_HPP
+#define FAST_DDS_GENERATED__CONTENTFILTERTESTTYPE_PUBSUBTYPES_HPP
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastdds/utils/md5.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
+#include <fastdds/utils/md5.hpp>
 
 #include "ContentFilterTestType.hpp"
 
@@ -106,7 +106,7 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -124,7 +124,7 @@ class StructTypePubSubType : public eprosima::fastdds::dds::TopicDataType
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
@@ -199,7 +199,7 @@ class ContentFilterTestTypePubSubType : public eprosima::fastdds::dds::TopicData
     }
 
     eProsima_user_DllExport inline bool is_plain(
-        eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
+            eprosima::fastdds::dds::DataRepresentationId_t data_representation) const override
     {
         static_cast<void>(data_representation);
         return false;
@@ -217,10 +217,10 @@ class ContentFilterTestTypePubSubType : public eprosima::fastdds::dds::TopicData
 
 #endif  // TOPIC_DATA_TYPE_API_HAS_CONSTRUCT_SAMPLE
 
-    MD5 m_md5;
+    eprosima::fastdds::MD5 m_md5;
     unsigned char* m_keyBuffer;
 
 };
 
-#endif // _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPE_PUBSUBTYPES_H_
+#endif // FAST_DDS_GENERATED__CONTENTFILTERTESTTYPE_PUBSUBTYPES_HPP
 
diff --git a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeTypeObjectSupport.hpp b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeTypeObjectSupport.hpp
index 5586eef253a..e72e9c738c8 100644
--- a/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeTypeObjectSupport.hpp
+++ b/test/unittest/dds/topic/DDSSQLFilter/data_types/ContentFilterTestTypeTypeObjectSupport.hpp
@@ -19,8 +19,8 @@
  * This file was generated by the tool fastddsgen.
  */
 
-#ifndef _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPE_TYPE_OBJECT_SUPPORT_HPP_
-#define _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPE_TYPE_OBJECT_SUPPORT_HPP_
+#ifndef FAST_DDS_GENERATED__CONTENTFILTERTESTTYPE_TYPE_OBJECT_SUPPORT_HPP
+#define FAST_DDS_GENERATED__CONTENTFILTERTESTTYPE_TYPE_OBJECT_SUPPORT_HPP
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
@@ -89,4 +89,4 @@ eProsima_user_DllExport void register_ContentFilterTestType_type_identifier(
 
 #endif // DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FAST_DDS_GENERATED_CONTENTFILTERTESTTYPE_TYPE_OBJECT_SUPPORT_HPP_
+#endif // FAST_DDS_GENERATED__CONTENTFILTERTESTTYPE_TYPE_OBJECT_SUPPORT_HPP
diff --git a/test/unittest/dds/topic/TopicTests.cpp b/test/unittest/dds/topic/TopicTests.cpp
index bf4d71d1fdc..faa68b10c87 100644
--- a/test/unittest/dds/topic/TopicTests.cpp
+++ b/test/unittest/dds/topic/TopicTests.cpp
@@ -22,7 +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>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/unittest/rtps/DataSharing/SHMSegmentTests.cpp b/test/unittest/rtps/DataSharing/SHMSegmentTests.cpp
index 3901677d7bb..baf42b1ffec 100644
--- a/test/unittest/rtps/DataSharing/SHMSegmentTests.cpp
+++ b/test/unittest/rtps/DataSharing/SHMSegmentTests.cpp
@@ -15,12 +15,12 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "fastdds/rtps/common/Types.h"
+#include "fastdds/rtps/common/Types.hpp"
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <rtps/DataSharing/WriterPool.hpp>
 #include <rtps/history/BasicPayloadPool.hpp>
diff --git a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
index 5524ff4d0bd..ed21dab841f 100644
--- a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
+++ b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
@@ -22,12 +22,12 @@
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/common/Types.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 
 #include <rtps/messages/CDRMessage.hpp>
diff --git a/test/unittest/rtps/common/CacheChangeTests.cpp b/test/unittest/rtps/common/CacheChangeTests.cpp
index f8cf2c00a76..6a4821b5016 100644
--- a/test/unittest/rtps/common/CacheChangeTests.cpp
+++ b/test/unittest/rtps/common/CacheChangeTests.cpp
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 
 using namespace eprosima::fastdds::rtps;
 
diff --git a/test/unittest/rtps/common/GuidTests.cpp b/test/unittest/rtps/common/GuidTests.cpp
index 87155823377..c6ab1264f70 100644
--- a/test/unittest/rtps/common/GuidTests.cpp
+++ b/test/unittest/rtps/common/GuidTests.cpp
@@ -14,7 +14,7 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 
 using Guid = eprosima::fastdds::rtps::GUID_t;
 
diff --git a/test/unittest/rtps/common/GuidUtilsTests.cpp b/test/unittest/rtps/common/GuidUtilsTests.cpp
index 97eec7cc2c4..188ad04cdc1 100644
--- a/test/unittest/rtps/common/GuidUtilsTests.cpp
+++ b/test/unittest/rtps/common/GuidUtilsTests.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <rtps/common/GuidUtils.hpp>
 
 #include <climits>
diff --git a/test/unittest/rtps/common/PortParametersTests.cpp b/test/unittest/rtps/common/PortParametersTests.cpp
index 56e5a37f1e3..2080bc031ce 100644
--- a/test/unittest/rtps/common/PortParametersTests.cpp
+++ b/test/unittest/rtps/common/PortParametersTests.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/common/PortParameters.h>
+#include <fastdds/rtps/common/PortParameters.hpp>
 
 using namespace eprosima::fastdds::rtps;
 
diff --git a/test/unittest/rtps/common/SequenceNumberTests.cpp b/test/unittest/rtps/common/SequenceNumberTests.cpp
index b63098c9a42..941212c332a 100644
--- a/test/unittest/rtps/common/SequenceNumberTests.cpp
+++ b/test/unittest/rtps/common/SequenceNumberTests.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/common/SequenceNumber.h>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
 
 using namespace eprosima::fastdds::rtps;
 
diff --git a/test/unittest/rtps/common/TimeTests.cpp b/test/unittest/rtps/common/TimeTests.cpp
index eb5dd0c5a46..93c24f5d8fa 100644
--- a/test/unittest/rtps/common/TimeTests.cpp
+++ b/test/unittest/rtps/common/TimeTests.cpp
@@ -14,7 +14,7 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 
 using namespace eprosima::fastdds::rtps;
 
diff --git a/test/unittest/rtps/discovery/EdpTests.cpp b/test/unittest/rtps/discovery/EdpTests.cpp
index d5d19d44703..6e40a32e614 100644
--- a/test/unittest/rtps/discovery/EdpTests.cpp
+++ b/test/unittest/rtps/discovery/EdpTests.cpp
@@ -15,8 +15,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
diff --git a/test/unittest/rtps/discovery/PDPTests.cpp b/test/unittest/rtps/discovery/PDPTests.cpp
index 4cded84ece7..0eeea4a4f70 100644
--- a/test/unittest/rtps/discovery/PDPTests.cpp
+++ b/test/unittest/rtps/discovery/PDPTests.cpp
@@ -27,9 +27,9 @@
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/publisher/DataWriterListener.hpp>
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/reader/ReaderListener.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/reader/ReaderListener.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
diff --git a/test/unittest/rtps/domain/RTPSDomainTests.cpp b/test/unittest/rtps/domain/RTPSDomainTests.cpp
index 110b853704b..cb8854c8779 100644
--- a/test/unittest/rtps/domain/RTPSDomainTests.cpp
+++ b/test/unittest/rtps/domain/RTPSDomainTests.cpp
@@ -16,7 +16,7 @@
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/RTPSDomain.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
 
 /**
  * This test checks the getter and setter for the library settings in the RTPS layer.
diff --git a/test/unittest/rtps/history/BasicPoolsTests.cpp b/test/unittest/rtps/history/BasicPoolsTests.cpp
index c263dc0f643..9e4467b0682 100644
--- a/test/unittest/rtps/history/BasicPoolsTests.cpp
+++ b/test/unittest/rtps/history/BasicPoolsTests.cpp
@@ -14,7 +14,7 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 
 #include <rtps/history/BasicPayloadPool.hpp>
 #include <rtps/history/CacheChangePool.h>
diff --git a/test/unittest/rtps/history/CacheChangePoolTests.cpp b/test/unittest/rtps/history/CacheChangePoolTests.cpp
index a0d452d557c..46b1ec476e5 100644
--- a/test/unittest/rtps/history/CacheChangePoolTests.cpp
+++ b/test/unittest/rtps/history/CacheChangePoolTests.cpp
@@ -14,8 +14,8 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/common/CacheChange.hpp>
 
 #include <rtps/history/CacheChangePool.h>
 
diff --git a/test/unittest/rtps/history/ReaderHistoryTests.cpp b/test/unittest/rtps/history/ReaderHistoryTests.cpp
index d171b926084..78fc5d6314c 100644
--- a/test/unittest/rtps/history/ReaderHistoryTests.cpp
+++ b/test/unittest/rtps/history/ReaderHistoryTests.cpp
@@ -19,7 +19,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include <fastdds/rtps/history/ReaderHistory.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 #include <rtps/common/ChangeComparison.hpp>
 #include <rtps/reader/StatefulReader.hpp>
diff --git a/test/unittest/rtps/history/TopicPayloadPoolTests.cpp b/test/unittest/rtps/history/TopicPayloadPoolTests.cpp
index 119773e2e19..39dd576c797 100644
--- a/test/unittest/rtps/history/TopicPayloadPoolTests.cpp
+++ b/test/unittest/rtps/history/TopicPayloadPoolTests.cpp
@@ -15,7 +15,7 @@
 #include <gtest/gtest.h>
 
 #include <rtps/history/TopicPayloadPool.hpp>
-#include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/common/CacheChange.hpp>
 
 #include <tuple>
 
diff --git a/test/unittest/rtps/network/ExternalLocatorsTests.cpp b/test/unittest/rtps/network/ExternalLocatorsTests.cpp
index a1651baa259..f2fe5d3784e 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 <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <rtps/network/utils/external_locators.hpp>
 
diff --git a/test/unittest/rtps/network/NetworkFactoryTests.cpp b/test/unittest/rtps/network/NetworkFactoryTests.cpp
index b1e64798b70..b8dd570d480 100644
--- a/test/unittest/rtps/network/NetworkFactoryTests.cpp
+++ b/test/unittest/rtps/network/NetworkFactoryTests.cpp
@@ -16,13 +16,13 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <MockTransport.h>
 #include <rtps/network/NetworkFactory.h>
diff --git a/test/unittest/rtps/network/mock/MockTransport.h b/test/unittest/rtps/network/mock/MockTransport.h
index 573194e61b7..2955afa8a1e 100644
--- a/test/unittest/rtps/network/mock/MockTransport.h
+++ b/test/unittest/rtps/network/mock/MockTransport.h
@@ -18,10 +18,10 @@
 #include <utility>
 #include <vector>
 
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/transport/SocketTransportDescriptor.h>
-#include <fastdds/rtps/transport/TransportInterface.h>
+#include <fastdds/rtps/transport/SocketTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/unittest/rtps/persistence/PersistenceTests.cpp b/test/unittest/rtps/persistence/PersistenceTests.cpp
index aedcd603d4d..1b468d3b988 100644
--- a/test/unittest/rtps/persistence/PersistenceTests.cpp
+++ b/test/unittest/rtps/persistence/PersistenceTests.cpp
@@ -17,8 +17,8 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <rtps/common/GuidUtils.hpp>
 #include <rtps/history/CacheChangePool.h>
diff --git a/test/unittest/rtps/reader/StatefulReaderTests.cpp b/test/unittest/rtps/reader/StatefulReaderTests.cpp
index 36ad71e9b12..697bbe95bf1 100644
--- a/test/unittest/rtps/reader/StatefulReaderTests.cpp
+++ b/test/unittest/rtps/reader/StatefulReaderTests.cpp
@@ -18,23 +18,23 @@
 // Header for the unit we are testing
 #include <rtps/reader/StatefulReader.hpp>
 
-#include <fastdds/config.h>
+#include <fastdds/config.hpp>
 #include <fastdds/dds/common/InstanceHandle.hpp>
 
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/attributes/HistoryAttributes.h>
-#include <fastdds/rtps/attributes/ReaderAttributes.h>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/common/SequenceNumber.hpp>
+#include <fastdds/rtps/common/Types.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #ifdef FASTDDS_STATISTICS
 
diff --git a/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp b/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp
index 572e228e6d7..0db1bf5def0 100644
--- a/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp
+++ b/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp
@@ -21,8 +21,8 @@
 #define TEST_FRIENDS \
     FRIEND_TEST(WriterProxyAcknackTests, AcknackBackoff);
 
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
 #include <rtps/reader/WriterProxy.h>
diff --git a/test/unittest/rtps/reader/WriterProxyStopTest.cpp b/test/unittest/rtps/reader/WriterProxyStopTest.cpp
index 86836829823..0cf4cd2c666 100644
--- a/test/unittest/rtps/reader/WriterProxyStopTest.cpp
+++ b/test/unittest/rtps/reader/WriterProxyStopTest.cpp
@@ -17,8 +17,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
 #include <rtps/reader/WriterProxy.h>
diff --git a/test/unittest/rtps/reader/WriterProxyTests.cpp b/test/unittest/rtps/reader/WriterProxyTests.cpp
index f5434df3fc3..4a5abc891e7 100644
--- a/test/unittest/rtps/reader/WriterProxyTests.cpp
+++ b/test/unittest/rtps/reader/WriterProxyTests.cpp
@@ -21,8 +21,8 @@
     FRIEND_TEST(WriterProxyTests, ReceivedChangeSet); \
     FRIEND_TEST(WriterProxyTests, IrrelevantChangeSet);
 
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
 #include <rtps/reader/WriterProxy.h>
diff --git a/test/unittest/rtps/security/SecurityTests.hpp b/test/unittest/rtps/security/SecurityTests.hpp
index d2e79594446..dc3f8605679 100644
--- a/test/unittest/rtps/security/SecurityTests.hpp
+++ b/test/unittest/rtps/security/SecurityTests.hpp
@@ -18,8 +18,8 @@
 #include <gtest/gtest.h>
 
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
diff --git a/test/unittest/rtps/writer/LivelinessManagerTests.cpp b/test/unittest/rtps/writer/LivelinessManagerTests.cpp
index 67305448ea6..953a750888d 100644
--- a/test/unittest/rtps/writer/LivelinessManagerTests.cpp
+++ b/test/unittest/rtps/writer/LivelinessManagerTests.cpp
@@ -20,7 +20,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/common/Time_t.h>
+#include <fastdds/rtps/common/Time_t.hpp>
 #include <rtps/resources/ResourceEvent.h>
 #include <rtps/writer/LivelinessManager.hpp>
 
diff --git a/test/unittest/rtps/writer/RTPSWriterTests.cpp b/test/unittest/rtps/writer/RTPSWriterTests.cpp
index 93db18a890c..507b94786e4 100644
--- a/test/unittest/rtps/writer/RTPSWriterTests.cpp
+++ b/test/unittest/rtps/writer/RTPSWriterTests.cpp
@@ -15,11 +15,11 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 
 namespace eprosima {
diff --git a/test/unittest/security/accesscontrol/AccessControlTests.cpp b/test/unittest/security/accesscontrol/AccessControlTests.cpp
index 8c232ff5af0..f918bec3a93 100644
--- a/test/unittest/security/accesscontrol/AccessControlTests.cpp
+++ b/test/unittest/security/accesscontrol/AccessControlTests.cpp
@@ -17,8 +17,8 @@
 #include <gtest/gtest.h>
 
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <rtps/messages/CDRMessage.hpp>
 #include <security/accesscontrol/AccessPermissionsHandle.h>
 #include <security/accesscontrol/Permissions.h>
diff --git a/test/unittest/security/authentication/AuthenticationPluginTests.hpp b/test/unittest/security/authentication/AuthenticationPluginTests.hpp
index 038e9cb8bfa..bf2c173bb4a 100644
--- a/test/unittest/security/authentication/AuthenticationPluginTests.hpp
+++ b/test/unittest/security/authentication/AuthenticationPluginTests.hpp
@@ -20,8 +20,8 @@
 // Include first necessary mocks
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 
 #include <security/authentication/PKIDH.h>
 #include <security/OpenSSLInit.hpp>
diff --git a/test/unittest/security/cryptography/CryptographyPluginTests.hpp b/test/unittest/security/cryptography/CryptographyPluginTests.hpp
index 40319c916d5..bb3add8afe2 100644
--- a/test/unittest/security/cryptography/CryptographyPluginTests.hpp
+++ b/test/unittest/security/cryptography/CryptographyPluginTests.hpp
@@ -21,7 +21,7 @@
 #include <gtest/gtest.h>
 #include <openssl/rand.h>
 
-#include <fastdds/rtps/common/CDRMessage_t.h>
+#include <fastdds/rtps/common/CDRMessage_t.hpp>
 
 #include <security/accesscontrol/AccessPermissionsHandle.h>
 #include <security/authentication/PKIIdentityHandle.h>
diff --git a/test/unittest/security/logging/LoggingPluginTests.hpp b/test/unittest/security/logging/LoggingPluginTests.hpp
index 8161ee70d1e..bb57d17aa8e 100644
--- a/test/unittest/security/logging/LoggingPluginTests.hpp
+++ b/test/unittest/security/logging/LoggingPluginTests.hpp
@@ -19,7 +19,7 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 
 #include <security/logging/LogTopic.h>
 
diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantMockTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantMockTests.cpp
index 0601da02441..1ac206a440e 100644
--- a/test/unittest/statistics/dds/StatisticsDomainParticipantMockTests.cpp
+++ b/test/unittest/statistics/dds/StatisticsDomainParticipantMockTests.cpp
@@ -25,7 +25,7 @@
 #include <fastdds/statistics/topic_names.hpp>
 #include <statistics/fastdds/domain/DomainParticipantImpl.hpp>
 #include <statistics/fastdds/publisher/PublisherImpl.hpp>
-#include <statistics/types/typesPubSubTypes.h>
+#include <statistics/types/typesPubSubTypes.hpp>
 
 #include "../../logging/mock/MockConsumer.h"
 
diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp
index 6da45a9731c..ca9b5aca931 100644
--- a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp
+++ b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp
@@ -24,7 +24,7 @@
 #include <fastdds/statistics/topic_names.hpp>
 #include <statistics/fastdds/domain/DomainParticipantImpl.hpp>
 #include <statistics/fastdds/publisher/PublisherImpl.hpp>
-#include <statistics/types/typesPubSubTypes.h>
+#include <statistics/types/typesPubSubTypes.hpp>
 
 #include "../../logging/mock/MockConsumer.h"
 
diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/fastdds/publisher/DataWriterImpl.hpp b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/fastdds/publisher/DataWriterImpl.hpp
index cfe425b459b..44d66d69e63 100644
--- a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/fastdds/publisher/DataWriterImpl.hpp
+++ b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/fastdds/publisher/DataWriterImpl.hpp
@@ -32,14 +32,14 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/publisher/DataWriterHistory.hpp>
 #include <fastdds/publisher/filtering/ReaderFilterCollection.hpp>
-#include <fastdds/rtps/attributes/WriterAttributes.h>
-#include <fastdds/rtps/common/Guid.h>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/common/WriteParams.h>
-#include <fastdds/rtps/history/IChangePool.h>
-#include <fastdds/rtps/history/IPayloadPool.h>
+#include <fastdds/rtps/common/WriteParams.hpp>
+#include <fastdds/rtps/history/IChangePool.hpp>
+#include <fastdds/rtps/history/IPayloadPool.hpp>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/writer/WriterListener.h>
+#include <fastdds/rtps/writer/WriterListener.hpp>
 
 #include <rtps/DataSharing/DataSharingPayloadPool.hpp>
 #include <rtps/history/ITopicPayloadPool.h>
diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/statistics/fastdds/publisher/DataWriterImpl.hpp b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/statistics/fastdds/publisher/DataWriterImpl.hpp
index 3b497f67c29..f1c108caf85 100644
--- a/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/statistics/fastdds/publisher/DataWriterImpl.hpp
+++ b/test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests/mock/statistics/fastdds/publisher/DataWriterImpl.hpp
@@ -22,8 +22,8 @@
 #include <fastdds/statistics/IListeners.hpp>
 
 #include <fastdds/publisher/DataWriterImpl.hpp>
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <statistics/fastdds/domain/DomainParticipantImpl.hpp>
 
diff --git a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp
index 9d394faa8e9..5f468da82b0 100644
--- a/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp
+++ b/test/unittest/statistics/dds/StatisticsDomainParticipantTests.cpp
@@ -26,12 +26,12 @@
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/rtps/common/InstanceHandle.h>
-#include <fastdds/rtps/common/SerializedPayload.h>
+#include <fastdds/rtps/common/InstanceHandle.hpp>
+#include <fastdds/rtps/common/SerializedPayload.hpp>
 #include <fastdds/statistics/dds/domain/DomainParticipant.hpp>
 #include <fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/statistics/topic_names.hpp>
-#include <statistics/types/typesPubSubTypes.h>
+#include <statistics/types/typesPubSubTypes.hpp>
 
 #include "../../logging/mock/MockConsumer.h"
 
diff --git a/test/unittest/statistics/dds/StatisticsQosTests.cpp b/test/unittest/statistics/dds/StatisticsQosTests.cpp
index a1558b28c67..6cb53a38351 100644
--- a/test/unittest/statistics/dds/StatisticsQosTests.cpp
+++ b/test/unittest/statistics/dds/StatisticsQosTests.cpp
@@ -23,7 +23,7 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/dds/publisher/DataWriter.hpp>
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
-#include <fastdds/rtps/attributes/PropertyPolicy.h>
+#include <fastdds/rtps/attributes/PropertyPolicy.hpp>
 #include <fastdds/rtps/flowcontrol/FlowControllerConsts.hpp>
 #include <fastdds/statistics/dds/domain/DomainParticipant.hpp>
 #include <fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp>
diff --git a/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp b/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp
index 241429e361c..d9b12b2c539 100644
--- a/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp
+++ b/test/unittest/statistics/rtps/RTPSStatisticsTests.cpp
@@ -28,19 +28,19 @@
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#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>
-#include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/RTPSDomain.h>
-#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#include <fastdds/rtps/attributes/HistoryAttributes.hpp>
+#include <fastdds/rtps/attributes/ReaderAttributes.hpp>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
+#include <fastdds/rtps/attributes/TopicAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.hpp>
+#include <fastdds/rtps/common/Time_t.hpp>
+#include <fastdds/rtps/history/ReaderHistory.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
+#include <fastdds/rtps/participant/RTPSParticipant.hpp>
+#include <fastdds/rtps/reader/RTPSReader.hpp>
+#include <fastdds/rtps/RTPSDomain.hpp>
+#include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/writer/RTPSWriter.hpp>
 #include <fastdds/statistics/IListeners.hpp>
 
 #include <rtps/participant/RTPSParticipantImpl.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 5797ceb7552..edbef5a1108 100644
--- a/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp
+++ b/test/unittest/statistics/rtps/mock/Publisher/fastdds/publisher/DataWriterHistory.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_PUBLISHER_DATAWRITERHISTORY_HPP_
-#define _FASTDDS_PUBLISHER_DATAWRITERHISTORY_HPP_
+#ifndef FASTDDS_PUBLISHER__DATAWRITERHISTORY_HPP
+#define FASTDDS_PUBLISHER__DATAWRITERHISTORY_HPP
 
 #include <chrono>
 #include <functional>
@@ -21,8 +21,8 @@
 
 #include <gmock/gmock.h>
 
-#include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/attributes/ResourceManagement.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
 
 namespace eprosima {
@@ -79,4 +79,4 @@ class DataWriterHistory : public fastdds::rtps::WriterHistory
 }  // namespace fastdds
 }  // namespace eprosima
 
-#endif // _FASTDDS_PUBLISHER_DATAWRITERHISTORY_HPP_
+#endif // FASTDDS_PUBLISHER__DATAWRITERHISTORY_HPP
diff --git a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/StatisticsBase.hpp b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/StatisticsBase.hpp
index 64da738da7c..5ff2fd97d81 100644
--- a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/StatisticsBase.hpp
+++ b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/StatisticsBase.hpp
@@ -24,7 +24,7 @@
 #include <mutex>
 #include <set>
 
-#include <fastdds/config.h>
+#include <fastdds/config.hpp>
 
 #include <statistics/types/types.hpp>
 
diff --git a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp
index 8ebf5374e2e..5e992d3eb75 100644
--- a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp
+++ b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp
@@ -28,8 +28,8 @@
 #include <vector>
 
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
-#include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/history/WriterHistory.h>
+#include <fastdds/rtps/common/Guid.hpp>
+#include <fastdds/rtps/history/WriterHistory.hpp>
 
 #include <rtps/history/ITopicPayloadPool.h>
 #include <rtps/resources/TimedEvent.h>
@@ -37,7 +37,7 @@
 #include <statistics/rtps/monitor-service/Interfaces.hpp>
 #include <statistics/rtps/monitor-service/MonitorServiceListener.hpp>
 #include <statistics/types/monitorservice_types.hpp>
-#include <statistics/types/monitorservice_typesPubSubTypes.h>
+#include <statistics/types/monitorservice_typesPubSubTypes.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/test/unittest/transport/PortBasedTransportDescriptorTests.cpp b/test/unittest/transport/PortBasedTransportDescriptorTests.cpp
index 28bca4a8bab..f235024a6cc 100644
--- a/test/unittest/transport/PortBasedTransportDescriptorTests.cpp
+++ b/test/unittest/transport/PortBasedTransportDescriptorTests.cpp
@@ -16,7 +16,7 @@
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
 #include <fastdds/rtps/transport/PortBasedTransportDescriptor.hpp>
-#include <fastdds/rtps/transport/TransportInterface.h>
+#include <fastdds/rtps/transport/TransportInterface.hpp>
 
 using namespace eprosima::fastdds::rtps;
 
diff --git a/test/unittest/transport/SharedMemTests.cpp b/test/unittest/transport/SharedMemTests.cpp
index eb8c78b3371..d55f2c63f51 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 <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <utils/Semaphore.hpp>
 
diff --git a/test/unittest/transport/TCPv4Tests.cpp b/test/unittest/transport/TCPv4Tests.cpp
index 7511395d987..b8649b06836 100644
--- a/test/unittest/transport/TCPv4Tests.cpp
+++ b/test/unittest/transport/TCPv4Tests.cpp
@@ -21,10 +21,10 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
 #include <fastdds/rtps/transport/NetworkBuffer.hpp>
-#include <fastdds/utils/IPFinder.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPFinder.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include "mock/MockTCPChannelResource.h"
 #include "mock/MockTCPv4Transport.h"
diff --git a/test/unittest/transport/TCPv6Tests.cpp b/test/unittest/transport/TCPv6Tests.cpp
index 494b97814bf..f87aed21774 100644
--- a/test/unittest/transport/TCPv6Tests.cpp
+++ b/test/unittest/transport/TCPv6Tests.cpp
@@ -20,11 +20,11 @@
 #include <gtest/gtest.h>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
+#include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
 #include <fastdds/rtps/transport/NetworkBuffer.hpp>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <rtps/network/NetworkFactory.h>
 #include <rtps/transport/TCPv6Transport.h>
diff --git a/test/unittest/transport/UDPv4Tests.cpp b/test/unittest/transport/UDPv4Tests.cpp
index 6edb1966677..22e59454c5d 100644
--- a/test/unittest/transport/UDPv4Tests.cpp
+++ b/test/unittest/transport/UDPv4Tests.cpp
@@ -20,9 +20,9 @@
 #include <gtest/gtest.h>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/utils/IPFinder.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/utils/IPFinder.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <utils/Semaphore.hpp>
 
diff --git a/test/unittest/transport/UDPv6Tests.cpp b/test/unittest/transport/UDPv6Tests.cpp
index 692c912a3f5..7942892716c 100644
--- a/test/unittest/transport/UDPv6Tests.cpp
+++ b/test/unittest/transport/UDPv6Tests.cpp
@@ -20,8 +20,8 @@
 #include <gtest/gtest.h>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <rtps/transport/UDPv6Transport.h>
 #include <utils/Semaphore.hpp>
diff --git a/test/unittest/transport/mock/MockTCPv4Transport.h b/test/unittest/transport/mock/MockTCPv4Transport.h
index 16ec4b4d63b..1faea6e3665 100644
--- a/test/unittest/transport/mock/MockTCPv4Transport.h
+++ b/test/unittest/transport/mock/MockTCPv4Transport.h
@@ -17,7 +17,7 @@
 
 #include <vector>
 
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
 
 #include <rtps/transport/TCPv4Transport.h>
 
diff --git a/test/unittest/transport/mock/MockTCPv6Transport.h b/test/unittest/transport/mock/MockTCPv6Transport.h
index 6fde61c9115..85004ff441c 100644
--- a/test/unittest/transport/mock/MockTCPv6Transport.h
+++ b/test/unittest/transport/mock/MockTCPv6Transport.h
@@ -17,7 +17,7 @@
 
 #include <vector>
 
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
 #include <rtps/transport/TCPv6Transport.h>
 
 namespace eprosima {
diff --git a/test/unittest/utils/LocatorTests.cpp b/test/unittest/utils/LocatorTests.cpp
index a37ab7f1cde..070843a2f78 100644
--- a/test/unittest/utils/LocatorTests.cpp
+++ b/test/unittest/utils/LocatorTests.cpp
@@ -16,12 +16,12 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/LocatorListComparisons.hpp>
 #include <fastdds/rtps/common/RemoteLocators.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 
 using namespace eprosima::fastdds::rtps;
 
diff --git a/test/unittest/utils/SystemInfoTests.cpp b/test/unittest/utils/SystemInfoTests.cpp
index 50da9759535..f8cbedcbdda 100644
--- a/test/unittest/utils/SystemInfoTests.cpp
+++ b/test/unittest/utils/SystemInfoTests.cpp
@@ -32,7 +32,7 @@
 #include <gtest/gtest.h>
 #include <nlohmann/json.hpp>
 
-#include <fastdds/rtps/attributes/ServerAttributes.h>
+#include <fastdds/rtps/attributes/ServerAttributes.hpp>
 #include <utils/SystemInfo.hpp>
 
 #define SIZE 512
diff --git a/test/unittest/xmlparser/XMLElementParserTests.cpp b/test/unittest/xmlparser/XMLElementParserTests.cpp
index e5c09f7523a..f31721b89b1 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 <fastdds/utils/IPLocator.h>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <xmlparser/XMLParser.h>
 #include <xmlparser/XMLProfileManager.h>
diff --git a/test/unittest/xmlparser/XMLEndpointParserTests.cpp b/test/unittest/xmlparser/XMLEndpointParserTests.cpp
index c7dc794110f..1ff2a239a7f 100644
--- a/test/unittest/xmlparser/XMLEndpointParserTests.cpp
+++ b/test/unittest/xmlparser/XMLEndpointParserTests.cpp
@@ -24,8 +24,8 @@
 #include <fastdds/dds/log/OStreamConsumer.hpp>
 #include <fastdds/dds/log/StdoutConsumer.hpp>
 #include <fastdds/dds/log/StdoutErrConsumer.hpp>
-#include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-#include <fastdds/rtps/builtin/data/WriterProxyData.h>
+#include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
+#include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 
 #include <xmlparser/XMLEndpointParser.h>
 
diff --git a/test/unittest/xmlparser/XMLParserTests.cpp b/test/unittest/xmlparser/XMLParserTests.cpp
index 037597f0d15..3ffb9705cd4 100644
--- a/test/unittest/xmlparser/XMLParserTests.cpp
+++ b/test/unittest/xmlparser/XMLParserTests.cpp
@@ -30,12 +30,12 @@
 #include <fastdds/rtps/transport/network/BlockedNetworkInterface.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
 #include <fastdds/rtps/transport/PortBasedTransportDescriptor.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <xmlparser/XMLParser.h>
 #include <xmlparser/XMLProfileManager.h>
diff --git a/test/unittest/xmlparser/XMLProfileParserTests.cpp b/test/unittest/xmlparser/XMLProfileParserTests.cpp
index 48df4fc1132..ccff32761f3 100644
--- a/test/unittest/xmlparser/XMLProfileParserTests.cpp
+++ b/test/unittest/xmlparser/XMLProfileParserTests.cpp
@@ -33,10 +33,10 @@
 #include <fastdds/rtps/transport/network/AllowedNetworkInterface.hpp>
 #include <fastdds/rtps/transport/network/BlockedNetworkInterface.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
-#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPTransportDescriptor.h>
-#include <fastdds/rtps/transport/UDPTransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPTransportDescriptor.hpp>
+#include <fastdds/rtps/transport/UDPTransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 #include <xmlparser/XMLProfileManager.h>
 
diff --git a/tools/fds/server.cpp b/tools/fds/server.cpp
index ddb11b6d91e..2addf820910 100644
--- a/tools/fds/server.cpp
+++ b/tools/fds/server.cpp
@@ -28,12 +28,12 @@
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/attributes/ServerAttributes.h>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/transport/UDPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
-#include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
-#include <fastdds/utils/IPLocator.h>
+#include <fastdds/rtps/attributes/ServerAttributes.hpp>
+#include <fastdds/rtps/common/Locator.hpp>
+#include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv6TransportDescriptor.hpp>
+#include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
+#include <fastdds/utils/IPLocator.hpp>
 
 volatile sig_atomic_t g_signal_status = 0;
 std::mutex g_signal_mutex;
diff --git a/utils/scripts/update_generated_code_from_idl.sh b/utils/scripts/update_generated_code_from_idl.sh
index 3ad1063362e..b7bd813cdd4 100755
--- a/utils/scripts/update_generated_code_from_idl.sh
+++ b/utils/scripts/update_generated_code_from_idl.sh
@@ -124,12 +124,12 @@ mv ./include/fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobject
 
 sed -i 's+"dds_xtypes_typeobjectCdrAux.hpp"+<fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectCdrAux.hpp>+' ./src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectCdrAux.ipp
 sed -i 's+"dds_xtypes_typeobjectCdrAux.hpp"+<fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectCdrAux.hpp>+' ./src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx
-sed -i 's+"dds_xtypes_typeobjectPubSubTypes.h"+<fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.h>+' ./src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx
+sed -i 's+"dds_xtypes_typeobjectPubSubTypes.hpp"+<fastdds/dds/xtypes/type_representation/detail/dds_xtypes_typeobjectPubSubTypes.hpp>+' ./src/cpp/fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx
 
 sed -i 's+"../../../../../../include/fastdds/dds/xtypes/type_representation/detail/dds-xtypes_typeobject.hpp"+<fastdds/dds/xtypes/type_representation/TypeObject.hpp>+' ./src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp
 sed -i 's+"../../../../../../include/fastdds/dds/core/detail/DDSReturnCode.hpp"+<fastdds/dds/core/ReturnCode.hpp>+' ./src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypes.hpp
 
-sed -i 's+"../../../../../../include/fastdds/dds/xtypes/type_representation/detail/dds-xtypes_typeobjectPubSubTypes.h"+<fastdds/dds/xtypes/type_representation/TypeObject.hpp>+' ./src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.h
-sed -i 's+"../../../../../../include/fastdds/dds/core/detail/DDSReturnCodePubSubTypes.h"+<fastdds/dds/core/ReturnCode.hpp>+' ./src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.h
+sed -i 's+"../../../../../../include/fastdds/dds/xtypes/type_representation/detail/dds-xtypes_typeobjectPubSubTypes.hpp"+<fastdds/dds/xtypes/type_representation/TypeObject.hpp>+' ./src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp
+sed -i 's+"../../../../../../include/fastdds/dds/core/detail/DDSReturnCodePubSubTypes.hpp"+<fastdds/dds/core/ReturnCode.hpp>+' ./src/cpp/fastdds/builtin/type_lookup_service/detail/TypeLookupTypesPubSubTypes.hpp
 
 exit $ret_value
diff --git a/versions.md b/versions.md
index fdc01095e6b..58e31d922be 100644
--- a/versions.md
+++ b/versions.md
@@ -32,6 +32,7 @@ Forthcoming
   * ReaderLocator
   * ReaderProxy
   * ChangeForReader
+* Public API headers .h have been renamed to .hpp
 * Added create participant methods that use environment XML profile for participant configuration.
 * New TypeObjectRegistry class to register/query TypeObjects/TypeIdentifiers.
 * New TypeObjectUtils class providing API to build and register TypeObjects/TypeIdentifiers.