diff --git a/examples/cpp/discovery_server/ServerApp.hpp b/examples/cpp/discovery_server/ServerApp.hpp
index 1edccf7db7a..25261804ab7 100644
--- a/examples/cpp/discovery_server/ServerApp.hpp
+++ b/examples/cpp/discovery_server/ServerApp.hpp
@@ -51,7 +51,7 @@ class ServerApp : public Application, public DomainParticipantListener
     void on_participant_discovery(
             DomainParticipant* participant,
             fastdds::rtps::PARTICIPANT_DISCOVERY_STATUS status,
-            const fastdds::rtps::ParticipantProxyData& info,
+            const fastdds::rtps::ParticipantBuiltinTopicData& info,
             bool& should_be_ignored) override;
 
     //! Run publisher
diff --git a/include/fastdds/rtps/builtin/data/WriterProxyData.hpp b/include/fastdds/rtps/builtin/data/WriterProxyData.hpp
index 23004666e48..0ad92a98e0a 100644
--- a/include/fastdds/rtps/builtin/data/WriterProxyData.hpp
+++ b/include/fastdds/rtps/builtin/data/WriterProxyData.hpp
@@ -40,7 +40,6 @@ namespace rtps {
 
 struct CDRMessage_t;
 class NetworkFactory;
-class ParticipantProxyData;
 
 /**
  **@ingroup BUILTIN_MODULE
diff --git a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp
index 2f4e5387a84..0bec87a5ec0 100644
--- a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp
+++ b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp
@@ -21,7 +21,6 @@
 #define FASTDDS_RTPS_PARTICIPANT__PARTICIPANTDISCOVERYINFO_HPP
 
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/include/fastdds/rtps/participant/RTPSParticipant.hpp b/include/fastdds/rtps/participant/RTPSParticipant.hpp
index f797f4c6be5..ae6caee1dee 100644
--- a/include/fastdds/rtps/participant/RTPSParticipant.hpp
+++ b/include/fastdds/rtps/participant/RTPSParticipant.hpp
@@ -27,7 +27,6 @@
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
 #include <fastdds/rtps/builtin/data/ContentFilterProperty.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/common/Guid.hpp>
 #include <fastdds/statistics/IListeners.hpp>
 #include <fastdds/fastdds_dll.hpp>
@@ -69,6 +68,7 @@ class WriterAttributes;
 class ReaderAttributes;
 class ResourceEvent;
 class WLP;
+class ParticipantProxyData;
 
 /**
  * @brief Class RTPSParticipant, contains the public API for a RTPSParticipant.
diff --git a/include/fastdds/rtps/participant/RTPSParticipantListener.hpp b/include/fastdds/rtps/participant/RTPSParticipantListener.hpp
index 8f94c332169..86a7f439509 100644
--- a/include/fastdds/rtps/participant/RTPSParticipantListener.hpp
+++ b/include/fastdds/rtps/participant/RTPSParticipantListener.hpp
@@ -30,7 +30,6 @@ namespace fastdds {
 namespace rtps {
 
 class RTPSParticipant;
-class ParticipantProxyData;
 
 /**
  * Class RTPSParticipantListener with virtual method that the user can overload to respond to certain events.
diff --git a/include/fastdds/statistics/dds/domain/DomainParticipant.hpp b/include/fastdds/statistics/dds/domain/DomainParticipant.hpp
index a416a605802..73cd498a2fc 100644
--- a/include/fastdds/statistics/dds/domain/DomainParticipant.hpp
+++ b/include/fastdds/statistics/dds/domain/DomainParticipant.hpp
@@ -26,7 +26,6 @@
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/fastdds_dll.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -34,6 +33,7 @@ namespace rtps {
 
 class ReaderProxyData;
 class WriterProxyData;
+class ParticipantProxyData;
 } // namespace rtps
 
 namespace statistics {
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
index c8bdd3be946..62eb3691f75 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
@@ -27,7 +27,6 @@
 #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.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/CdrSerialization.hpp>
@@ -37,6 +36,7 @@
 #include <fastdds/rtps/writer/RTPSWriter.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
 #include <rtps/RTPSDomainImpl.hpp>
diff --git a/src/cpp/rtps/builtin/BuiltinProtocols.cpp b/src/cpp/rtps/builtin/BuiltinProtocols.cpp
index 640a7f1e1ba..0efa60adcb8 100644
--- a/src/cpp/rtps/builtin/BuiltinProtocols.cpp
+++ b/src/cpp/rtps/builtin/BuiltinProtocols.cpp
@@ -22,11 +22,11 @@
 #include <algorithm>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/utils/IPFinder.hpp>
-
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
+
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/endpoint/EDPStatic.h>
 #include <rtps/builtin/discovery/participant/PDPClient.h>
diff --git a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
index bd5528e8a83..e69bf6123fc 100644
--- a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
+++ b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 
 #include <chrono>
 #include <mutex>
diff --git a/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp b/src/cpp/rtps/builtin/data/ParticipantProxyData.hpp
similarity index 83%
rename from include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp
rename to src/cpp/rtps/builtin/data/ParticipantProxyData.hpp
index 8a94ef2ef71..aa7c7007f14 100644
--- a/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp
+++ b/src/cpp/rtps/builtin/data/ParticipantProxyData.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
-#define FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
+#ifndef RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
+#define RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -64,13 +64,13 @@ class ParticipantProxyData
 {
 public:
 
-    FASTDDS_EXPORTED_API ParticipantProxyData(
+    ParticipantProxyData(
             const RTPSParticipantAllocationAttributes& allocation);
 
-    FASTDDS_EXPORTED_API ParticipantProxyData(
+    ParticipantProxyData(
             const ParticipantProxyData& pdata);
 
-    FASTDDS_EXPORTED_API virtual ~ParticipantProxyData();
+    virtual ~ParticipantProxyData();
 
     //!Protocol version
     ProtocolVersion_t m_protocolVersion;
@@ -130,7 +130,7 @@ class ParticipantProxyData
      * @param pdata Object to copy the data from
      * @return True on success
      */
-    FASTDDS_EXPORTED_API bool updateData(
+    bool updateData(
             ParticipantProxyData& pdata);
 
     /**
@@ -138,14 +138,14 @@ class ParticipantProxyData
      * @param include_encapsulation Whether to include the size of the encapsulation info.
      * @return size in bytes of the CDR serialization.
      */
-    FASTDDS_EXPORTED_API uint32_t get_serialized_size(
+    uint32_t get_serialized_size(
             bool include_encapsulation) const;
 
     /**
      * Write as a parameter list on a CDRMessage_t
      * @return True on success
      */
-    FASTDDS_EXPORTED_API bool writeToCDRMessage(
+    bool writeToCDRMessage(
             CDRMessage_t* msg,
             bool write_encapsulation);
 
@@ -153,7 +153,7 @@ class ParticipantProxyData
      * Read the parameter list from a received CDRMessage_t
      * @return True on success
      */
-    FASTDDS_EXPORTED_API bool readFromCDRMessage(
+    bool readFromCDRMessage(
             CDRMessage_t* msg,
             bool use_encapsulation,
             const NetworkFactory& network,
@@ -162,62 +162,62 @@ class ParticipantProxyData
             fastdds::rtps::VendorId_t source_vendor_id = c_VendorId_eProsima);
 
     //! Clear the data (restore to default state).
-    FASTDDS_EXPORTED_API void clear();
+    void clear();
 
     /**
      * Copy the data from another object.
      * @param pdata Object to copy the data from
      */
-    FASTDDS_EXPORTED_API void copy(
+    void copy(
             const ParticipantProxyData& pdata);
 
     /**
      * Set participant persistent GUID_t
      * @param guid valid GUID_t
      */
-    FASTDDS_EXPORTED_API void set_persistence_guid(
+    void set_persistence_guid(
             const GUID_t& guid);
 
     /**
      * Retrieve participant persistent GUID_t
      * @return guid persistent GUID_t or c_Guid_Unknown
      */
-    FASTDDS_EXPORTED_API GUID_t get_persistence_guid() const;
+    GUID_t get_persistence_guid() const;
 
     /**
      * Set participant client server sample identity
      * @param sid valid SampleIdentity
      */
-    FASTDDS_EXPORTED_API void set_sample_identity(
+    void set_sample_identity(
             const SampleIdentity& sid);
 
     /**
      * Retrieve participant SampleIdentity
      * @return SampleIdentity
      */
-    FASTDDS_EXPORTED_API SampleIdentity get_sample_identity() const;
+    SampleIdentity get_sample_identity() const;
 
     /**
      * Identifies the participant as client of the given server
      * @param guid valid backup server GUID
      */
-    FASTDDS_EXPORTED_API void set_backup_stamp(
+    void set_backup_stamp(
             const GUID_t& guid);
 
     /**
      * Retrieves BACKUP server stamp. On deserialization hints if lease duration must be enforced
      * @return GUID
      */
-    FASTDDS_EXPORTED_API GUID_t get_backup_stamp() const;
+    GUID_t get_backup_stamp() const;
 
-    FASTDDS_EXPORTED_API void assert_liveliness();
+    void assert_liveliness();
 
-    FASTDDS_EXPORTED_API const std::chrono::steady_clock::time_point& last_received_message_tm() const
+    const std::chrono::steady_clock::time_point& last_received_message_tm() const
     {
         return last_received_message_tm_;
     }
 
-    FASTDDS_EXPORTED_API const std::chrono::microseconds& lease_duration() const
+    const std::chrono::microseconds& lease_duration() const
     {
         return lease_duration_;
     }
@@ -237,4 +237,4 @@ class ParticipantProxyData
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
+#endif // RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP
diff --git a/src/cpp/rtps/builtin/data/ProxyDataConverters.cpp b/src/cpp/rtps/builtin/data/ProxyDataConverters.cpp
index ed872b9312d..ac9d85ef4ed 100644
--- a/src/cpp/rtps/builtin/data/ProxyDataConverters.cpp
+++ b/src/cpp/rtps/builtin/data/ProxyDataConverters.cpp
@@ -24,12 +24,13 @@
 #include <fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp>
 #include <fastdds/dds/builtin/topic/PublicationBuiltinTopicData.hpp>
 #include <fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.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/GuidPrefix_t.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
+
 namespace eprosima {
 namespace fastdds {
 namespace rtps {
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
index 240be0cf620..56cdc0cccec 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
@@ -27,7 +27,6 @@
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/attributes/TopicAttributes.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/reader/ReaderListener.hpp>
@@ -35,6 +34,7 @@
 #include <fastdds/rtps/writer/RTPSWriter.hpp>
 #include <fastdds/rtps/writer/WriterListener.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/data/ProxyHashTables.hpp>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/network/utils/external_locators.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp
index a14528453a5..e0d91cd18f1 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp
@@ -22,12 +22,12 @@
 #include <mutex>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #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/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #if HAVE_SECURITY
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp
index c818c69632f..a06e6c1497d 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp
@@ -21,9 +21,9 @@
 #define _FASTDDS_RTPS_EDPSERVER2_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/common/CacheChange.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryDataBase.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryDataFilter.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPSimple.h>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
index 3d3841e1931..4b58549f175 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
@@ -29,7 +29,6 @@
 #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.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/history/ReaderHistory.hpp>
@@ -37,6 +36,7 @@
 #include <fastdds/rtps/reader/RTPSReader.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPSimpleListeners.h>
 #include <rtps/builtin/discovery/endpoint/EDPUtils.hpp>
 #include <rtps/builtin/discovery/participant/PDP.h>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
index d5672548c70..eaa94555f34 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
@@ -21,16 +21,16 @@
 
 #include <mutex>
 
+#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #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.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/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPSimple.h>
 #include <rtps/builtin/discovery/participant/PDPSimple.h>
 #include <rtps/network/NetworkFactory.h>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp
index bebf22239fa..5bf3950ec44 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp
@@ -25,12 +25,12 @@
 #include <tinyxml2.h>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #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/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/participant/PDPSimple.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <xmlparser/XMLEndpointParser.h>
diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp
index f86a38d229b..8891f89effa 100644
--- a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp
@@ -23,11 +23,11 @@
 
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/history/ReaderHistory.hpp>
 #include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
 #include <fastdds/rtps/reader/RTPSReader.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp
index b7ac5262526..059e41ec1d6 100644
--- a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp
@@ -23,8 +23,7 @@
 
 #include <mutex>
 
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/participant/PDPListener.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
index 61d0271827b..b33028fba08 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -28,17 +28,17 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #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.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.hpp>
+
 #include <rtps/builtin/BuiltinProtocols.h>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/data/ProxyDataConverters.hpp>
 #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 cba4e7c47c4..cc55ddb408e 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDP.h
+++ b/src/cpp/rtps/builtin/discovery/participant/PDP.h
@@ -28,7 +28,6 @@
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/Guid.hpp>
@@ -39,6 +38,7 @@
 #include <fastdds/rtps/writer/WriterDiscoveryInfo.hpp>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp>
 #include <statistics/rtps/monitor-service/interfaces/IProxyQueryable.hpp>
 #include <utils/ProxyPool.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp
index c009eb5fdf6..6140921f50e 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp
@@ -23,11 +23,11 @@
 
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/history/ReaderHistory.hpp>
 #include <fastdds/rtps/participant/RTPSParticipantListener.hpp>
 #include <fastdds/rtps/reader/RTPSReader.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
index d3c606c22fc..33fd3e0fcf8 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
@@ -24,13 +24,13 @@
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #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/data/ProxyDataConverters.hpp>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPListener.h b/src/cpp/rtps/builtin/discovery/participant/PDPListener.h
index 380d9a8c6c0..aac15259dea 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPListener.h
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPListener.h
@@ -21,11 +21,11 @@
 #define _FASTDDS_RTPS_PDPLISTENER_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/reader/ReaderListener.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-
 #include <mutex>
 
+#include <fastdds/rtps/reader/ReaderListener.hpp>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
+
 namespace eprosima {
 namespace fastdds {
 namespace rtps {
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
index daa4ac39a09..9904776a6ad 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -16,22 +16,23 @@
  * @file PDPSimple.cpp
  *
  */
+
 #include <rtps/builtin/discovery/participant/PDPSimple.h>
 
 #include <mutex>
 
 #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.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.hpp>
+
 #include <rtps/builtin/BuiltinProtocols.h>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/data/NetworkConfiguration.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPSimple.h>
 #include <rtps/builtin/discovery/endpoint/EDPStatic.h>
diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp
index 2fb2779ca42..58104b39b01 100644
--- a/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp
@@ -17,16 +17,15 @@
  *
  */
 
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-
-#include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/builtin/discovery/participant/timedevent/DSClientEvent.h>
 
 #include <fastdds/dds/log/Log.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPClient.h>
 #include <rtps/builtin/discovery/participant/PDPClient.h>
-#include <rtps/builtin/discovery/participant/timedevent/DSClientEvent.h>
+#include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/resources/ResourceEvent.h>
 #include <utils/shared_mutex.hpp>
 
diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp
index be796e85b68..014f1c97463 100644
--- a/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp
@@ -17,14 +17,13 @@
  *
  */
 
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-
-#include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp>
 
 #include <fastdds/dds/log/Log.hpp>
 
-#include <rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/participant/PDPServer.hpp>
+#include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/resources/ResourceEvent.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/builtin/liveliness/WLP.cpp b/src/cpp/rtps/builtin/liveliness/WLP.cpp
index d6a9fe6a33d..8f99d2aa58a 100644
--- a/src/cpp/rtps/builtin/liveliness/WLP.cpp
+++ b/src/cpp/rtps/builtin/liveliness/WLP.cpp
@@ -24,13 +24,13 @@
 
 #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.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/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/participant/PDPSimple.h>
 #include <rtps/builtin/liveliness/WLPListener.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
diff --git a/src/cpp/rtps/network/utils/external_locators.cpp b/src/cpp/rtps/network/utils/external_locators.cpp
index 5266cf0e812..df6ae11c0cb 100644
--- a/src/cpp/rtps/network/utils/external_locators.cpp
+++ b/src/cpp/rtps/network/utils/external_locators.cpp
@@ -22,7 +22,6 @@
 #include <vector>
 
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
@@ -31,6 +30,7 @@
 #include <fastdds/utils/IPLocator.hpp>
 #include <utils/SystemInfo.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/network/utils/external_locators.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/network/utils/external_locators.hpp b/src/cpp/rtps/network/utils/external_locators.hpp
index 7dd622bff9f..0d574c223be 100644
--- a/src/cpp/rtps/network/utils/external_locators.hpp
+++ b/src/cpp/rtps/network/utils/external_locators.hpp
@@ -20,12 +20,13 @@
 #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.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
+
 namespace eprosima {
 namespace fastdds {
 namespace rtps {
diff --git a/src/cpp/rtps/network/utils/netmask_filter.cpp b/src/cpp/rtps/network/utils/netmask_filter.cpp
index ab89046261c..1242e16b253 100644
--- a/src/cpp/rtps/network/utils/netmask_filter.cpp
+++ b/src/cpp/rtps/network/utils/netmask_filter.cpp
@@ -24,11 +24,11 @@
 #include <vector>
 
 #include <fastdds/rtps/attributes/ExternalLocators.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/common/LocatorWithMask.hpp>
 #include <fastdds/rtps/transport/network/AllowedNetworkInterface.hpp>
 #include <fastdds/rtps/transport/network/NetmaskFilterKind.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/network/utils/netmask_filter.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
index 2a91b8fda9a..9ea4fd6b01c 100644
--- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
+++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -30,7 +30,6 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/LibrarySettings.hpp>
 #include <fastdds/rtps/attributes/BuiltinTransports.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.hpp>
@@ -45,6 +44,7 @@
 
 #include <rtps/attributes/ServerAttributes.hpp>
 #include <rtps/builtin/BuiltinProtocols.h>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/builtin/discovery/participant/PDPClient.h>
diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp
index 68010b3f561..01f2aea74ba 100644
--- a/src/cpp/rtps/security/SecurityManager.cpp
+++ b/src/cpp/rtps/security/SecurityManager.cpp
@@ -26,13 +26,13 @@
 #include <fastdds/dds/log/Log.hpp>
 #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.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/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/messages/CDRMessage.hpp>
diff --git a/src/cpp/rtps/security/SecurityManager.h b/src/cpp/rtps/security/SecurityManager.h
index 5fc16fc1753..417db9b0ebe 100644
--- a/src/cpp/rtps/security/SecurityManager.h
+++ b/src/cpp/rtps/security/SecurityManager.h
@@ -26,7 +26,6 @@
 #include <thread>
 
 #include <fastdds/rtps/attributes/HistoryAttributes.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/SequenceNumber.hpp>
@@ -34,6 +33,7 @@
 #include <fastdds/rtps/reader/ReaderListener.hpp>
 #include <fastdds/rtps/writer/WriterListener.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/resources/TimedEvent.h>
 #include <rtps/security/authentication/Handshake.h>
 #include <rtps/security/common/ParticipantGenericMessage.h>
diff --git a/src/cpp/security/accesscontrol/Permissions.cpp b/src/cpp/security/accesscontrol/Permissions.cpp
index 85e2351edee..8227b154396 100644
--- a/src/cpp/security/accesscontrol/Permissions.cpp
+++ b/src/cpp/security/accesscontrol/Permissions.cpp
@@ -33,10 +33,10 @@
 #include <openssl/obj_mac.h>
 
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/security/exceptions/SecurityException.h>
 #include <security/accesscontrol/AccessPermissionsHandle.h>
 #include <security/accesscontrol/DistinguishedName.h>
diff --git a/src/cpp/security/authentication/PKIDH.cpp b/src/cpp/security/authentication/PKIDH.cpp
index e67336a6dd5..2f9fd725809 100644
--- a/src/cpp/security/authentication/PKIDH.cpp
+++ b/src/cpp/security/authentication/PKIDH.cpp
@@ -26,8 +26,8 @@
 
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/security/logging/Logging.h>
 #include <rtps/messages/CDRMessage.hpp>
 #include <security/authentication/PKIIdentityHandle.h>
diff --git a/test/blackbox/api/dds-pim/PubSubParticipant.hpp b/test/blackbox/api/dds-pim/PubSubParticipant.hpp
index dfcfc4e3bc7..ba97ed23faf 100644
--- a/test/blackbox/api/dds-pim/PubSubParticipant.hpp
+++ b/test/blackbox/api/dds-pim/PubSubParticipant.hpp
@@ -163,8 +163,8 @@ class PubSubParticipant
 
         void on_participant_discovery(
                 eprosima::fastdds::dds::DomainParticipant*,
-                fastdds::rtps::PARTICIPANT_DISCOVERY_STATUS status,
-                const fastdds::rtps::ParticipantBuiltinTopicData& info,
+                eprosima::fastdds::rtps::PARTICIPANT_DISCOVERY_STATUS status,
+                const eprosima::fastdds::rtps::ParticipantBuiltinTopicData& info,
                 bool& should_be_ignored)
         {
             static_cast<void>(should_be_ignored);
diff --git a/test/blackbox/api/dds-pim/PubSubReader.hpp b/test/blackbox/api/dds-pim/PubSubReader.hpp
index 0d8a2829194..230125aa5c4 100644
--- a/test/blackbox/api/dds-pim/PubSubReader.hpp
+++ b/test/blackbox/api/dds-pim/PubSubReader.hpp
@@ -105,7 +105,7 @@ class PubSubReader
             if (reader_.onDiscovery_ != nullptr)
             {
                 std::unique_lock<std::mutex> lock(reader_.mutexDiscovery_);
-                reader_.discovery_result_ |= reader_.onDiscovery_(info);
+                reader_.discovery_result_ |= reader_.onDiscovery_(info, status);
                 reader_.cvDiscovery_.notify_one();
             }
 
@@ -1686,7 +1686,7 @@ class PubSubReader
     }
 
     void setOnDiscoveryFunction(
-            std::function<bool(const eprosima::fastdds::rtps::ParticipantBuiltinTopicData&)> f)
+            std::function<bool(const eprosima::fastdds::rtps::ParticipantBuiltinTopicData&, eprosima::fastdds::rtps::PARTICIPANT_DISCOVERY_STATUS)> f)
     {
         onDiscovery_ = f;
     }
@@ -2126,7 +2126,7 @@ class PubSubReader
     std::string participant_profile_ = "";
     std::string datareader_profile_ = "";
 
-    std::function<bool(const eprosima::fastdds::rtps::ParticipantBuiltinTopicData& info)> onDiscovery_;
+    std::function<bool(const eprosima::fastdds::rtps::ParticipantBuiltinTopicData& info, eprosima::fastdds::rtps::PARTICIPANT_DISCOVERY_STATUS status)> onDiscovery_;
     std::function<bool(const eprosima::fastdds::rtps::WriterDiscoveryInfo& info)> onEndpointDiscovery_;
 
     //! True to take data from history. On False, read_ is checked.
diff --git a/test/blackbox/api/dds-pim/PubSubWriterReader.hpp b/test/blackbox/api/dds-pim/PubSubWriterReader.hpp
index 20f5f06019e..0096277dafe 100644
--- a/test/blackbox/api/dds-pim/PubSubWriterReader.hpp
+++ b/test/blackbox/api/dds-pim/PubSubWriterReader.hpp
@@ -100,7 +100,7 @@ class PubSubWriterReader
                     break;
 
                 case eprosima::fastdds::rtps::PARTICIPANT_DISCOVERY_STATUS::DROPPED_PARTICIPANT:
-                    std::cout << "Participant " << info.m_guid << " has been dropped";
+                    std::cout << "Participant " << info.guid << " has been dropped";
                     info_remove(discovered_participants_, info.guid);
                     break;
 
diff --git a/test/blackbox/common/BlackboxTestsDiscovery.cpp b/test/blackbox/common/BlackboxTestsDiscovery.cpp
index 4731bb9ad79..c35533345e4 100644
--- a/test/blackbox/common/BlackboxTestsDiscovery.cpp
+++ b/test/blackbox/common/BlackboxTestsDiscovery.cpp
@@ -891,19 +891,19 @@ TEST_P(Discovery, PubSubAsReliableHelloworldParticipantDiscovery)
     ASSERT_TRUE(writer.isInitialized());
 
     int count = 0;
-    reader.setOnDiscoveryFunction([&writer, &count](const ParticipantProxyData& info) -> bool
+    reader.setOnDiscoveryFunction([&writer, &count](const ParticipantBuiltinTopicData& info, PARTICIPANT_DISCOVERY_STATUS status) -> bool
             {
-                if (info.m_guid == writer.participant_guid())
+                if (info.guid == writer.participant_guid())
                 {
-                    if (info.status == PARTICIPANT_DISCOVERY_STATUS::DISCOVERED_PARTICIPANT)
+                    if (status == PARTICIPANT_DISCOVERY_STATUS::DISCOVERED_PARTICIPANT)
                     {
-                        std::cout << "Discovered participant " << info.m_guid << std::endl;
+                        std::cout << "Discovered participant " << info.guid << std::endl;
                         ++count;
                     }
-                    else if (info.status == PARTICIPANT_DISCOVERY_STATUS::REMOVED_PARTICIPANT ||
-                    info.status == PARTICIPANT_DISCOVERY_STATUS::DROPPED_PARTICIPANT)
+                    else if (status == PARTICIPANT_DISCOVERY_STATUS::REMOVED_PARTICIPANT ||
+                    status == PARTICIPANT_DISCOVERY_STATUS::DROPPED_PARTICIPANT)
                     {
-                        std::cout << "Removed participant " << info.m_guid << std::endl;
+                        std::cout << "Removed participant " << info.guid << std::endl;
                         return ++count == 2;
                     }
                 }
@@ -936,16 +936,16 @@ TEST_P(Discovery, PubSubAsReliableHelloworldUserData)
 
     ASSERT_TRUE(writer.isInitialized());
 
-    reader.setOnDiscoveryFunction([&writer](const ParticipantProxyData& info) -> bool
+    reader.setOnDiscoveryFunction([&writer](const ParticipantBuiltinTopicData& info, PARTICIPANT_DISCOVERY_STATUS /*status*/) -> bool
             {
-                if (info.m_guid == writer.participant_guid())
+                if (info.guid == writer.participant_guid())
                 {
                     std::cout << "Received USER_DATA from the writer: ";
-                    for (auto i: info.m_userData)
+                    for (auto i: info.user_data)
                     {
                         std::cout << i << ' ';
                     }
-                    return info.m_userData == std::vector<octet>({'a', 'b', 'c', 'd'});
+                    return info.user_data == std::vector<octet>({'a', 'b', 'c', 'd'});
                 }
 
                 return false;
diff --git a/test/blackbox/common/BlackboxTestsSecurity.cpp b/test/blackbox/common/BlackboxTestsSecurity.cpp
index 4c147f5faf8..46e7100444b 100644
--- a/test/blackbox/common/BlackboxTestsSecurity.cpp
+++ b/test/blackbox/common/BlackboxTestsSecurity.cpp
@@ -2724,16 +2724,16 @@ TEST_P(Security, BuiltinAuthenticationAndCryptoPlugin_user_data)
     sub_property_policy.properties().emplace_back("rtps.endpoint.submessage_protection_kind", "ENCRYPT");
     sub_property_policy.properties().emplace_back("rtps.endpoint.payload_protection_kind", "ENCRYPT");
 
-    reader.setOnDiscoveryFunction([&writer](const ParticipantProxyData& info) -> bool
+    reader.setOnDiscoveryFunction([&writer](const ParticipantBuiltinTopicData& info, PARTICIPANT_DISCOVERY_STATUS /*status*/) -> bool
             {
-                if (info.m_guid == writer.participant_guid())
+                if (info.guid == writer.participant_guid())
                 {
                     std::cout << "Received USER_DATA from the writer: ";
-                    for (auto i : info.m_userData)
+                    for (auto i : info.user_data)
                     {
                         std::cout << i << ' ';
                     }
-                    return info.m_userData == std::vector<octet>({ 'a', 'b', 'c', 'd', 'e' });
+                    return info.user_data == std::vector<octet>({ 'a', 'b', 'c', 'd', 'e' });
                 }
 
                 return false;
diff --git a/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp b/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp
index a8b44409346..ca8c64b3b92 100644
--- a/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp
@@ -35,9 +35,9 @@
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include "BlackboxTests.hpp"
 #include "../api/dds-pim/CustomPayloadPool.hpp"
 #include "../api/dds-pim/PubSubReader.hpp"
diff --git a/test/blackbox/common/DDSBlackboxTestsBasic.cpp b/test/blackbox/common/DDSBlackboxTestsBasic.cpp
index 1e3a91f4f7b..ef7b9baee49 100644
--- a/test/blackbox/common/DDSBlackboxTestsBasic.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsBasic.cpp
@@ -39,7 +39,6 @@
 #include <fastdds/dds/topic/qos/TopicQos.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 #include <fastdds/rtps/transport/test_UDPv4TransportDescriptor.hpp>
 
@@ -537,7 +536,7 @@ TEST(DDSBasic, IgnoreParticipant)
                 bool& should_be_ignored) override
         {
             std::cout << "Using custom listener" << std::endl;
-            if (status == PARTICIPANT_DISCOVERY_STATUS::DISCOVERED_PARTICIPANT)
+            if (status == eprosima::fastdds::rtps::PARTICIPANT_DISCOVERY_STATUS::DISCOVERED_PARTICIPANT)
             {
                 std::cout << "Discovered participant" << std::endl;
                 if (info.user_data == std::vector<eprosima::fastdds::rtps::octet>({ 'i', 'g', 'n' }))
diff --git a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
index 5f6729fd520..bef16d8e549 100644
--- a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp
@@ -29,7 +29,7 @@
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
+#include <fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp>
 #include <fastdds/rtps/common/CDRMessage_t.hpp>
 #include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
@@ -613,7 +613,7 @@ TEST(DDSDiscovery, ParticipantProxyPhysicalData)
             }
         }
 
-        ParticipantProxyData* remote_participant_info;
+        eprosima::fastdds::rtps::ParticipantBuiltinTopicData* remote_participant_info;
 
     private:
 
@@ -666,7 +666,7 @@ TEST(DDSDiscovery, ParticipantProxyPhysicalData)
         participant_found.store(false);
 
         // Prevent assertion on spurious discovery of a participant from elsewhere
-        if (part_1->guid() == listener.remote_participant_info->m_guid)
+        if (part_1->guid() == listener.remote_participant_info->guid)
         {
             // Check that all three properties are present in the ParticipantProxyData, and that their value
             // is that of the property in part_1 (the original property value)
@@ -674,13 +674,13 @@ TEST(DDSDiscovery, ParticipantProxyPhysicalData)
             {
                 // Find property in ParticipantProxyData
                 auto received_property = std::find_if(
-                    listener.remote_participant_info->m_properties.begin(),
-                    listener.remote_participant_info->m_properties.end(),
+                    listener.remote_participant_info->properties.begin(),
+                    listener.remote_participant_info->properties.end(),
                     [&](const ParameterProperty_t& property)
                     {
                         return property.first() == physical_property_name;
                     });
-                ASSERT_NE(received_property, listener.remote_participant_info->m_properties.end());
+                ASSERT_NE(received_property, listener.remote_participant_info->properties.end());
 
                 // Find property in first participant
                 auto part_1_property = PropertyPolicyHelper::find_property(
@@ -726,20 +726,20 @@ TEST(DDSDiscovery, ParticipantProxyPhysicalData)
         participant_found.store(false);
 
         // Prevent assertion on spurious discovery of a participant from elsewhere
-        if (part_1->guid() == listener.remote_participant_info->m_guid)
+        if (part_1->guid() == listener.remote_participant_info->guid)
         {
             // Check that none of the three properties are present in the ParticipantProxyData.
             for (auto physical_property_name : physical_property_names)
             {
                 // Look for property in ParticipantProxyData
                 auto received_property = std::find_if(
-                    listener.remote_participant_info->m_properties.begin(),
-                    listener.remote_participant_info->m_properties.end(),
+                    listener.remote_participant_info->properties.begin(),
+                    listener.remote_participant_info->properties.end(),
                     [&](const ParameterProperty_t& property)
                     {
                         return property.first() == physical_property_name;
                     });
-                ASSERT_EQ(received_property, listener.remote_participant_info->m_properties.end());
+                ASSERT_EQ(received_property, listener.remote_participant_info->properties.end());
             }
             break;
         }
@@ -1839,7 +1839,7 @@ TEST(DDSDiscovery, DataracePDP)
         void on_participant_discovery(
                 DomainParticipant* /*participant*/,
                 PARTICIPANT_DISCOVERY_STATUS status,
-                const ParticipantBuiltinTopicData& info,
+                const ParticipantBuiltinTopicData& /*info*/,
                 bool& /*should_be_ignored*/) override
         {
             if (status == eprosima::fastdds::rtps::PARTICIPANT_DISCOVERY_STATUS::DISCOVERED_PARTICIPANT)
diff --git a/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp b/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp
index a066a6f8e5a..ee5c0236820 100644
--- a/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp
@@ -18,8 +18,8 @@
 #include <gtest/gtest.h>
 
 // TODO(jlbueno): remove private header
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <statistics/rtps/StatisticsBase.hpp>
-
 #include "../types/statistics/monitorservice_typesPubSubTypes.hpp"
 #include "BlackboxTests.hpp"
 #include "PubSubReader.hpp"
@@ -703,7 +703,7 @@ struct ProxySampleValidator : public SampleValidator
                 if (guid.entityId == c_EntityId_RTPSParticipant)
                 {
                     RTPSParticipantAllocationAttributes att;
-                    ParticipantProxyData pdata(att);
+                    eprosima::fastdds::rtps::ParticipantProxyData pdata(att);
 
                     ASSERT_EQ(participant->fill_discovery_data_from_cdr_message(pdata,
                             data),
diff --git a/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp b/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp
index 4baa95c2d09..b40cd249153 100644
--- a/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp
@@ -14,10 +14,10 @@
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/common/Types.hpp>
 #include <gtest/gtest.h>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include "BlackboxTests.hpp"
 #include "PubSubParticipant.hpp"
 
@@ -113,13 +113,13 @@ TEST_P(PropertyQos, send_property_qos)
 
     PubSubParticipant<HelloWorldPubSubType> participant_2(0u, 0u, 0u, 0u);
 
-    participant_2.set_on_discovery_function([&](const rtps::ParticipantProxyData& info) -> bool
+    participant_2.set_on_discovery_function([&](const rtps::ParticipantBuiltinTopicData& info) -> bool
             {
                 std::cout << "Received Property Qos: ";
 
                 // Check the external has arrived and the internal does not
                 bool property_received = false;
-                for (auto i : info.m_properties)
+                for (auto i : info.properties)
                 {
                     std::cout << i.first() << " :{ " << i.second() << " } ; ";
 
diff --git a/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp b/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp
index 99150c6b925..de680e8de2f 100644
--- a/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp
@@ -190,7 +190,7 @@ static bool has_shm_locators(
 }
 
 static void check_shm_locators(
-        const eprosima::fastdds::rtps::ParticipantProxyData& info,
+        const eprosima::fastdds::rtps::ParticipantBuiltinTopicData& info,
         bool unicast,
         bool multicast)
 {
@@ -207,7 +207,7 @@ static void shm_metatraffic_test(
     PubSubWriter<HelloWorldPubSubType> writer(topic_name + "/" + value);
     PubSubReader<HelloWorldPubSubType> reader(topic_name + "/" + value);
 
-    auto discovery_checker = [unicast, multicast](const eprosima::fastdds::rtps::ParticipantProxyData& info)
+    auto discovery_checker = [unicast, multicast](const eprosima::fastdds::rtps::ParticipantBuiltinTopicData& info, eprosima::fastdds::rtps::PARTICIPANT_DISCOVERY_STATUS /*status*/)
             {
                 check_shm_locators(info, unicast, multicast);
                 return true;
diff --git a/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp b/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp
index aeb864efb43..fd999acc5e1 100644
--- a/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp
@@ -14,10 +14,10 @@
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/LibrarySettings.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/common/Types.hpp>
 #include <gtest/gtest.h>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include "BlackboxTests.hpp"
 #include "PubSubParticipant.hpp"
 
@@ -84,25 +84,25 @@ TEST_P(UserDataQos, update_user_data_qos)
 
     PubSubParticipant<HelloWorldPubSubType> participant_2(0u, 0u, 0u, 0u);
 
-    participant_2.set_on_discovery_function([&](const rtps::ParticipantProxyData& info) -> bool
+    participant_2.set_on_discovery_function([&](const rtps::ParticipantBuiltinTopicData& info) -> bool
             {
                 std::cout << "Received USER_DATA: ";
-                for (auto i : info.m_userData)
+                for (auto i : info.user_data)
                 {
                     std::cout << i << ' ';
                 }
                 std::cout << std::endl;
-                return info.m_userData == std::vector<rtps::octet>({'a', 'b', 'c', 'd', 'e'});
+                return info.user_data == std::vector<rtps::octet>({'a', 'b', 'c', 'd', 'e'});
             });
-    participant_2.set_on_participant_qos_update_function([&](const rtps::ParticipantProxyData& info) -> bool
+    participant_2.set_on_participant_qos_update_function([&](const rtps::ParticipantBuiltinTopicData& info) -> bool
             {
                 std::cout << "Received USER_DATA: ";
-                for (auto i : info.m_userData)
+                for (auto i : info.user_data)
                 {
                     std::cout << i << ' ';
                 }
                 std::cout << std::endl;
-                return info.m_userData == std::vector<rtps::octet>({'f', 'g'});
+                return info.user_data == std::vector<rtps::octet>({'f', 'g'});
             });
 
     ASSERT_TRUE(participant_2.init_participant());
diff --git a/test/dds/communication/PublisherModule.hpp b/test/dds/communication/PublisherModule.hpp
index ff6632a0352..4ffdde91722 100644
--- a/test/dds/communication/PublisherModule.hpp
+++ b/test/dds/communication/PublisherModule.hpp
@@ -19,19 +19,18 @@
 #ifndef TEST_DDS_COMMUNICATION_PUBLISHERMODULE_HPP
 #define TEST_DDS_COMMUNICATION_PUBLISHERMODULE_HPP
 
+#include <mutex>
+#include <condition_variable>
+
 #include <fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp>
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/publisher/PublisherListener.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 
 #include "types/FixedSizedPubSubTypes.hpp"
 #include "types/HelloWorldPubSubTypes.hpp"
 
-#include <mutex>
-#include <condition_variable>
-
 namespace eprosima {
 namespace fastdds {
 namespace dds {
diff --git a/test/dds/communication/SubscriberModule.hpp b/test/dds/communication/SubscriberModule.hpp
index 867dad417b9..ad90ab9edba 100644
--- a/test/dds/communication/SubscriberModule.hpp
+++ b/test/dds/communication/SubscriberModule.hpp
@@ -19,21 +19,20 @@
 #ifndef TEST_COMMUNICATION_SUBSCRIBER_HPP
 #define TEST_COMMUNICATION_SUBSCRIBER_HPP
 
+#include <mutex>
+#include <condition_variable>
+#include <map>
+#include <chrono>
+
 #include <fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp>
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/subscriber/SubscriberListener.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 
 #include "types/FixedSizedPubSubTypes.hpp"
 #include "types/HelloWorldPubSubTypes.hpp"
 
-#include <mutex>
-#include <condition_variable>
-#include <map>
-#include <chrono>
-
 namespace eprosima {
 namespace fastdds {
 namespace dds {
diff --git a/test/dds/communication/security/PublisherModule.hpp b/test/dds/communication/security/PublisherModule.hpp
index 3312a098af5..f26b54345bb 100644
--- a/test/dds/communication/security/PublisherModule.hpp
+++ b/test/dds/communication/security/PublisherModule.hpp
@@ -19,19 +19,18 @@
 #ifndef TEST_DDS_COMMUNICATION_PUBLISHERMODULE_HPP
 #define TEST_DDS_COMMUNICATION_PUBLISHERMODULE_HPP
 
+#include <mutex>
+#include <condition_variable>
+
 #include <fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp>
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/publisher/PublisherListener.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 
 #include "types/FixedSizedPubSubTypes.hpp"
 #include "types/HelloWorldPubSubTypes.hpp"
 
-#include <mutex>
-#include <condition_variable>
-
 namespace eprosima {
 namespace fastdds {
 namespace dds {
diff --git a/test/dds/communication/security/SubscriberModule.hpp b/test/dds/communication/security/SubscriberModule.hpp
index 47dcceeafba..22f82e37bc7 100644
--- a/test/dds/communication/security/SubscriberModule.hpp
+++ b/test/dds/communication/security/SubscriberModule.hpp
@@ -19,21 +19,21 @@
 #ifndef TEST_COMMUNICATION_SUBSCRIBER_HPP
 #define TEST_COMMUNICATION_SUBSCRIBER_HPP
 
+#include <mutex>
+#include <condition_variable>
+#include <map>
+#include <chrono>
+
 #include <fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp>
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/subscriber/SubscriberListener.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include "types/FixedSizedPubSubTypes.hpp"
 #include "types/HelloWorldPubSubTypes.hpp"
 
-#include <mutex>
-#include <condition_variable>
-#include <map>
-#include <chrono>
-
 namespace eprosima {
 namespace fastdds {
 namespace dds {
diff --git a/test/dds/discovery/ParticipantModule.cpp b/test/dds/discovery/ParticipantModule.cpp
index 4dd1bf7199b..ab21700aeca 100644
--- a/test/dds/discovery/ParticipantModule.cpp
+++ b/test/dds/discovery/ParticipantModule.cpp
@@ -26,7 +26,6 @@
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/common/Locator.hpp>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp>
 #include <fastdds/utils/IPLocator.hpp>
diff --git a/test/dds/discovery/ParticipantModule.hpp b/test/dds/discovery/ParticipantModule.hpp
index 0b033a6a94c..7de87338838 100644
--- a/test/dds/discovery/ParticipantModule.hpp
+++ b/test/dds/discovery/ParticipantModule.hpp
@@ -25,7 +25,6 @@
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.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 da2c4faca39..c0bad8430a3 100644
--- a/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h
+++ b/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h
@@ -20,7 +20,6 @@
 #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.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <rtps/messages/CDRMessage.hpp>
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 fa715adc6e2..2c0ac9f2575 100644
--- a/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h
+++ b/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h
@@ -21,8 +21,8 @@
 
 #include <gmock/gmock.h>
 
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/BuiltinProtocols.h>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/messages/CDRMessage.hpp>
 #include <utils/ProxyPool.hpp>
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 53a44058b4d..ecdfff04ee2 100644
--- a/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h
+++ b/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h
@@ -21,9 +21,8 @@
 
 #include <gmock/gmock.h>
 
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
-
 #include <rtps/builtin/BuiltinProtocols.h>
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/messages/CDRMessage.hpp>
 
diff --git a/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp b/test/mock/rtps/ParticipantProxyData/rtps/builtin/data/ParticipantProxyData.hpp
similarity index 100%
rename from test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp
rename to test/mock/rtps/ParticipantProxyData/rtps/builtin/data/ParticipantProxyData.hpp
diff --git a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.hpp b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.hpp
index 50242b7a475..710db1c0d09 100644
--- a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.hpp
+++ b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.hpp
@@ -29,9 +29,9 @@
 #include <fastdds/dds/subscriber/qos/ReaderQos.hpp>
 #include <fastdds/fastdds_dll.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/common/Guid.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/reader/StatefulReader.hpp>
 #include <rtps/resources/ResourceEvent.h>
 #include <statistics/rtps/monitor-service/Interfaces.hpp>
diff --git a/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h b/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
index 9da1d7db997..9e07651f032 100644
--- a/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
+++ b/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h
@@ -55,7 +55,6 @@ class WriterListener;
 class ReaderListener;
 class PDPSimple;
 struct EntityId_t;
-class ParticipantProxyData;
 class ReaderProxyData;
 class WriterProxyData;
 class ReaderAttributes;
@@ -81,7 +80,7 @@ class MockParticipantListener : public RTPSParticipantListener
         on_participant_discovery_mock(participant, status, info, should_be_ignored);
     }
 
-    MOCK_METHOD3(on_participant_discovery_mock, void (RTPSParticipant*, PARTICIPANT_DISCOVERY_STATUS, const ParticipantBuiltinTopicData&, bool&));
+    MOCK_METHOD4(on_participant_discovery_mock, void (RTPSParticipant*, PARTICIPANT_DISCOVERY_STATUS, const ParticipantBuiltinTopicData&, bool&));
 
 #if HAVE_SECURITY
     void onParticipantAuthentication(
diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h
index 2806b56c983..9aab08f3443 100644
--- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h
+++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h
@@ -21,8 +21,8 @@
 
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/security/accesscontrol/AccessControl.h>
 #include <gmock/gmock.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 87015354927..93d28fa9cec 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
@@ -20,12 +20,13 @@
 #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.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/LocatorList.hpp>
 #include <fastdds/rtps/common/LocatorSelectorEntry.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
+
 namespace eprosima {
 namespace fastdds {
 namespace rtps {
diff --git a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
index ed21dab841f..742f4660948 100644
--- a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
+++ b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
@@ -21,7 +21,6 @@
 #include <fastdds/core/policy/ParameterSerializer.hpp>
 #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.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 #include <fastdds/rtps/common/CacheChange.hpp>
@@ -30,6 +29,7 @@
 #include <fastdds/rtps/common/Types.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/messages/CDRMessage.hpp>
 #include <rtps/network/NetworkFactory.h>
 
diff --git a/test/unittest/rtps/network/ExternalLocatorsTests.cpp b/test/unittest/rtps/network/ExternalLocatorsTests.cpp
index f2fe5d3784e..3a25eaf8191 100644
--- a/test/unittest/rtps/network/ExternalLocatorsTests.cpp
+++ b/test/unittest/rtps/network/ExternalLocatorsTests.cpp
@@ -17,6 +17,7 @@
 #include <fastdds/rtps/common/LocatorWithMask.hpp>
 #include <fastdds/utils/IPLocator.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/network/utils/external_locators.hpp>
 
 using namespace eprosima::fastdds::rtps;
diff --git a/test/unittest/rtps/security/SecurityHandshakeProcessTests.cpp b/test/unittest/rtps/security/SecurityHandshakeProcessTests.cpp
index 0f6b1c6ba11..927745602f7 100644
--- a/test/unittest/rtps/security/SecurityHandshakeProcessTests.cpp
+++ b/test/unittest/rtps/security/SecurityHandshakeProcessTests.cpp
@@ -14,6 +14,8 @@
 
 #include "SecurityTests.hpp"
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
+
 TEST_F(SecurityTest, discovered_participant_begin_handshake_request_fail_and_then_ok)
 {
     initialization_ok();
diff --git a/test/unittest/rtps/security/SecurityTests.hpp b/test/unittest/rtps/security/SecurityTests.hpp
index dc3f8605679..ddd1483d6a7 100644
--- a/test/unittest/rtps/security/SecurityTests.hpp
+++ b/test/unittest/rtps/security/SecurityTests.hpp
@@ -17,9 +17,10 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/history/ReaderHistory.hpp>
 #include <fastdds/rtps/history/WriterHistory.hpp>
+
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
diff --git a/test/unittest/rtps/security/SecurityValidationRemoteTests.cpp b/test/unittest/rtps/security/SecurityValidationRemoteTests.cpp
index 05dff8a1414..7f6e2cbb3a8 100644
--- a/test/unittest/rtps/security/SecurityValidationRemoteTests.cpp
+++ b/test/unittest/rtps/security/SecurityValidationRemoteTests.cpp
@@ -14,6 +14,8 @@
 
 #include "SecurityTests.hpp"
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
+
 TEST_F(SecurityTest, discovered_participant_validation_remote_identity_fail)
 {
     initialization_ok();
diff --git a/test/unittest/security/accesscontrol/AccessControlTests.cpp b/test/unittest/security/accesscontrol/AccessControlTests.cpp
index f918bec3a93..86c03ea07be 100644
--- a/test/unittest/security/accesscontrol/AccessControlTests.cpp
+++ b/test/unittest/security/accesscontrol/AccessControlTests.cpp
@@ -16,9 +16,10 @@
 
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
+
+#include <rtps/builtin/data/ParticipantProxyData.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 bf2c173bb4a..350c7ba6bba 100644
--- a/test/unittest/security/authentication/AuthenticationPluginTests.hpp
+++ b/test/unittest/security/authentication/AuthenticationPluginTests.hpp
@@ -19,10 +19,10 @@
 
 // Include first necessary mocks
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/builtin/data/ParticipantProxyData.hpp>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.hpp>
 
+#include <rtps/builtin/data/ParticipantProxyData.hpp>
 #include <security/authentication/PKIDH.h>
 #include <security/OpenSSLInit.hpp>