From e3c6f58935f97ab8f50d6b23295af59c8fff4e83 Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Tue, 9 Apr 2024 15:49:53 +0200
Subject: [PATCH 1/6] Refs #20765: Make StatefulPersistentReader private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
---
 src/cpp/rtps/participant/RTPSParticipantImpl.cpp                | 2 +-
 src/cpp/rtps/reader/StatefulPersistentReader.cpp                | 2 +-
 .../fastdds => src/cpp}/rtps/reader/StatefulPersistentReader.h  | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {include/fastdds => src/cpp}/rtps/reader/StatefulPersistentReader.h (100%)

diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
index a5108bd79f7..840c6efe445 100644
--- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
+++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -36,7 +36,6 @@
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/reader/StatefulPersistentReader.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/reader/StatelessPersistentReader.h>
 #include <fastdds/rtps/reader/StatelessReader.h>
@@ -64,6 +63,7 @@
 #include <rtps/network/utils/netmask_filter.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/persistence/PersistenceService.h>
+#include <rtps/reader/StatefulPersistentReader.h>
 #include <statistics/rtps/GuidUtils.hpp>
 #include <utils/Semaphore.hpp>
 #include <utils/string_utilities.hpp>
diff --git a/src/cpp/rtps/reader/StatefulPersistentReader.cpp b/src/cpp/rtps/reader/StatefulPersistentReader.cpp
index d7e958545a3..24770e1abcb 100644
--- a/src/cpp/rtps/reader/StatefulPersistentReader.cpp
+++ b/src/cpp/rtps/reader/StatefulPersistentReader.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/reader/StatefulPersistentReader.h>
+#include <rtps/reader/StatefulPersistentReader.h>
 
 #include <fastdds/rtps/history/ReaderHistory.h>
 
diff --git a/include/fastdds/rtps/reader/StatefulPersistentReader.h b/src/cpp/rtps/reader/StatefulPersistentReader.h
similarity index 100%
rename from include/fastdds/rtps/reader/StatefulPersistentReader.h
rename to src/cpp/rtps/reader/StatefulPersistentReader.h

From 1aebe381b641327a216187a42d1a69fc379597db Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Tue, 9 Apr 2024 16:04:17 +0200
Subject: [PATCH 2/6] Refs #20765: Make StatelessPersistentReader private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
---
 src/cpp/rtps/participant/RTPSParticipantImpl.cpp                | 2 +-
 src/cpp/rtps/reader/StatelessPersistentReader.cpp               | 2 +-
 .../fastdds => src/cpp}/rtps/reader/StatelessPersistentReader.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {include/fastdds => src/cpp}/rtps/reader/StatelessPersistentReader.h (100%)

diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
index 840c6efe445..655ab51ad5f 100644
--- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
+++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -37,7 +37,6 @@
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
-#include <fastdds/rtps/reader/StatelessPersistentReader.h>
 #include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
@@ -64,6 +63,7 @@
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/persistence/PersistenceService.h>
 #include <rtps/reader/StatefulPersistentReader.h>
+#include <rtps/reader/StatelessPersistentReader.h>
 #include <statistics/rtps/GuidUtils.hpp>
 #include <utils/Semaphore.hpp>
 #include <utils/string_utilities.hpp>
diff --git a/src/cpp/rtps/reader/StatelessPersistentReader.cpp b/src/cpp/rtps/reader/StatelessPersistentReader.cpp
index d0c5f1e2c66..db326ac5eee 100644
--- a/src/cpp/rtps/reader/StatelessPersistentReader.cpp
+++ b/src/cpp/rtps/reader/StatelessPersistentReader.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/reader/StatelessPersistentReader.h>
+#include <rtps/reader/StatelessPersistentReader.h>
 
 #include <fastdds/rtps/history/ReaderHistory.h>
 
diff --git a/include/fastdds/rtps/reader/StatelessPersistentReader.h b/src/cpp/rtps/reader/StatelessPersistentReader.h
similarity index 100%
rename from include/fastdds/rtps/reader/StatelessPersistentReader.h
rename to src/cpp/rtps/reader/StatelessPersistentReader.h

From b578bbe99d72bab20319191d3231c1cd608eb294 Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Tue, 9 Apr 2024 16:06:34 +0200
Subject: [PATCH 3/6] Refs #20765: Make StatefulReader private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
---
 .../fastdds/builtin/type_lookup_service/TypeLookupManager.cpp | 2 +-
 .../builtin/type_lookup_service/TypeLookupRequestListener.cpp | 1 +
 src/cpp/fastdds/domain/DomainParticipantImpl.hpp              | 4 +---
 src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp         | 2 +-
 src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp         | 2 +-
 .../rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp    | 2 +-
 src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp          | 3 +--
 .../discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp  | 2 +-
 src/cpp/rtps/builtin/discovery/participant/PDP.cpp            | 2 +-
 src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp      | 2 +-
 src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp      | 2 +-
 src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp      | 2 +-
 .../discovery/participant/simple/SimplePDPEndpointsSecure.hpp | 2 +-
 src/cpp/rtps/builtin/liveliness/WLP.cpp                       | 2 +-
 src/cpp/rtps/participant/RTPSParticipantImpl.cpp              | 2 +-
 src/cpp/rtps/reader/StatefulPersistentReader.h                | 2 +-
 src/cpp/rtps/reader/StatefulReader.cpp                        | 3 ++-
 {include/fastdds => src/cpp}/rtps/reader/StatefulReader.h     | 2 +-
 src/cpp/rtps/reader/WriterProxy.cpp                           | 4 ++--
 src/cpp/rtps/security/SecurityManager.cpp                     | 2 +-
 .../fastdds/rtps/participant/RTPSParticipant.h                | 3 +--
 .../StatefulReader/{fastdds => }/rtps/reader/StatefulReader.h | 0
 test/unittest/rtps/history/ReaderHistoryTests.cpp             | 3 +--
 test/unittest/rtps/reader/WriterProxyAcknackTests.cpp         | 2 +-
 test/unittest/rtps/reader/WriterProxyStopTest.cpp             | 2 +-
 test/unittest/rtps/reader/WriterProxyTests.cpp                | 2 +-
 test/unittest/rtps/security/SecurityTests.hpp                 | 2 +-
 27 files changed, 28 insertions(+), 31 deletions(-)
 rename {include/fastdds => src/cpp}/rtps/reader/StatefulReader.h (99%)
 rename test/mock/rtps/StatefulReader/{fastdds => }/rtps/reader/StatefulReader.h (100%)

diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
index 2b924742abd..0be385afaf6 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
@@ -33,12 +33,12 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatefulReader.h>
 #include <rtps/RTPSDomainImpl.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp
index 608ac76f5f9..3dbee89da41 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp
@@ -24,6 +24,7 @@
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/RTPSDomainImpl.hpp>
+#include <rtps/reader/StatefulReader.h>
 
 using eprosima::fastrtps::rtps::RTPSReader;
 using eprosima::fastrtps::rtps::CacheChange_t;
diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
index b086b9d0d26..97633c5386d 100644
--- a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
+++ b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
@@ -39,11 +39,9 @@
 #include <fastdds/dds/topic/TypeSupport.hpp>
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
-
 #include "fastdds/topic/DDSSQLFilter/DDSFilterFactory.hpp"
 #include <fastdds/topic/TopicProxyFactory.hpp>
-
+#include <rtps/reader/StatefulReader.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp
index 09cb3132888..894fec4dfce 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp
@@ -24,7 +24,7 @@
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.h>
 
 using namespace ::eprosima::fastrtps::rtps;
 
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
index 2d6a6302e26..33a7ba8c7df 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
@@ -33,7 +33,6 @@
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include <rtps/builtin/BuiltinProtocols.h>
@@ -42,6 +41,7 @@
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
+#include <rtps/reader/StatefulReader.h>
 #ifdef FASTDDS_STATISTICS
 #include <statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp>
 #endif //FASTDDS_STATISTICS
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
index 5a3deab0908..9ec2be521ae 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
@@ -29,13 +29,13 @@
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <rtps/builtin/discovery/endpoint/EDPSimple.h>
 #include <rtps/builtin/discovery/participant/PDPSimple.h>
 #include <rtps/network/NetworkFactory.h>
+#include <rtps/reader/StatefulReader.h>
 
 using ParameterList = eprosima::fastdds::dds::ParameterList;
 
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp
index 34cf30687e0..0cd4ca2d50c 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp
@@ -25,14 +25,13 @@
 #include <fastdds/rtps/common/EntityId_t.hpp>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include <rtps/history/ITopicPayloadPool.h>
 #include <rtps/history/PoolConfig.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
-
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatefulReader.h>
 
 #include <memory>
 #include <string>
diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp
index 84c9bf7c9ac..0f224ee3066 100644
--- a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp
@@ -22,13 +22,13 @@
 #include <memory>
 
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include <rtps/builtin/BuiltinReader.hpp>
 #include <rtps/builtin/BuiltinWriter.hpp>
 #include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
 #include <rtps/history/ITopicPayloadPool.h>
+#include <rtps/reader/StatefulReader.h>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
index a57349827bd..5e4c1b8069b 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -33,7 +33,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/writer/StatelessWriter.h>
 
@@ -50,6 +49,7 @@
 #include <rtps/network/utils/external_locators.hpp>
 #include <rtps/resources/TimedEvent.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatefulReader.h>
 #include <utils/shared_mutex.hpp>
 #include <utils/TimeConversion.hpp>
 
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
index f41b1ed59fd..ecc8503a876 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
@@ -32,7 +32,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/writer/ReaderProxy.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
 
@@ -46,6 +45,7 @@
 #include <rtps/builtin/discovery/participant/timedevent/DSClientEvent.h>
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatefulReader.h>
 #include <utils/shared_mutex.hpp>
 #include <utils/SystemInfo.hpp>
 #include <utils/TimeConversion.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
index 9ce04ef45e4..8531a56008e 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
@@ -28,7 +28,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
 #include <fastdds/utils/TimedMutex.hpp>
 
@@ -47,6 +46,7 @@
 #include <rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp>
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatefulReader.h>
 #include <utils/TimeConversion.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
index b585720184b..7c9265af0fb 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -27,7 +27,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/writer/StatelessWriter.h>
 
@@ -44,6 +43,7 @@
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatefulReader.h>
 #include <rtps/resources/TimedEvent.h>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpointsSecure.hpp b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpointsSecure.hpp
index 8d8560cada1..589edf6d090 100644
--- a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpointsSecure.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpointsSecure.hpp
@@ -22,13 +22,13 @@
 #include <memory>
 
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include <rtps/builtin/BuiltinReader.hpp>
 #include <rtps/builtin/BuiltinWriter.hpp>
 #include <rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp>
 #include <rtps/history/ITopicPayloadPool.h>
+#include <rtps/reader/StatefulReader.h>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/liveliness/WLP.cpp b/src/cpp/rtps/builtin/liveliness/WLP.cpp
index 2e62081f1d1..12c35aa24f3 100644
--- a/src/cpp/rtps/builtin/liveliness/WLP.cpp
+++ b/src/cpp/rtps/builtin/liveliness/WLP.cpp
@@ -27,7 +27,6 @@
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
 
 #include <fastdds/rtps/writer/StatefulWriter.h>
@@ -38,6 +37,7 @@
 #include <rtps/builtin/liveliness/WLPListener.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatefulReader.h>
 #include <rtps/resources/TimedEvent.h>
 #include <rtps/writer/LivelinessManager.hpp>
 #include <utils/TimeConversion.hpp>
diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
index 655ab51ad5f..eaf8b8553da 100644
--- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
+++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -36,7 +36,6 @@
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
@@ -64,6 +63,7 @@
 #include <rtps/persistence/PersistenceService.h>
 #include <rtps/reader/StatefulPersistentReader.h>
 #include <rtps/reader/StatelessPersistentReader.h>
+#include <rtps/reader/StatefulReader.h>
 #include <statistics/rtps/GuidUtils.hpp>
 #include <utils/Semaphore.hpp>
 #include <utils/string_utilities.hpp>
diff --git a/src/cpp/rtps/reader/StatefulPersistentReader.h b/src/cpp/rtps/reader/StatefulPersistentReader.h
index 77ef0c0951e..0801bf11690 100644
--- a/src/cpp/rtps/reader/StatefulPersistentReader.h
+++ b/src/cpp/rtps/reader/StatefulPersistentReader.h
@@ -21,7 +21,7 @@
 #define _FASTDDS_RTPS_STATEFULPERSISTENTREADER_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/reader/StatefulReader.cpp b/src/cpp/rtps/reader/StatefulReader.cpp
index 879003a7115..dfb601d5368 100644
--- a/src/cpp/rtps/reader/StatefulReader.cpp
+++ b/src/cpp/rtps/reader/StatefulReader.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include <rtps/reader/StatefulReader.h>
+
 #include <cassert>
 #include <mutex>
 #include <thread>
@@ -25,7 +27,6 @@
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/liveliness/WLP.h>
diff --git a/include/fastdds/rtps/reader/StatefulReader.h b/src/cpp/rtps/reader/StatefulReader.h
similarity index 99%
rename from include/fastdds/rtps/reader/StatefulReader.h
rename to src/cpp/rtps/reader/StatefulReader.h
index 41ae9edcc04..3ec511b5d8a 100644
--- a/include/fastdds/rtps/reader/StatefulReader.h
+++ b/src/cpp/rtps/reader/StatefulReader.h
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 /**
- * @file StatefulReader.h
+ * @file .h
  */
 
 #ifndef _FASTDDS_RTPS_READER_STATEFULREADER_H_
diff --git a/src/cpp/rtps/reader/WriterProxy.cpp b/src/cpp/rtps/reader/WriterProxy.cpp
index 907203b86b6..6bb1189d3f8 100644
--- a/src/cpp/rtps/reader/WriterProxy.cpp
+++ b/src/cpp/rtps/reader/WriterProxy.cpp
@@ -21,16 +21,16 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <rtps/messages/RTPSMessageCreator.hpp>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 
 #include "rtps/RTPSDomainImpl.hpp"
 #include "utils/collections/node_size_helpers.hpp"
+#include <rtps/messages/RTPSMessageCreator.hpp>
 #include <rtps/network/utils/external_locators.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/resources/TimedEvent.h>
+#include <rtps/reader/StatefulReader.h>
 
 #if !defined(NDEBUG) && !defined(ANDROID) && defined(FASTDDS_SOURCE) && defined(__unix__)
 #define SHOULD_DEBUG_LINUX
diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp
index d2b586b969f..1c37ca74b85 100644
--- a/src/cpp/rtps/security/SecurityManager.cpp
+++ b/src/cpp/rtps/security/SecurityManager.cpp
@@ -31,7 +31,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/security/accesscontrol/AccessControl.h>
 #include <fastdds/rtps/security/accesscontrol/EndpointSecurityAttributes.h>
@@ -47,6 +46,7 @@
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/network/NetworkFactory.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatefulReader.h>
 #include <security/OpenSSLInit.hpp>
 
 #define BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_WRITER (1 << 20)
diff --git a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h
index 0ea712ba9c5..6d6a7c79026 100644
--- a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h
+++ b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h
@@ -26,10 +26,9 @@
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
 #include <fastdds/rtps/common/Guid.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
 #include <fastdds/fastdds_dll.hpp>
-
+#include <rtps/reader/StatefulReader.h>
 #include <statistics/rtps/monitor-service/Interfaces.hpp>
 
 namespace eprosima {
diff --git a/test/mock/rtps/StatefulReader/fastdds/rtps/reader/StatefulReader.h b/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.h
similarity index 100%
rename from test/mock/rtps/StatefulReader/fastdds/rtps/reader/StatefulReader.h
rename to test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.h
diff --git a/test/unittest/rtps/history/ReaderHistoryTests.cpp b/test/unittest/rtps/history/ReaderHistoryTests.cpp
index 4f82977b609..6b30af79f1a 100644
--- a/test/unittest/rtps/history/ReaderHistoryTests.cpp
+++ b/test/unittest/rtps/history/ReaderHistoryTests.cpp
@@ -20,10 +20,9 @@
 #include <gmock/gmock.h>
 
 #include <fastdds/rtps/history/ReaderHistory.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/utils/TimedMutex.hpp>
-
 #include <rtps/common/ChangeComparison.hpp>
+#include <rtps/reader/StatefulReader.h>
 
 
 using namespace eprosima::fastrtps;
diff --git a/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp b/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp
index 6d75c509181..ba540487a0d 100644
--- a/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp
+++ b/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp
@@ -23,8 +23,8 @@
 
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatefulReader.h>
 #include <rtps/reader/WriterProxy.h>
 #include <rtps/reader/WriterProxy.cpp>
 #include <rtps/resources/TimedEvent.h>
diff --git a/test/unittest/rtps/reader/WriterProxyStopTest.cpp b/test/unittest/rtps/reader/WriterProxyStopTest.cpp
index bab10b6a294..ed0935b6e23 100644
--- a/test/unittest/rtps/reader/WriterProxyStopTest.cpp
+++ b/test/unittest/rtps/reader/WriterProxyStopTest.cpp
@@ -19,9 +19,9 @@
 
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatefulReader.h>
 #include <rtps/reader/WriterProxy.h>
 #include <rtps/reader/WriterProxy.cpp>
 #include <rtps/resources/TimedEvent.h>
diff --git a/test/unittest/rtps/reader/WriterProxyTests.cpp b/test/unittest/rtps/reader/WriterProxyTests.cpp
index 493bc644bef..7786baa7975 100644
--- a/test/unittest/rtps/reader/WriterProxyTests.cpp
+++ b/test/unittest/rtps/reader/WriterProxyTests.cpp
@@ -23,8 +23,8 @@
 
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatefulReader.h>
 #include <rtps/reader/WriterProxy.h>
 #include <rtps/reader/WriterProxy.cpp>
 #include <rtps/resources/TimedEvent.h>
diff --git a/test/unittest/rtps/security/SecurityTests.hpp b/test/unittest/rtps/security/SecurityTests.hpp
index ccb14129f64..644e22881ab 100644
--- a/test/unittest/rtps/security/SecurityTests.hpp
+++ b/test/unittest/rtps/security/SecurityTests.hpp
@@ -20,7 +20,6 @@
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
 #include <fastdds/rtps/security/common/Handle.h>
@@ -29,6 +28,7 @@
 
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatefulReader.h>
 #include <rtps/security/MockAuthenticationPlugin.h>
 #include <rtps/security/MockCryptographyPlugin.h>
 #include <rtps/security/SecurityManager.h>

From fc4745738b3d2a7ad02ab98aea7a88e2c8e451f8 Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Tue, 9 Apr 2024 16:23:05 +0200
Subject: [PATCH 4/6] Refs #20765: Make StatelessReader private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
---
 .../participant/DS/DiscoveryServerPDPEndpointsSecure.hpp       | 3 +--
 src/cpp/rtps/builtin/discovery/participant/PDP.cpp             | 2 +-
 src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp       | 2 +-
 .../discovery/participant/simple/SimplePDPEndpoints.hpp        | 3 +--
 src/cpp/rtps/participant/RTPSParticipantImpl.cpp               | 2 +-
 src/cpp/rtps/reader/StatelessPersistentReader.h                | 2 +-
 src/cpp/rtps/reader/StatelessReader.cpp                        | 2 +-
 {include/fastdds => src/cpp}/rtps/reader/StatelessReader.h     | 0
 src/cpp/rtps/security/SecurityManager.cpp                      | 2 +-
 .../{fastdds => }/rtps/reader/StatelessReader.h                | 0
 test/unittest/dds/subscriber/DataReaderHistoryTests.cpp        | 2 +-
 test/unittest/rtps/security/SecurityTests.hpp                  | 2 +-
 12 files changed, 10 insertions(+), 12 deletions(-)
 rename {include/fastdds => src/cpp}/rtps/reader/StatelessReader.h (100%)
 rename test/mock/rtps/StatelessReader/{fastdds => }/rtps/reader/StatelessReader.h (100%)

diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp
index 150167ac954..a8ec878e3bf 100644
--- a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp
@@ -23,10 +23,9 @@
 
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
 #include <fastdds/rtps/common/EntityId_t.hpp>
-#include <fastdds/rtps/reader/StatelessReader.h>
-
 #include <rtps/builtin/BuiltinReader.hpp>
 #include <rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp>
+#include <rtps/reader/StatelessReader.h>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
index 5e4c1b8069b..5094f2cfbaa 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -33,7 +33,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/writer/StatelessWriter.h>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
@@ -50,6 +49,7 @@
 #include <rtps/resources/TimedEvent.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatelessReader.h>
 #include <utils/shared_mutex.hpp>
 #include <utils/TimeConversion.hpp>
 
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
index 7c9265af0fb..73dda8f7099 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -27,7 +27,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/writer/StatelessWriter.h>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
@@ -45,6 +44,7 @@
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.h>
 #include <rtps/resources/TimedEvent.h>
+#include <rtps/reader/StatelessReader.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp
index 4e1caeea91a..a405b501426 100644
--- a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp
@@ -22,13 +22,12 @@
 #include <memory>
 
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
-#include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/writer/StatelessWriter.h>
-
 #include <rtps/builtin/BuiltinReader.hpp>
 #include <rtps/builtin/BuiltinWriter.hpp>
 #include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
 #include <rtps/history/ITopicPayloadPool.h>
+#include <rtps/reader/StatelessReader.h>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
index eaf8b8553da..51cff850fa9 100644
--- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
+++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -36,7 +36,6 @@
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
-#include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.h>
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
@@ -64,6 +63,7 @@
 #include <rtps/reader/StatefulPersistentReader.h>
 #include <rtps/reader/StatelessPersistentReader.h>
 #include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatelessReader.h>
 #include <statistics/rtps/GuidUtils.hpp>
 #include <utils/Semaphore.hpp>
 #include <utils/string_utilities.hpp>
diff --git a/src/cpp/rtps/reader/StatelessPersistentReader.h b/src/cpp/rtps/reader/StatelessPersistentReader.h
index 71371f6f00c..cb775976999 100644
--- a/src/cpp/rtps/reader/StatelessPersistentReader.h
+++ b/src/cpp/rtps/reader/StatelessPersistentReader.h
@@ -21,7 +21,7 @@
 #define _FASTDDS_RTPS_STATELESSPERSISTENTREADER_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatelessReader.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/reader/StatelessReader.cpp b/src/cpp/rtps/reader/StatelessReader.cpp
index 750eae24afb..e535e1c58f9 100644
--- a/src/cpp/rtps/reader/StatelessReader.cpp
+++ b/src/cpp/rtps/reader/StatelessReader.cpp
@@ -26,13 +26,13 @@
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/reader/StatelessReader.h>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/DataSharing/DataSharingListener.hpp>
 #include <rtps/DataSharing/ReaderPool.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/reader/StatelessReader.h>
 #include <rtps/writer/LivelinessManager.hpp>
 
 #include "rtps/RTPSDomainImpl.hpp"
diff --git a/include/fastdds/rtps/reader/StatelessReader.h b/src/cpp/rtps/reader/StatelessReader.h
similarity index 100%
rename from include/fastdds/rtps/reader/StatelessReader.h
rename to src/cpp/rtps/reader/StatelessReader.h
diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp
index 1c37ca74b85..6daca9e4a49 100644
--- a/src/cpp/rtps/security/SecurityManager.cpp
+++ b/src/cpp/rtps/security/SecurityManager.cpp
@@ -31,7 +31,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/security/accesscontrol/AccessControl.h>
 #include <fastdds/rtps/security/accesscontrol/EndpointSecurityAttributes.h>
 #include <fastdds/rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
@@ -47,6 +46,7 @@
 #include <rtps/network/NetworkFactory.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatelessReader.h>
 #include <security/OpenSSLInit.hpp>
 
 #define BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_WRITER (1 << 20)
diff --git a/test/mock/rtps/StatelessReader/fastdds/rtps/reader/StatelessReader.h b/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.h
similarity index 100%
rename from test/mock/rtps/StatelessReader/fastdds/rtps/reader/StatelessReader.h
rename to test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.h
diff --git a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
index 3fd9fc0c827..f62c6f52d51 100644
--- a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
+++ b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
@@ -3,7 +3,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
-#include <fastdds/rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatelessReader.h>
 
 
 #include <gmock/gmock.h>
diff --git a/test/unittest/rtps/security/SecurityTests.hpp b/test/unittest/rtps/security/SecurityTests.hpp
index 644e22881ab..eee75639488 100644
--- a/test/unittest/rtps/security/SecurityTests.hpp
+++ b/test/unittest/rtps/security/SecurityTests.hpp
@@ -20,7 +20,6 @@
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/reader/StatelessReader.h>
 #include <fastdds/rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
 #include <fastdds/rtps/security/common/Handle.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
@@ -29,6 +28,7 @@
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatelessReader.h>
 #include <rtps/security/MockAuthenticationPlugin.h>
 #include <rtps/security/MockCryptographyPlugin.h>
 #include <rtps/security/SecurityManager.h>

From f47830efbd79a93b15cdc361ea05fb6f8ed249d7 Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Fri, 24 May 2024 11:56:41 +0200
Subject: [PATCH 5/6] Refs #20765: Make .h files .hpp

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
---
 .../builtin/type_lookup_service/TypeLookupManager.cpp     | 2 +-
 .../type_lookup_service/TypeLookupRequestListener.cpp     | 2 +-
 src/cpp/fastdds/domain/DomainParticipantImpl.hpp          | 2 +-
 src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp     | 2 +-
 src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp     | 2 +-
 .../builtin/discovery/endpoint/EDPSimpleListeners.cpp     | 2 +-
 src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp      | 2 +-
 .../participant/DS/DiscoveryServerPDPEndpoints.hpp        | 2 +-
 .../participant/DS/DiscoveryServerPDPEndpointsSecure.hpp  | 2 +-
 src/cpp/rtps/builtin/discovery/participant/PDP.cpp        | 4 ++--
 src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp  | 2 +-
 src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp  | 2 +-
 src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp  | 4 ++--
 .../discovery/participant/simple/SimplePDPEndpoints.hpp   | 2 +-
 .../participant/simple/SimplePDPEndpointsSecure.hpp       | 2 +-
 src/cpp/rtps/builtin/liveliness/WLP.cpp                   | 2 +-
 src/cpp/rtps/participant/RTPSParticipantImpl.cpp          | 8 ++++----
 src/cpp/rtps/reader/StatefulPersistentReader.cpp          | 2 +-
 ...fulPersistentReader.h => StatefulPersistentReader.hpp} | 4 ++--
 src/cpp/rtps/reader/StatefulReader.cpp                    | 2 +-
 .../rtps/reader/{StatefulReader.h => StatefulReader.hpp}  | 2 +-
 src/cpp/rtps/reader/StatelessPersistentReader.cpp         | 2 +-
 ...ssPersistentReader.h => StatelessPersistentReader.hpp} | 2 +-
 src/cpp/rtps/reader/StatelessReader.cpp                   | 2 +-
 .../reader/{StatelessReader.h => StatelessReader.hpp}     | 2 +-
 src/cpp/rtps/reader/WriterProxy.cpp                       | 2 +-
 src/cpp/rtps/security/SecurityManager.cpp                 | 4 ++--
 .../fastdds/rtps/participant/RTPSParticipant.h            | 2 +-
 .../rtps/reader/{StatefulReader.h => StatefulReader.hpp}  | 0
 .../reader/{StatelessReader.h => StatelessReader.hpp}     | 0
 test/unittest/dds/subscriber/DataReaderHistoryTests.cpp   | 2 +-
 test/unittest/rtps/history/ReaderHistoryTests.cpp         | 2 +-
 test/unittest/rtps/reader/WriterProxyAcknackTests.cpp     | 2 +-
 test/unittest/rtps/reader/WriterProxyStopTest.cpp         | 2 +-
 test/unittest/rtps/reader/WriterProxyTests.cpp            | 2 +-
 test/unittest/rtps/security/SecurityTests.hpp             | 4 ++--
 36 files changed, 42 insertions(+), 42 deletions(-)
 rename src/cpp/rtps/reader/{StatefulPersistentReader.h => StatefulPersistentReader.hpp} (97%)
 rename src/cpp/rtps/reader/{StatefulReader.h => StatefulReader.hpp} (99%)
 rename src/cpp/rtps/reader/{StatelessPersistentReader.h => StatelessPersistentReader.hpp} (98%)
 rename src/cpp/rtps/reader/{StatelessReader.h => StatelessReader.hpp} (99%)
 rename test/mock/rtps/StatefulReader/rtps/reader/{StatefulReader.h => StatefulReader.hpp} (100%)
 rename test/mock/rtps/StatelessReader/rtps/reader/{StatelessReader.h => StatelessReader.hpp} (100%)

diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
index 0be385afaf6..83fbe3ab879 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
@@ -38,7 +38,7 @@
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 #include <rtps/RTPSDomainImpl.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp
index 3dbee89da41..b185ed4b4bb 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupRequestListener.cpp
@@ -24,7 +24,7 @@
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/RTPSDomainImpl.hpp>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 
 using eprosima::fastrtps::rtps::RTPSReader;
 using eprosima::fastrtps::rtps::CacheChange_t;
diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
index 97633c5386d..6b7991bcc4d 100644
--- a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
+++ b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp
@@ -41,7 +41,7 @@
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
 #include "fastdds/topic/DDSSQLFilter/DDSFilterFactory.hpp"
 #include <fastdds/topic/TopicProxyFactory.hpp>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp
index 894fec4dfce..d9b4504ba71 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp
@@ -24,7 +24,7 @@
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 
 using namespace ::eprosima::fastrtps::rtps;
 
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
index 33a7ba8c7df..e8acca55800 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
@@ -41,7 +41,7 @@
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 #ifdef FASTDDS_STATISTICS
 #include <statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp>
 #endif //FASTDDS_STATISTICS
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
index 9ec2be521ae..cb45665ab28 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp
@@ -35,7 +35,7 @@
 #include <rtps/builtin/discovery/endpoint/EDPSimple.h>
 #include <rtps/builtin/discovery/participant/PDPSimple.h>
 #include <rtps/network/NetworkFactory.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 
 using ParameterList = eprosima::fastdds::dds::ParameterList;
 
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp
index 0cd4ca2d50c..b1af33ec453 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp
@@ -31,7 +31,7 @@
 #include <rtps/history/PoolConfig.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 
 #include <memory>
 #include <string>
diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp
index 0f224ee3066..d01eca63cd2 100644
--- a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp
@@ -28,7 +28,7 @@
 #include <rtps/builtin/BuiltinWriter.hpp>
 #include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
 #include <rtps/history/ITopicPayloadPool.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp
index a8ec878e3bf..5fdc48d0f97 100644
--- a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpointsSecure.hpp
@@ -25,7 +25,7 @@
 #include <fastdds/rtps/common/EntityId_t.hpp>
 #include <rtps/builtin/BuiltinReader.hpp>
 #include <rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp>
-#include <rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatelessReader.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
index 5094f2cfbaa..d6cc00f23e6 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -48,8 +48,8 @@
 #include <rtps/network/utils/external_locators.hpp>
 #include <rtps/resources/TimedEvent.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/reader/StatefulReader.h>
-#include <rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatefulReader.hpp>
+#include <rtps/reader/StatelessReader.hpp>
 #include <utils/shared_mutex.hpp>
 #include <utils/TimeConversion.hpp>
 
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
index ecc8503a876..bd3bdb100ec 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
@@ -45,7 +45,7 @@
 #include <rtps/builtin/discovery/participant/timedevent/DSClientEvent.h>
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 #include <utils/shared_mutex.hpp>
 #include <utils/SystemInfo.hpp>
 #include <utils/TimeConversion.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
index 8531a56008e..9b7fb24d21b 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp
@@ -46,7 +46,7 @@
 #include <rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp>
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 #include <utils/TimeConversion.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
index 73dda8f7099..612a97f41b9 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -42,9 +42,9 @@
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 #include <rtps/resources/TimedEvent.h>
-#include <rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatelessReader.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp
index a405b501426..d167ed7fa79 100644
--- a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp
@@ -27,7 +27,7 @@
 #include <rtps/builtin/BuiltinWriter.hpp>
 #include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
 #include <rtps/history/ITopicPayloadPool.h>
-#include <rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatelessReader.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpointsSecure.hpp b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpointsSecure.hpp
index 589edf6d090..9ffdcb979e0 100644
--- a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpointsSecure.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpointsSecure.hpp
@@ -28,7 +28,7 @@
 #include <rtps/builtin/BuiltinWriter.hpp>
 #include <rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp>
 #include <rtps/history/ITopicPayloadPool.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/liveliness/WLP.cpp b/src/cpp/rtps/builtin/liveliness/WLP.cpp
index 12c35aa24f3..144e0336bc0 100644
--- a/src/cpp/rtps/builtin/liveliness/WLP.cpp
+++ b/src/cpp/rtps/builtin/liveliness/WLP.cpp
@@ -37,7 +37,7 @@
 #include <rtps/builtin/liveliness/WLPListener.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 #include <rtps/resources/TimedEvent.h>
 #include <rtps/writer/LivelinessManager.hpp>
 #include <utils/TimeConversion.hpp>
diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
index 51cff850fa9..2d181d9b02f 100644
--- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
+++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -60,10 +60,10 @@
 #include <rtps/network/utils/netmask_filter.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/persistence/PersistenceService.h>
-#include <rtps/reader/StatefulPersistentReader.h>
-#include <rtps/reader/StatelessPersistentReader.h>
-#include <rtps/reader/StatefulReader.h>
-#include <rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatefulPersistentReader.hpp>
+#include <rtps/reader/StatelessPersistentReader.hpp>
+#include <rtps/reader/StatefulReader.hpp>
+#include <rtps/reader/StatelessReader.hpp>
 #include <statistics/rtps/GuidUtils.hpp>
 #include <utils/Semaphore.hpp>
 #include <utils/string_utilities.hpp>
diff --git a/src/cpp/rtps/reader/StatefulPersistentReader.cpp b/src/cpp/rtps/reader/StatefulPersistentReader.cpp
index 24770e1abcb..eff2ccb2e7d 100644
--- a/src/cpp/rtps/reader/StatefulPersistentReader.cpp
+++ b/src/cpp/rtps/reader/StatefulPersistentReader.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <rtps/reader/StatefulPersistentReader.h>
+#include <rtps/reader/StatefulPersistentReader.hpp>
 
 #include <fastdds/rtps/history/ReaderHistory.h>
 
diff --git a/src/cpp/rtps/reader/StatefulPersistentReader.h b/src/cpp/rtps/reader/StatefulPersistentReader.hpp
similarity index 97%
rename from src/cpp/rtps/reader/StatefulPersistentReader.h
rename to src/cpp/rtps/reader/StatefulPersistentReader.hpp
index 0801bf11690..480e54be749 100644
--- a/src/cpp/rtps/reader/StatefulPersistentReader.h
+++ b/src/cpp/rtps/reader/StatefulPersistentReader.hpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 /**
- * @file StatefulPersistentReader.h
+ * @file StatefulPersistentReader.hpp
  */
 
 
@@ -21,7 +21,7 @@
 #define _FASTDDS_RTPS_STATEFULPERSISTENTREADER_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/reader/StatefulReader.cpp b/src/cpp/rtps/reader/StatefulReader.cpp
index dfb601d5368..a4f7c8301d5 100644
--- a/src/cpp/rtps/reader/StatefulReader.cpp
+++ b/src/cpp/rtps/reader/StatefulReader.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 
 #include <cassert>
 #include <mutex>
diff --git a/src/cpp/rtps/reader/StatefulReader.h b/src/cpp/rtps/reader/StatefulReader.hpp
similarity index 99%
rename from src/cpp/rtps/reader/StatefulReader.h
rename to src/cpp/rtps/reader/StatefulReader.hpp
index 3ec511b5d8a..b35fad8a9f2 100644
--- a/src/cpp/rtps/reader/StatefulReader.h
+++ b/src/cpp/rtps/reader/StatefulReader.hpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 /**
- * @file .h
+ * @file StatefulReader.hpp
  */
 
 #ifndef _FASTDDS_RTPS_READER_STATEFULREADER_H_
diff --git a/src/cpp/rtps/reader/StatelessPersistentReader.cpp b/src/cpp/rtps/reader/StatelessPersistentReader.cpp
index db326ac5eee..d82a2b4c179 100644
--- a/src/cpp/rtps/reader/StatelessPersistentReader.cpp
+++ b/src/cpp/rtps/reader/StatelessPersistentReader.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <rtps/reader/StatelessPersistentReader.h>
+#include <rtps/reader/StatelessPersistentReader.hpp>
 
 #include <fastdds/rtps/history/ReaderHistory.h>
 
diff --git a/src/cpp/rtps/reader/StatelessPersistentReader.h b/src/cpp/rtps/reader/StatelessPersistentReader.hpp
similarity index 98%
rename from src/cpp/rtps/reader/StatelessPersistentReader.h
rename to src/cpp/rtps/reader/StatelessPersistentReader.hpp
index cb775976999..461c92d3b18 100644
--- a/src/cpp/rtps/reader/StatelessPersistentReader.h
+++ b/src/cpp/rtps/reader/StatelessPersistentReader.hpp
@@ -21,7 +21,7 @@
 #define _FASTDDS_RTPS_STATELESSPERSISTENTREADER_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatelessReader.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/reader/StatelessReader.cpp b/src/cpp/rtps/reader/StatelessReader.cpp
index e535e1c58f9..2b1c6b91d17 100644
--- a/src/cpp/rtps/reader/StatelessReader.cpp
+++ b/src/cpp/rtps/reader/StatelessReader.cpp
@@ -32,7 +32,7 @@
 #include <rtps/DataSharing/DataSharingListener.hpp>
 #include <rtps/DataSharing/ReaderPool.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatelessReader.hpp>
 #include <rtps/writer/LivelinessManager.hpp>
 
 #include "rtps/RTPSDomainImpl.hpp"
diff --git a/src/cpp/rtps/reader/StatelessReader.h b/src/cpp/rtps/reader/StatelessReader.hpp
similarity index 99%
rename from src/cpp/rtps/reader/StatelessReader.h
rename to src/cpp/rtps/reader/StatelessReader.hpp
index 82cf03ab77c..89e4c38b59a 100644
--- a/src/cpp/rtps/reader/StatelessReader.h
+++ b/src/cpp/rtps/reader/StatelessReader.hpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 /**
- * @file StatelessReader.h
+ * @file StatelessReader.hpp
  */
 
 
diff --git a/src/cpp/rtps/reader/WriterProxy.cpp b/src/cpp/rtps/reader/WriterProxy.cpp
index 6bb1189d3f8..e631ad09215 100644
--- a/src/cpp/rtps/reader/WriterProxy.cpp
+++ b/src/cpp/rtps/reader/WriterProxy.cpp
@@ -30,7 +30,7 @@
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/resources/TimedEvent.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 
 #if !defined(NDEBUG) && !defined(ANDROID) && defined(FASTDDS_SOURCE) && defined(__unix__)
 #define SHOULD_DEBUG_LINUX
diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp
index 6daca9e4a49..088d4447ec9 100644
--- a/src/cpp/rtps/security/SecurityManager.cpp
+++ b/src/cpp/rtps/security/SecurityManager.cpp
@@ -45,8 +45,8 @@
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/network/NetworkFactory.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/reader/StatefulReader.h>
-#include <rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatefulReader.hpp>
+#include <rtps/reader/StatelessReader.hpp>
 #include <security/OpenSSLInit.hpp>
 
 #define BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_WRITER (1 << 20)
diff --git a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h
index 6d6a7c79026..36634c52f4e 100644
--- a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h
+++ b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h
@@ -28,7 +28,7 @@
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
 #include <fastdds/fastdds_dll.hpp>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 #include <statistics/rtps/monitor-service/Interfaces.hpp>
 
 namespace eprosima {
diff --git a/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.h b/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp
similarity index 100%
rename from test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.h
rename to test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp
diff --git a/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.h b/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp
similarity index 100%
rename from test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.h
rename to test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp
diff --git a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
index f62c6f52d51..3cd4f008841 100644
--- a/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
+++ b/test/unittest/dds/subscriber/DataReaderHistoryTests.cpp
@@ -3,7 +3,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/utils/TimedMutex.hpp>
-#include <rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatelessReader.hpp>
 
 
 #include <gmock/gmock.h>
diff --git a/test/unittest/rtps/history/ReaderHistoryTests.cpp b/test/unittest/rtps/history/ReaderHistoryTests.cpp
index 6b30af79f1a..048e7ca750c 100644
--- a/test/unittest/rtps/history/ReaderHistoryTests.cpp
+++ b/test/unittest/rtps/history/ReaderHistoryTests.cpp
@@ -22,7 +22,7 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/utils/TimedMutex.hpp>
 #include <rtps/common/ChangeComparison.hpp>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 
 
 using namespace eprosima::fastrtps;
diff --git a/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp b/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp
index ba540487a0d..50b4befe83b 100644
--- a/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp
+++ b/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp
@@ -24,7 +24,7 @@
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 #include <rtps/reader/WriterProxy.h>
 #include <rtps/reader/WriterProxy.cpp>
 #include <rtps/resources/TimedEvent.h>
diff --git a/test/unittest/rtps/reader/WriterProxyStopTest.cpp b/test/unittest/rtps/reader/WriterProxyStopTest.cpp
index ed0935b6e23..9d7ee406110 100644
--- a/test/unittest/rtps/reader/WriterProxyStopTest.cpp
+++ b/test/unittest/rtps/reader/WriterProxyStopTest.cpp
@@ -21,7 +21,7 @@
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 #include <rtps/reader/WriterProxy.h>
 #include <rtps/reader/WriterProxy.cpp>
 #include <rtps/resources/TimedEvent.h>
diff --git a/test/unittest/rtps/reader/WriterProxyTests.cpp b/test/unittest/rtps/reader/WriterProxyTests.cpp
index 7786baa7975..2d6dfa0f8a2 100644
--- a/test/unittest/rtps/reader/WriterProxyTests.cpp
+++ b/test/unittest/rtps/reader/WriterProxyTests.cpp
@@ -24,7 +24,7 @@
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/reader/StatefulReader.h>
+#include <rtps/reader/StatefulReader.hpp>
 #include <rtps/reader/WriterProxy.h>
 #include <rtps/reader/WriterProxy.cpp>
 #include <rtps/resources/TimedEvent.h>
diff --git a/test/unittest/rtps/security/SecurityTests.hpp b/test/unittest/rtps/security/SecurityTests.hpp
index eee75639488..7950424fdd9 100644
--- a/test/unittest/rtps/security/SecurityTests.hpp
+++ b/test/unittest/rtps/security/SecurityTests.hpp
@@ -27,8 +27,8 @@
 
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/reader/StatefulReader.h>
-#include <rtps/reader/StatelessReader.h>
+#include <rtps/reader/StatefulReader.hpp>
+#include <rtps/reader/StatelessReader.hpp>
 #include <rtps/security/MockAuthenticationPlugin.h>
 #include <rtps/security/MockCryptographyPlugin.h>
 #include <rtps/security/SecurityManager.h>

From 5c039691f1f53b3a0c0ebc2a8275394695017df6 Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Mon, 27 May 2024 08:10:56 +0200
Subject: [PATCH 6/6] Refs #20765: Apply suggestions

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
---
 .../rtps/builtin/discovery/participant/PDPSimple.cpp   |  2 +-
 src/cpp/rtps/participant/RTPSParticipantImpl.cpp       |  2 +-
 src/cpp/rtps/reader/StatefulPersistentReader.hpp       |  6 +++---
 src/cpp/rtps/reader/StatefulReader.hpp                 |  6 +++---
 src/cpp/rtps/reader/StatelessPersistentReader.hpp      |  8 ++++----
 src/cpp/rtps/reader/StatelessReader.hpp                |  6 +++---
 .../rtps/StatefulReader/rtps/reader/StatefulReader.hpp | 10 +++++++---
 .../StatelessReader/rtps/reader/StatelessReader.hpp    |  8 ++++----
 8 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
index 612a97f41b9..76859ee003a 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -43,8 +43,8 @@
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
-#include <rtps/resources/TimedEvent.h>
 #include <rtps/reader/StatelessReader.hpp>
+#include <rtps/resources/TimedEvent.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
index 2d181d9b02f..25d31b3d0ed 100644
--- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
+++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -61,8 +61,8 @@
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/persistence/PersistenceService.h>
 #include <rtps/reader/StatefulPersistentReader.hpp>
-#include <rtps/reader/StatelessPersistentReader.hpp>
 #include <rtps/reader/StatefulReader.hpp>
+#include <rtps/reader/StatelessPersistentReader.hpp>
 #include <rtps/reader/StatelessReader.hpp>
 #include <statistics/rtps/GuidUtils.hpp>
 #include <utils/Semaphore.hpp>
diff --git a/src/cpp/rtps/reader/StatefulPersistentReader.hpp b/src/cpp/rtps/reader/StatefulPersistentReader.hpp
index 480e54be749..57d2aeba588 100644
--- a/src/cpp/rtps/reader/StatefulPersistentReader.hpp
+++ b/src/cpp/rtps/reader/StatefulPersistentReader.hpp
@@ -17,8 +17,8 @@
  */
 
 
-#ifndef _FASTDDS_RTPS_STATEFULPERSISTENTREADER_H_
-#define _FASTDDS_RTPS_STATEFULPERSISTENTREADER_H_
+#ifndef RTPS_READER__STATEFULPERSISTENTREADER_HPP
+#define RTPS_READER__STATEFULPERSISTENTREADER_HPP
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <rtps/reader/StatefulReader.hpp>
@@ -92,4 +92,4 @@ class StatefulPersistentReader : public StatefulReader
 } // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_STATEFULPERSISTENTREADER_H_ */
+#endif /* RTPS_READER__STATEFULPERSISTENTREADER_HPP */
diff --git a/src/cpp/rtps/reader/StatefulReader.hpp b/src/cpp/rtps/reader/StatefulReader.hpp
index b35fad8a9f2..1b4d5df1e44 100644
--- a/src/cpp/rtps/reader/StatefulReader.hpp
+++ b/src/cpp/rtps/reader/StatefulReader.hpp
@@ -16,8 +16,8 @@
  * @file StatefulReader.hpp
  */
 
-#ifndef _FASTDDS_RTPS_READER_STATEFULREADER_H_
-#define _FASTDDS_RTPS_READER_STATEFULREADER_H_
+#ifndef RTPS_READER__STATEFULREADER_HPP
+#define RTPS_READER__STATEFULREADER_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -380,4 +380,4 @@ class StatefulReader : public RTPSReader
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif // _FASTDDS_RTPS_READER_STATEFULREADER_H_
+#endif // RTPS_READER__STATEFULREADER_HPP
diff --git a/src/cpp/rtps/reader/StatelessPersistentReader.hpp b/src/cpp/rtps/reader/StatelessPersistentReader.hpp
index 461c92d3b18..b8f90f35109 100644
--- a/src/cpp/rtps/reader/StatelessPersistentReader.hpp
+++ b/src/cpp/rtps/reader/StatelessPersistentReader.hpp
@@ -13,12 +13,12 @@
 // limitations under the License.
 
 /**
- * @file StatelessPersistentReader.h
+ * @file StatelessPersistentReader.hpp
  */
 
 
-#ifndef _FASTDDS_RTPS_STATELESSPERSISTENTREADER_H_
-#define _FASTDDS_RTPS_STATELESSPERSISTENTREADER_H_
+#ifndef RTPS_READER__STATELESSPERSISTENTREADER_HPP
+#define RTPS_READER__STATELESSPERSISTENTREADER_HPP
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <rtps/reader/StatelessReader.hpp>
@@ -92,4 +92,4 @@ class StatelessPersistentReader : public StatelessReader
 } // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_STATELESSPERSISTENTREADER_H_ */
+#endif /* RTPS_READER__STATELESSPERSISTENTREADER_HPP */
diff --git a/src/cpp/rtps/reader/StatelessReader.hpp b/src/cpp/rtps/reader/StatelessReader.hpp
index 89e4c38b59a..7ee0d1ad753 100644
--- a/src/cpp/rtps/reader/StatelessReader.hpp
+++ b/src/cpp/rtps/reader/StatelessReader.hpp
@@ -17,8 +17,8 @@
  */
 
 
-#ifndef _FASTDDS_RTPS_READER_STATELESSREADER_H_
-#define _FASTDDS_RTPS_READER_STATELESSREADER_H_
+#ifndef RTPS_READER__STATELESSREADER_HPP
+#define RTPS_READER__STATELESSREADER_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -302,4 +302,4 @@ class StatelessReader : public RTPSReader
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#endif /* _FASTDDS_RTPS_READER_STATELESSREADER_H_ */
+#endif /* RTPS_READER__STATELESSREADER_HPP */
diff --git a/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp b/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp
index 20e92cdb030..f8f68cc7e86 100644
--- a/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp
+++ b/test/mock/rtps/StatefulReader/rtps/reader/StatefulReader.hpp
@@ -12,8 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _FASTDDS_RTPS_READER_STATEFULREADER_H_
-#define _FASTDDS_RTPS_READER_STATEFULREADER_H_
+/**
+ * @file StatefulReader.hpp
+ */
+
+#ifndef RTPS_READER__STATEFULREADER_HPP
+#define RTPS_READER__STATEFULREADER_HPP
 
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
 #include <fastdds/rtps/common/Guid.h>
@@ -114,4 +118,4 @@ class StatefulReader : public RTPSReader
 } // namespace fastrtps
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_READER_STATEFULREADER_H_
+#endif // RTPS_READER__STATEFULREADER_HPP
diff --git a/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp b/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp
index 81af7a71809..da3b4479011 100644
--- a/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp
+++ b/test/mock/rtps/StatelessReader/rtps/reader/StatelessReader.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file StatelessReader.h
+ * @file StatelessReader.hpp
  */
 
-#ifndef _FASTDDS_RTPS_READER_STATELESSREADER_H_
-#define _FASTDDS_RTPS_READER_STATELESSREADER_H_
+#ifndef RTPS_READER__STATELESSREADER_HPP
+#define RTPS_READER__STATELESSREADER_HPP
 
 #include <fastdds/rtps/reader/RTPSReader.h>
 
@@ -52,4 +52,4 @@ class StatelessReader : public RTPSReader
 } // namespace fastrtps
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_READER_STATELESSREADER_H_
+#endif // RTPS_READER__STATELESSREADER_HPP