From 1cfa0d1573d49b102c33ad2c424992ebaecf94e6 Mon Sep 17 00:00:00 2001
From: Mario Dominguez <mariodominguez@eprosima.com>
Date: Wed, 5 Jun 2024 11:20:03 +0200
Subject: [PATCH 1/7] Refs #21052: Move ReaderLocator, ChangeForReader and
 ReaderProxy to private folder

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
---
 .../cpp}/rtps/writer/ChangeForReader.h        |  0
 .../cpp}/rtps/writer/ReaderLocator.h          |  0
 .../cpp}/rtps/writer/ReaderProxy.h            | 25 ++++++++-----------
 3 files changed, 11 insertions(+), 14 deletions(-)
 rename {include/fastdds => src/cpp}/rtps/writer/ChangeForReader.h (100%)
 rename {include/fastdds => src/cpp}/rtps/writer/ReaderLocator.h (100%)
 rename {include/fastdds => src/cpp}/rtps/writer/ReaderProxy.h (99%)

diff --git a/include/fastdds/rtps/writer/ChangeForReader.h b/src/cpp/rtps/writer/ChangeForReader.h
similarity index 100%
rename from include/fastdds/rtps/writer/ChangeForReader.h
rename to src/cpp/rtps/writer/ChangeForReader.h
diff --git a/include/fastdds/rtps/writer/ReaderLocator.h b/src/cpp/rtps/writer/ReaderLocator.h
similarity index 100%
rename from include/fastdds/rtps/writer/ReaderLocator.h
rename to src/cpp/rtps/writer/ReaderLocator.h
diff --git a/include/fastdds/rtps/writer/ReaderProxy.h b/src/cpp/rtps/writer/ReaderProxy.h
similarity index 99%
rename from include/fastdds/rtps/writer/ReaderProxy.h
rename to src/cpp/rtps/writer/ReaderProxy.h
index 39112baf6eb..0ec64bcdbf9 100644
--- a/include/fastdds/rtps/writer/ReaderProxy.h
+++ b/src/cpp/rtps/writer/ReaderProxy.h
@@ -20,26 +20,23 @@
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/attributes/WriterAttributes.h>
-#include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
+#include <algorithm>
+#include <atomic>
+#include <mutex>
+#include <set>
 
+#include <fastdds/rtps/attributes/RTPSParticipantAllocationAttributes.hpp>
+#include <fastdds/rtps/attributes/WriterAttributes.h>
 #include <fastdds/rtps/builtin/data/ReaderProxyData.h>
-
-#include <fastdds/rtps/common/Types.h>
-#include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/common/SequenceNumber.h>
 #include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/common/FragmentNumber.h>
-
-#include <fastdds/rtps/writer/ChangeForReader.h>
-#include <fastdds/rtps/writer/ReaderLocator.h>
-
+#include <fastdds/rtps/common/Locator.h>
+#include <fastdds/rtps/common/SequenceNumber.h>
+#include <fastdds/rtps/common/Types.h>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
-#include <algorithm>
-#include <mutex>
-#include <set>
-#include <atomic>
+#include <rtps/writer/ChangeForReader.h>
+#include <rtps/writer/ReaderLocator.h>
 
 namespace eprosima {
 namespace fastrtps {

From c957bbf81063e62a88ae76b10576c32b9e1aea51 Mon Sep 17 00:00:00 2001
From: Mario Dominguez <mariodominguez@eprosima.com>
Date: Wed, 5 Jun 2024 11:21:00 +0200
Subject: [PATCH 2/7] Refs #21052: Update source files headers

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
---
 .../rtps/builtin/discovery/database/DiscoveryDataBase.hpp    | 2 +-
 src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp     | 4 ++--
 src/cpp/rtps/writer/ReaderLocator.cpp                        | 2 +-
 src/cpp/rtps/writer/ReaderProxy.cpp                          | 4 ++--
 src/cpp/rtps/writer/StatefulWriter.cpp                       | 4 ++--
 src/cpp/rtps/writer/StatelessWriter.hpp                      | 5 +++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
index 7077b10e2c3..0e5dd2c042f 100644
--- a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
+++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
@@ -31,12 +31,12 @@
 
 #include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/writer/ReaderProxy.h>
 
 #include <rtps/builtin/discovery/database/DiscoveryDataFilter.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryDataQueueInfo.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryEndpointInfo.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp>
+#include <rtps/writer/ReaderProxy.h>
 #include <utils/DBQueue.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
index 87eb052ac72..ffa07c2c6ea 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
@@ -32,9 +32,8 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/writer/ReaderProxy.h>
-
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
+
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/discovery/endpoint/EDPClient.h>
 #include <rtps/builtin/discovery/participant/DirectMessageSender.hpp>
@@ -45,6 +44,7 @@
 #include <rtps/builtin/liveliness/WLP.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
+#include <rtps/writer/ReaderProxy.h>
 #include <rtps/writer/StatefulWriter.hpp>
 #include <utils/shared_mutex.hpp>
 #include <utils/SystemInfo.hpp>
diff --git a/src/cpp/rtps/writer/ReaderLocator.cpp b/src/cpp/rtps/writer/ReaderLocator.cpp
index b3321293bf9..78ed956a47c 100644
--- a/src/cpp/rtps/writer/ReaderLocator.cpp
+++ b/src/cpp/rtps/writer/ReaderLocator.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/writer/ReaderLocator.h>
+#include <rtps/writer/ReaderLocator.h>
 
 #include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/common/LocatorListComparisons.hpp>
diff --git a/src/cpp/rtps/writer/ReaderProxy.cpp b/src/cpp/rtps/writer/ReaderProxy.cpp
index cb5136814e7..43eb24a7049 100644
--- a/src/cpp/rtps/writer/ReaderProxy.cpp
+++ b/src/cpp/rtps/writer/ReaderProxy.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/writer/ReaderProxy.h>
+#include <rtps/writer/ReaderProxy.h>
 
 #include <mutex>
 #include <cassert>
@@ -29,7 +29,7 @@
 
 #include <rtps/DataSharing/DataSharingNotifier.hpp>
 #include <rtps/history/HistoryAttributesExtension.hpp>
-#include "rtps/messages/RTPSGapBuilder.hpp"
+#include <rtps/messages/RTPSGapBuilder.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/resources/TimedEvent.h>
 #include <rtps/writer/StatefulWriter.hpp>
diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp
index 8a7761d755c..144ee692965 100644
--- a/src/cpp/rtps/writer/StatefulWriter.cpp
+++ b/src/cpp/rtps/writer/StatefulWriter.cpp
@@ -31,7 +31,6 @@
 #include <rtps/messages/RTPSMessageCreator.hpp>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/ReaderProxy.h>
 #include <fastdds/rtps/writer/WriterListener.h>
 
 #include <rtps/builtin/BuiltinProtocols.h>
@@ -45,9 +44,10 @@
 #include <rtps/messages/RTPSMessageGroup.hpp>
 #include <rtps/network/utils/external_locators.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
-#include <rtps/resources/TimedEvent.h>
 #include <rtps/resources/ResourceEvent.h>
+#include <rtps/resources/TimedEvent.h>
 #include <rtps/RTPSDomainImpl.hpp>
+#include <rtps/writer/ReaderProxy.h>
 #include <utils/TimeConversion.hpp>
 
 #ifdef FASTDDS_STATISTICS
diff --git a/src/cpp/rtps/writer/StatelessWriter.hpp b/src/cpp/rtps/writer/StatelessWriter.hpp
index 73ddf04811b..5d5a49a3952 100644
--- a/src/cpp/rtps/writer/StatelessWriter.hpp
+++ b/src/cpp/rtps/writer/StatelessWriter.hpp
@@ -29,11 +29,12 @@
 #include <fastdds/rtps/history/IChangePool.h>
 #include <fastdds/rtps/history/IPayloadPool.h>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/writer/ChangeForReader.h>
-#include <fastdds/rtps/writer/ReaderLocator.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
+#include <rtps/writer/ChangeForReader.h>
+#include <rtps/writer/ReaderLocator.h>
+
 namespace eprosima {
 namespace fastrtps {
 namespace rtps {

From f9a1afd29b0a57dac1791d6cd09b08dc76989dc7 Mon Sep 17 00:00:00 2001
From: Mario Dominguez <mariodominguez@eprosima.com>
Date: Wed, 5 Jun 2024 11:21:27 +0200
Subject: [PATCH 3/7] Refs #21052: Update mock path and unittests accordingly

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
---
 test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp | 3 +++
 .../ReaderLocator/{fastdds => }/rtps/writer/ReaderLocator.h    | 0
 test/unittest/rtps/writer/ReaderProxyTests.cpp                 | 3 +--
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename test/mock/rtps/ReaderLocator/{fastdds => }/rtps/writer/ReaderLocator.h (100%)

diff --git a/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp b/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp
index 7f39f460486..99897503459 100644
--- a/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp
+++ b/test/mock/rtps/RTPSGapBuilder/rtps/messages/RTPSGapBuilder.hpp
@@ -20,6 +20,9 @@
 #ifndef RTPSGAPBUILDER_HPP
 #define RTPSGAPBUILDER_HPP
 
+#include <fastdds/rtps/common/SequenceNumber.h>
+#include <fastdds/rtps/common/Guid.h>
+
 #include <rtps/messages/RTPSMessageGroup.hpp>
 
 namespace eprosima {
diff --git a/test/mock/rtps/ReaderLocator/fastdds/rtps/writer/ReaderLocator.h b/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.h
similarity index 100%
rename from test/mock/rtps/ReaderLocator/fastdds/rtps/writer/ReaderLocator.h
rename to test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.h
diff --git a/test/unittest/rtps/writer/ReaderProxyTests.cpp b/test/unittest/rtps/writer/ReaderProxyTests.cpp
index f4053ff2c64..02e8da82711 100644
--- a/test/unittest/rtps/writer/ReaderProxyTests.cpp
+++ b/test/unittest/rtps/writer/ReaderProxyTests.cpp
@@ -15,9 +15,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <fastdds/rtps/writer/ReaderProxy.h>
-
 #include <rtps/messages/RTPSGapBuilder.hpp>
+#include <rtps/writer/ReaderProxy.h>
 #include <rtps/writer/StatefulWriter.hpp>
 
 //using namespace eprosima::fastrtps::rtps;

From fd409918a26da7a1c03413af0ff8e60407de4247 Mon Sep 17 00:00:00 2001
From: Mario Dominguez <mariodominguez@eprosima.com>
Date: Wed, 5 Jun 2024 11:23:46 +0200
Subject: [PATCH 4/7] Refs #21052: Update versions.md

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
---
 versions.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/versions.md b/versions.md
index 3d0f3137aa9..3e64f5393a2 100644
--- a/versions.md
+++ b/versions.md
@@ -25,6 +25,9 @@ Forthcoming
   * TypeLookupService
   * DBQueue
   * UnitsParser
+  * ReaderLocator
+  * ReaderProxy
+  * ChangeForReader
 * Added create participant methods that use environment XML profile for participant configuration.
 * New TypeObjectRegistry class to register/query TypeObjects/TypeIdentifiers.
 * New TypeObjectUtils class providing API to build and register TypeObjects/TypeIdentifiers.

From 3a2baa7e936e6a9c1615877a925261c2ef495624 Mon Sep 17 00:00:00 2001
From: Mario Dominguez <mariodominguez@eprosima.com>
Date: Fri, 7 Jun 2024 10:06:49 +0200
Subject: [PATCH 5/7] Refs #21052: Rev suggestion: Correct header guards & make
 .hpp

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
---
 .../{ChangeForReader.h => ChangeForReader.hpp}       |  8 ++++----
 .../writer/{ReaderLocator.h => ReaderLocator.hpp}    |  8 ++++----
 .../rtps/writer/{ReaderProxy.h => ReaderProxy.hpp}   | 12 ++++++------
 .../writer/{ReaderLocator.h => ReaderLocator.hpp}    | 10 ++++------
 4 files changed, 18 insertions(+), 20 deletions(-)
 rename src/cpp/rtps/writer/{ChangeForReader.h => ChangeForReader.hpp} (97%)
 rename src/cpp/rtps/writer/{ReaderLocator.h => ReaderLocator.hpp} (98%)
 rename src/cpp/rtps/writer/{ReaderProxy.h => ReaderProxy.hpp} (98%)
 rename test/mock/rtps/ReaderLocator/rtps/writer/{ReaderLocator.h => ReaderLocator.hpp} (97%)

diff --git a/src/cpp/rtps/writer/ChangeForReader.h b/src/cpp/rtps/writer/ChangeForReader.hpp
similarity index 97%
rename from src/cpp/rtps/writer/ChangeForReader.h
rename to src/cpp/rtps/writer/ChangeForReader.hpp
index 0100883170d..db0b65a288e 100644
--- a/src/cpp/rtps/writer/ChangeForReader.h
+++ b/src/cpp/rtps/writer/ChangeForReader.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file ChangeForReader.h
+ * @file ChangeForReader.hpp
  */
 
-#ifndef _FASTDDS_RTPS_CHANGEFORREADER_H_
-#define _FASTDDS_RTPS_CHANGEFORREADER_H_
+#ifndef RTPS_WRITER__CHANGEFORREADER_HPP
+#define RTPS_WRITER__CHANGEFORREADER_HPP
 
 #include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/common/FragmentNumber.h>
@@ -213,4 +213,4 @@ struct ChangeForReaderCmp
 } // namespace fastrtps
 } // namespace eprosima
 
-#endif /* _FASTDDS_RTPS_CHANGEFORREADER_H_ */
+#endif /* RTPS_WRITER__CHANGEFORREADER_HPP */
diff --git a/src/cpp/rtps/writer/ReaderLocator.h b/src/cpp/rtps/writer/ReaderLocator.hpp
similarity index 98%
rename from src/cpp/rtps/writer/ReaderLocator.h
rename to src/cpp/rtps/writer/ReaderLocator.hpp
index a48f3717d3b..9b75a65e2d8 100644
--- a/src/cpp/rtps/writer/ReaderLocator.h
+++ b/src/cpp/rtps/writer/ReaderLocator.hpp
@@ -13,10 +13,10 @@
 // limitations under the License.
 
 /**
- * @file ReaderLocator.h
+ * @file ReaderLocator.hpp
  */
-#ifndef _FASTDDS_RTPS_READERLOCATOR_H_
-#define _FASTDDS_RTPS_READERLOCATOR_H_
+#ifndef RTPS_WRITER__READERLOCATOR_HPP
+#define RTPS_WRITER__READERLOCATOR_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -271,4 +271,4 @@ class ReaderLocator : public RTPSMessageSenderInterface
 } /* namespace eprosima */
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_READERLOCATOR_H_ */
+#endif /* RTPS_WRITER__READERLOCATOR_HPP */
diff --git a/src/cpp/rtps/writer/ReaderProxy.h b/src/cpp/rtps/writer/ReaderProxy.hpp
similarity index 98%
rename from src/cpp/rtps/writer/ReaderProxy.h
rename to src/cpp/rtps/writer/ReaderProxy.hpp
index 0ec64bcdbf9..1c066816a22 100644
--- a/src/cpp/rtps/writer/ReaderProxy.h
+++ b/src/cpp/rtps/writer/ReaderProxy.hpp
@@ -13,10 +13,10 @@
 // limitations under the License.
 
 /**
- * @file ReaderProxy.h
+ * @file ReaderProxy.hpp
  */
-#ifndef _FASTDDS_RTPS_WRITER_READERPROXY_H_
-#define _FASTDDS_RTPS_WRITER_READERPROXY_H_
+#ifndef RTPS_WRITER__READERPROXY_HPP
+#define RTPS_WRITER__READERPROXY_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -35,8 +35,8 @@
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
-#include <rtps/writer/ChangeForReader.h>
-#include <rtps/writer/ReaderLocator.h>
+#include <rtps/writer/ChangeForReader.hpp>
+#include <rtps/writer/ReaderLocator.hpp>
 
 namespace eprosima {
 namespace fastrtps {
@@ -507,4 +507,4 @@ class ReaderProxy
 } /* namespace eprosima */
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_WRITER_READERPROXY_H_ */
+#endif /* RTPS_WRITER__READERPROXY_HPP */
diff --git a/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.h b/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp
similarity index 97%
rename from test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.h
rename to test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp
index 89c028e3e08..3cda9516fe0 100644
--- a/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.h
+++ b/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp
@@ -13,13 +13,11 @@
 // limitations under the License.
 
 /**
- * @file ReaderLocator.h
+ * @file ReaderLocator.hpp
  */
 
-
-
-#ifndef _FASTDDS_RTPS_READERLOCATOR_H_
-#define _FASTDDS_RTPS_READERLOCATOR_H_
+#ifndef RTPS_WRITER__READERLOCATOR_HPP
+#define RTPS_WRITER__READERLOCATOR_HPP
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <vector>
@@ -258,4 +256,4 @@ class ReaderLocator : public RTPSMessageSenderInterface
 } /* namespace eprosima */
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_READERLOCATOR_H_*/
+#endif /* RTPS_WRITER__READERLOCATOR_HPP*/

From 83587addaec7a2b5bfeaa4c6ec3792d88540f594 Mon Sep 17 00:00:00 2001
From: Mario Dominguez <mariodominguez@eprosima.com>
Date: Fri, 7 Jun 2024 10:07:58 +0200
Subject: [PATCH 6/7] Refs #21052: Rev suggestion: change source files
 references

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
---
 src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp | 2 +-
 src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp      | 2 +-
 src/cpp/rtps/writer/ReaderLocator.cpp                         | 2 +-
 src/cpp/rtps/writer/ReaderProxy.cpp                           | 2 +-
 src/cpp/rtps/writer/StatefulWriter.cpp                        | 2 +-
 src/cpp/rtps/writer/StatelessWriter.hpp                       | 4 ++--
 test/unittest/rtps/writer/ReaderProxyTests.cpp                | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
index 0e5dd2c042f..c9feb9b91a2 100644
--- a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
+++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
@@ -36,7 +36,7 @@
 #include <rtps/builtin/discovery/database/DiscoveryDataQueueInfo.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryEndpointInfo.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp>
-#include <rtps/writer/ReaderProxy.h>
+#include <rtps/writer/ReaderProxy.hpp>
 #include <utils/DBQueue.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
index ffa07c2c6ea..fcacb9ac2df 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
@@ -44,7 +44,7 @@
 #include <rtps/builtin/liveliness/WLP.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
-#include <rtps/writer/ReaderProxy.h>
+#include <rtps/writer/ReaderProxy.hpp>
 #include <rtps/writer/StatefulWriter.hpp>
 #include <utils/shared_mutex.hpp>
 #include <utils/SystemInfo.hpp>
diff --git a/src/cpp/rtps/writer/ReaderLocator.cpp b/src/cpp/rtps/writer/ReaderLocator.cpp
index 78ed956a47c..24a1ecb7023 100644
--- a/src/cpp/rtps/writer/ReaderLocator.cpp
+++ b/src/cpp/rtps/writer/ReaderLocator.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <rtps/writer/ReaderLocator.h>
+#include <rtps/writer/ReaderLocator.hpp>
 
 #include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/common/LocatorListComparisons.hpp>
diff --git a/src/cpp/rtps/writer/ReaderProxy.cpp b/src/cpp/rtps/writer/ReaderProxy.cpp
index 43eb24a7049..d566b47493d 100644
--- a/src/cpp/rtps/writer/ReaderProxy.cpp
+++ b/src/cpp/rtps/writer/ReaderProxy.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <rtps/writer/ReaderProxy.h>
+#include <rtps/writer/ReaderProxy.hpp>
 
 #include <mutex>
 #include <cassert>
diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp
index 144ee692965..be1332419af 100644
--- a/src/cpp/rtps/writer/StatefulWriter.cpp
+++ b/src/cpp/rtps/writer/StatefulWriter.cpp
@@ -47,7 +47,7 @@
 #include <rtps/resources/ResourceEvent.h>
 #include <rtps/resources/TimedEvent.h>
 #include <rtps/RTPSDomainImpl.hpp>
-#include <rtps/writer/ReaderProxy.h>
+#include <rtps/writer/ReaderProxy.hpp>
 #include <utils/TimeConversion.hpp>
 
 #ifdef FASTDDS_STATISTICS
diff --git a/src/cpp/rtps/writer/StatelessWriter.hpp b/src/cpp/rtps/writer/StatelessWriter.hpp
index 5d5a49a3952..7944a6952be 100644
--- a/src/cpp/rtps/writer/StatelessWriter.hpp
+++ b/src/cpp/rtps/writer/StatelessWriter.hpp
@@ -32,8 +32,8 @@
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
-#include <rtps/writer/ChangeForReader.h>
-#include <rtps/writer/ReaderLocator.h>
+#include <rtps/writer/ChangeForReader.hpp>
+#include <rtps/writer/ReaderLocator.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/test/unittest/rtps/writer/ReaderProxyTests.cpp b/test/unittest/rtps/writer/ReaderProxyTests.cpp
index 02e8da82711..ee043032d4e 100644
--- a/test/unittest/rtps/writer/ReaderProxyTests.cpp
+++ b/test/unittest/rtps/writer/ReaderProxyTests.cpp
@@ -16,7 +16,7 @@
 #include <gtest/gtest.h>
 
 #include <rtps/messages/RTPSGapBuilder.hpp>
-#include <rtps/writer/ReaderProxy.h>
+#include <rtps/writer/ReaderProxy.hpp>
 #include <rtps/writer/StatefulWriter.hpp>
 
 //using namespace eprosima::fastrtps::rtps;

From e9528d123a26d1cbc13e82383214d9c9a3ef02bd Mon Sep 17 00:00:00 2001
From: Mario Dominguez <mariodominguez@eprosima.com>
Date: Fri, 7 Jun 2024 10:32:00 +0200
Subject: [PATCH 7/7] Refs #21052: Apply second review changes

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
---
 src/cpp/rtps/writer/ChangeForReader.hpp                    | 6 +-----
 src/cpp/rtps/writer/ReaderLocator.hpp                      | 5 +----
 src/cpp/rtps/writer/ReaderProxy.hpp                        | 5 +----
 test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp | 4 +---
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/cpp/rtps/writer/ChangeForReader.hpp b/src/cpp/rtps/writer/ChangeForReader.hpp
index db0b65a288e..51b4d682881 100644
--- a/src/cpp/rtps/writer/ChangeForReader.hpp
+++ b/src/cpp/rtps/writer/ChangeForReader.hpp
@@ -29,8 +29,6 @@ namespace eprosima {
 namespace fastrtps {
 namespace rtps {
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-
 /**
  * Enum ChangeForReaderStatus_t, possible states for a CacheChange_t in a ReaderProxy.
  *  @ingroup COMMON_MODULE
@@ -207,10 +205,8 @@ struct ChangeForReaderCmp
 
 };
 
-#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-
 } // namespace rtps
 } // namespace fastrtps
 } // namespace eprosima
 
-#endif /* RTPS_WRITER__CHANGEFORREADER_HPP */
+#endif // RTPS_WRITER__CHANGEFORREADER_HPP
diff --git a/src/cpp/rtps/writer/ReaderLocator.hpp b/src/cpp/rtps/writer/ReaderLocator.hpp
index 9b75a65e2d8..a86007828a8 100644
--- a/src/cpp/rtps/writer/ReaderLocator.hpp
+++ b/src/cpp/rtps/writer/ReaderLocator.hpp
@@ -18,8 +18,6 @@
 #ifndef RTPS_WRITER__READERLOCATOR_HPP
 #define RTPS_WRITER__READERLOCATOR_HPP
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-
 #include <vector>
 #include <fastdds/rtps/common/Locator.h>
 #include <fastdds/rtps/common/Guid.h>
@@ -270,5 +268,4 @@ class ReaderLocator : public RTPSMessageSenderInterface
 } /* namespace fastrtps */
 } /* namespace eprosima */
 
-#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* RTPS_WRITER__READERLOCATOR_HPP */
+#endif // RTPS_WRITER__READERLOCATOR_HPP
diff --git a/src/cpp/rtps/writer/ReaderProxy.hpp b/src/cpp/rtps/writer/ReaderProxy.hpp
index 1c066816a22..c27873bde47 100644
--- a/src/cpp/rtps/writer/ReaderProxy.hpp
+++ b/src/cpp/rtps/writer/ReaderProxy.hpp
@@ -18,8 +18,6 @@
 #ifndef RTPS_WRITER__READERPROXY_HPP
 #define RTPS_WRITER__READERPROXY_HPP
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-
 #include <algorithm>
 #include <atomic>
 #include <mutex>
@@ -506,5 +504,4 @@ class ReaderProxy
 } /* namespace fastrtps */
 } /* namespace eprosima */
 
-#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* RTPS_WRITER__READERPROXY_HPP */
+#endif // RTPS_WRITER__READERPROXY_HPP
diff --git a/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp b/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp
index 3cda9516fe0..47dd24847ee 100644
--- a/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp
+++ b/test/mock/rtps/ReaderLocator/rtps/writer/ReaderLocator.hpp
@@ -18,7 +18,6 @@
 
 #ifndef RTPS_WRITER__READERLOCATOR_HPP
 #define RTPS_WRITER__READERLOCATOR_HPP
-#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <vector>
 
@@ -255,5 +254,4 @@ class ReaderLocator : public RTPSMessageSenderInterface
 } /* namespace fastrtps */
 } /* namespace eprosima */
 
-#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* RTPS_WRITER__READERLOCATOR_HPP*/
+#endif // RTPS_WRITER__READERLOCATOR_HPP