From 1925a6bde9c56b15a7395412138b66b1d236acbc Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Thu, 30 May 2024 21:05:57 +0200
Subject: [PATCH] Make rtps writer impl private (#4869)

* Refs #20821: Make StatefulPersistentWriter private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #20821: Make StatelessPersistentWriter private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #20821: Make StatefulWriter private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #20821: Make StatelessWriter private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #20821: Apply suggestions: Make persistenteWriter private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>

* Refs #20821. Avoid min / max macros on ReaderProxyTests.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
---
 .../type_lookup_service/TypeLookupManager.cpp  |  2 +-
 src/cpp/fastdds/publisher/DataWriterImpl.cpp   |  2 +-
 .../builtin/discovery/endpoint/EDPClient.cpp   |  2 +-
 .../builtin/discovery/endpoint/EDPServer.cpp   |  3 ++-
 .../discovery/endpoint/EDPServerListeners.cpp  |  9 +++++----
 .../builtin/discovery/endpoint/EDPSimple.cpp   |  2 +-
 .../discovery/endpoint/EDPSimpleListeners.cpp  |  2 +-
 .../builtin/discovery/endpoint/EDPUtils.hpp    |  7 ++++---
 .../DS/DiscoveryServerPDPEndpoints.hpp         |  2 +-
 .../rtps/builtin/discovery/participant/PDP.cpp |  2 +-
 .../discovery/participant/PDPClient.cpp        |  2 +-
 .../discovery/participant/PDPServer.cpp        |  2 +-
 .../discovery/participant/PDPSimple.cpp        |  2 +-
 .../participant/simple/SimplePDPEndpoints.hpp  |  3 ++-
 .../simple/SimplePDPEndpointsSecure.hpp        |  2 +-
 src/cpp/rtps/builtin/liveliness/WLP.cpp        |  2 +-
 .../rtps/participant/RTPSParticipantImpl.cpp   |  8 ++++----
 src/cpp/rtps/security/SecurityManager.cpp      |  4 ++--
 .../rtps/transport/tcp/RTCPMessageManager.h    |  4 ++--
 src/cpp/rtps/writer/PersistentWriter.cpp       |  2 +-
 .../cpp/rtps/writer/PersistentWriter.hpp       | 12 +++++++-----
 src/cpp/rtps/writer/ReaderProxy.cpp            |  7 ++++---
 .../rtps/writer/StatefulPersistentWriter.cpp   |  2 +-
 .../rtps/writer/StatefulPersistentWriter.hpp   | 12 ++++++------
 src/cpp/rtps/writer/StatefulWriter.cpp         |  3 ++-
 .../cpp/rtps/writer/StatefulWriter.hpp         |  8 ++++----
 .../rtps/writer/StatelessPersistentWriter.cpp  |  2 +-
 .../rtps/writer/StatelessPersistentWriter.hpp  | 12 ++++++------
 src/cpp/rtps/writer/StatelessWriter.cpp        |  2 +-
 .../cpp/rtps/writer/StatelessWriter.hpp        | 18 +++++++++---------
 .../rtps/monitor-service/MonitorService.hpp    |  2 +-
 .../rtps/messages/MessageReceiver.h            |  4 ++--
 .../writer/StatefulWriter.hpp}                 |  8 ++++----
 .../writer/StatelessWriter.hpp}                |  6 +++---
 .../unittest/dds/publisher/DataWriterTests.cpp |  3 ---
 test/unittest/rtps/security/SecurityTests.hpp  |  4 ++--
 test/unittest/rtps/writer/CMakeLists.txt       |  1 +
 test/unittest/rtps/writer/ReaderProxyTests.cpp |  2 +-
 .../rtps/monitor-service/MonitorService.hpp    |  2 +-
 39 files changed, 90 insertions(+), 84 deletions(-)
 rename include/fastdds/rtps/writer/PersistentWriter.h => src/cpp/rtps/writer/PersistentWriter.hpp (92%)
 rename include/fastdds/rtps/writer/StatefulPersistentWriter.h => src/cpp/rtps/writer/StatefulPersistentWriter.hpp (92%)
 rename include/fastdds/rtps/writer/StatefulWriter.h => src/cpp/rtps/writer/StatefulWriter.hpp (99%)
 rename include/fastdds/rtps/writer/StatelessPersistentWriter.h => src/cpp/rtps/writer/StatelessPersistentWriter.hpp (91%)
 rename include/fastdds/rtps/writer/StatelessWriter.h => src/cpp/rtps/writer/StatelessWriter.hpp (98%)
 rename test/mock/rtps/StatefulWriter/{fastdds/rtps/writer/StatefulWriter.h => rtps/writer/StatefulWriter.hpp} (95%)
 rename test/mock/rtps/StatelessWriter/{fastdds/rtps/writer/StatelessWriter.h => rtps/writer/StatelessWriter.hpp} (93%)

diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
index 83fbe3ab879..a85b1d635bd 100644
--- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
+++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp
@@ -34,12 +34,12 @@
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/reader/RTPSReader.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.hpp>
 #include <rtps/RTPSDomainImpl.hpp>
+#include <rtps/writer/StatefulWriter.hpp>
 
 namespace eprosima {
 
diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.cpp b/src/cpp/fastdds/publisher/DataWriterImpl.cpp
index 3b5520bda12..114dbccdff4 100644
--- a/src/cpp/fastdds/publisher/DataWriterImpl.cpp
+++ b/src/cpp/fastdds/publisher/DataWriterImpl.cpp
@@ -39,7 +39,6 @@
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/DataSharing/DataSharingPayloadPool.hpp>
@@ -49,6 +48,7 @@
 #include <rtps/resources/ResourceEvent.h>
 #include <rtps/RTPSDomainImpl.hpp>
 #include <rtps/resources/TimedEvent.h>
+#include <rtps/writer/StatefulWriter.hpp>
 #include <utils/TimeConversion.hpp>
 #ifdef FASTDDS_STATISTICS
 #include <statistics/fastdds/domain/DomainParticipantImpl.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp
index 4679961c3fc..ae1c6a04882 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp
@@ -27,12 +27,12 @@
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include <rtps/builtin/discovery/participant/PDP.h>
 #if HAVE_SECURITY
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
 #endif // if HAVE_SECURITY
+#include <rtps/writer/StatefulWriter.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp
index d9b4504ba71..3dccbc4d1ce 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.cpp
@@ -23,8 +23,9 @@
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
+
 #include <rtps/reader/StatefulReader.hpp>
+#include <rtps/writer/StatefulWriter.hpp>
 
 using namespace ::eprosima::fastrtps::rtps;
 
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp
index 23c4156e7f3..5334b682a90 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServerListeners.cpp
@@ -17,15 +17,16 @@
  *
  */
 #include <rtps/builtin/discovery/endpoint/EDPServerListeners.hpp>
-#include <rtps/builtin/discovery/endpoint/EDPServer.hpp>
-#include <rtps/builtin/discovery/participant/PDPServer.hpp>
 
-#include <fastdds/rtps/writer/StatefulWriter.h>
+#include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 
-#include <fastdds/dds/log/Log.hpp>
+#include <rtps/builtin/discovery/endpoint/EDPServer.hpp>
+#include <rtps/builtin/discovery/participant/PDPServer.hpp>
+#include <rtps/writer/StatefulWriter.hpp>
+
 namespace eprosima {
 namespace fastdds {
 namespace rtps {
diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
index e8acca55800..3998fc49d09 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/writer/StatefulWriter.h>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/discovery/endpoint/EDPSimpleListeners.h>
@@ -42,6 +41,7 @@
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/reader/StatefulReader.hpp>
+#include <rtps/writer/StatefulWriter.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 cb45665ab28..bccfeff942c 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/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.hpp>
+#include <rtps/writer/StatefulWriter.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 b1af33ec453..bdb9e97095c 100644
--- a/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp
+++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPUtils.hpp
@@ -19,22 +19,23 @@
 #ifndef _RTPS_BUILTIN_DISCOVERY_ENDPOINT_EDPUTILS_HPP_
 #define _RTPS_BUILTIN_DISCOVERY_ENDPOINT_EDPUTILS_HPP_
 
+#include <memory>
+#include <string>
+
 #include <fastdds/rtps/attributes/HistoryAttributes.h>
 #include <fastdds/rtps/attributes/ReaderAttributes.h>
 #include <fastdds/rtps/attributes/WriterAttributes.h>
 #include <fastdds/rtps/common/EntityId_t.hpp>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.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.hpp>
+#include <rtps/writer/StatefulWriter.hpp>
 
-#include <memory>
-#include <string>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/DiscoveryServerPDPEndpoints.hpp
index d01eca63cd2..5df4e44034b 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/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.hpp>
+#include <rtps/writer/StatefulWriter.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 82d23935708..9ac865a440b 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/writer/StatelessWriter.h>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <fastdds/utils/IPLocator.h>
@@ -49,6 +48,7 @@
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
 #include <rtps/reader/StatelessReader.hpp>
+#include <rtps/writer/StatelessWriter.hpp>
 #include <rtps/resources/TimedEvent.h>
 #if HAVE_SECURITY
 #include <rtps/security/accesscontrol/ParticipantSecurityAttributes.h>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
index bd3bdb100ec..d17f82f7b30 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
@@ -33,7 +33,6 @@
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
 #include <fastdds/rtps/writer/ReaderProxy.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <rtps/builtin/BuiltinProtocols.h>
@@ -46,6 +45,7 @@
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
+#include <rtps/writer/StatefulWriter.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 9b7fb24d21b..883f62b6f85 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/writer/StatefulWriter.h>
 #include <fastdds/utils/TimedMutex.hpp>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
@@ -47,6 +46,7 @@
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
+#include <rtps/writer/StatefulWriter.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 76859ee003a..c51226f2f56 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/writer/StatelessWriter.h>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <fastdds/utils/IPLocator.h>
@@ -45,6 +44,7 @@
 #include <rtps/reader/StatefulReader.hpp>
 #include <rtps/reader/StatelessReader.hpp>
 #include <rtps/resources/TimedEvent.h>
+#include <rtps/writer/StatelessWriter.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 d167ed7fa79..2717a82d6a3 100644
--- a/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/simple/SimplePDPEndpoints.hpp
@@ -22,12 +22,13 @@
 #include <memory>
 
 #include <fastdds/rtps/builtin/data/BuiltinEndpoints.hpp>
-#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.hpp>
+#include <rtps/writer/StatelessWriter.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 9ffdcb979e0..d1493e3a2a9 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/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.hpp>
+#include <rtps/writer/StatefulWriter.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/liveliness/WLP.cpp b/src/cpp/rtps/builtin/liveliness/WLP.cpp
index 969bf950bf6..4b0f1137f8b 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/writer/StatefulWriter.h>
 #include <fastdds/rtps/writer/WriterListener.h>
 
 #include <rtps/builtin/BuiltinProtocols.h>
@@ -39,6 +38,7 @@
 #include <rtps/resources/TimedEvent.h>
 #include <rtps/resources/ResourceEvent.h>
 #include <rtps/writer/LivelinessManager.hpp>
+#include <rtps/writer/StatefulWriter.hpp>
 #include <utils/TimeConversion.hpp>
 
 namespace eprosima {
diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
index 25d31b3d0ed..dbe3181b221 100644
--- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
+++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -41,10 +41,6 @@
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.h>
 #include <fastdds/rtps/transport/TCPv6TransportDescriptor.h>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.h>
-#include <fastdds/rtps/writer/StatefulPersistentWriter.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
-#include <fastdds/rtps/writer/StatelessPersistentWriter.h>
-#include <fastdds/rtps/writer/StatelessWriter.h>
 #include <fastdds/utils/IPFinder.h>
 
 #include <rtps/builtin/BuiltinProtocols.h>
@@ -64,6 +60,10 @@
 #include <rtps/reader/StatefulReader.hpp>
 #include <rtps/reader/StatelessPersistentReader.hpp>
 #include <rtps/reader/StatelessReader.hpp>
+#include <rtps/writer/StatefulWriter.hpp>
+#include <rtps/writer/StatefulPersistentWriter.hpp>
+#include <rtps/writer/StatelessPersistentWriter.hpp>
+#include <rtps/writer/StatelessWriter.hpp>
 #include <statistics/rtps/GuidUtils.hpp>
 #include <utils/Semaphore.hpp>
 #include <utils/string_utilities.hpp>
diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp
index 8058692909e..7d35cbfff6d 100644
--- a/src/cpp/rtps/security/SecurityManager.cpp
+++ b/src/cpp/rtps/security/SecurityManager.cpp
@@ -32,8 +32,6 @@
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
-#include <fastdds/rtps/writer/StatelessWriter.h>
 
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
@@ -48,6 +46,8 @@
 #include <rtps/security/accesscontrol/SecurityMaskUtilities.h>
 #include <rtps/security/authentication/Authentication.h>
 #include <rtps/security/exceptions/SecurityException.h>
+#include <rtps/writer/StatefulWriter.hpp>
+#include <rtps/writer/StatelessWriter.hpp>
 #include <security/OpenSSLInit.hpp>
 
 #define BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_WRITER (1 << 20)
diff --git a/src/cpp/rtps/transport/tcp/RTCPMessageManager.h b/src/cpp/rtps/transport/tcp/RTCPMessageManager.h
index ce27004cdb8..4f1c5b24d09 100644
--- a/src/cpp/rtps/transport/tcp/RTCPMessageManager.h
+++ b/src/cpp/rtps/transport/tcp/RTCPMessageManager.h
@@ -23,10 +23,10 @@
 #include <memory>
 #include <atomic>
 
-#include <fastdds/rtps/writer/StatelessWriter.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
 #include <rtps/transport/tcp/TCPControlMessage.h>
 #include <rtps/transport/tcp/RTCPHeader.h>
+#include <rtps/writer/StatefulWriter.hpp>
+#include <rtps/writer/StatelessWriter.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/writer/PersistentWriter.cpp b/src/cpp/rtps/writer/PersistentWriter.cpp
index 987159e3d51..09733cfca82 100644
--- a/src/cpp/rtps/writer/PersistentWriter.cpp
+++ b/src/cpp/rtps/writer/PersistentWriter.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/writer/PersistentWriter.h>
+#include <rtps/writer/PersistentWriter.hpp>
 
 #include <fastdds/rtps/history/WriterHistory.h>
 
diff --git a/include/fastdds/rtps/writer/PersistentWriter.h b/src/cpp/rtps/writer/PersistentWriter.hpp
similarity index 92%
rename from include/fastdds/rtps/writer/PersistentWriter.h
rename to src/cpp/rtps/writer/PersistentWriter.hpp
index 8fd24e5b04a..9f7baf3a649 100644
--- a/include/fastdds/rtps/writer/PersistentWriter.h
+++ b/src/cpp/rtps/writer/PersistentWriter.hpp
@@ -13,14 +13,16 @@
 // limitations under the License.
 
 /**
- * @file PersistentWriter.h
+ * @file PersistentWriter.hpp
  */
-#ifndef _FASTDDS_RTPS_PERSISTENTWRITER_H_
-#define _FASTDDS_RTPS_PERSISTENTWRITER_H_
 
-#include <fastdds/rtps/writer/RTPSWriter.h>
+#ifndef RTPS_WRITER__PERSISTENTWRITER_HPP
+#define RTPS_WRITER__PERSISTENTWRITER_HPP
+
 #include <string>
 
+#include <fastdds/rtps/writer/RTPSWriter.h>
+
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 namespace eprosima {
@@ -77,4 +79,4 @@ class PersistentWriter
 } // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_PERSISTENTWRITER_H_ */
+#endif /* RTPS_WRITER__PERSISTENTWRITER_HPP */
diff --git a/src/cpp/rtps/writer/ReaderProxy.cpp b/src/cpp/rtps/writer/ReaderProxy.cpp
index 3a567292fd3..cb5136814e7 100644
--- a/src/cpp/rtps/writer/ReaderProxy.cpp
+++ b/src/cpp/rtps/writer/ReaderProxy.cpp
@@ -25,13 +25,14 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
 #include <fastdds/rtps/common/LocatorListComparisons.hpp>
-#include <rtps/participant/RTPSParticipantImpl.h>
+
+#include <rtps/DataSharing/DataSharingNotifier.hpp>
 #include <rtps/history/HistoryAttributesExtension.hpp>
 #include "rtps/messages/RTPSGapBuilder.hpp"
-#include <rtps/DataSharing/DataSharingNotifier.hpp>
+#include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/resources/TimedEvent.h>
+#include <rtps/writer/StatefulWriter.hpp>
 #include <utils/TimeConversion.hpp>
 
 
diff --git a/src/cpp/rtps/writer/StatefulPersistentWriter.cpp b/src/cpp/rtps/writer/StatefulPersistentWriter.cpp
index e2b17ca9f98..8d0b09a193c 100644
--- a/src/cpp/rtps/writer/StatefulPersistentWriter.cpp
+++ b/src/cpp/rtps/writer/StatefulPersistentWriter.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/writer/StatefulPersistentWriter.h>
+#include "StatefulPersistentWriter.hpp"
 
 #include <fastdds/rtps/history/WriterHistory.h>
 
diff --git a/include/fastdds/rtps/writer/StatefulPersistentWriter.h b/src/cpp/rtps/writer/StatefulPersistentWriter.hpp
similarity index 92%
rename from include/fastdds/rtps/writer/StatefulPersistentWriter.h
rename to src/cpp/rtps/writer/StatefulPersistentWriter.hpp
index 31a308d551b..9260b7b26cf 100644
--- a/include/fastdds/rtps/writer/StatefulPersistentWriter.h
+++ b/src/cpp/rtps/writer/StatefulPersistentWriter.hpp
@@ -13,15 +13,15 @@
 // limitations under the License.
 
 /**
- * @file StatefulPersistentWriter.h
+ * @file StatefulPersistentWriter.hpp
  */
-#ifndef _FASTDDS_RTPS_STATEFULPERSISTENTWRITER_H_
-#define _FASTDDS_RTPS_STATEFULPERSISTENTWRITER_H_
+#ifndef RTPS_WRITER__STATEFULPERSISTENTWRITER_HPP
+#define RTPS_WRITER__STATEFULPERSISTENTWRITER_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/writer/StatefulWriter.h>
-#include <fastdds/rtps/writer/PersistentWriter.h>
+#include <rtps/writer/PersistentWriter.hpp>
+#include <rtps/writer/StatefulWriter.hpp>
 
 namespace eprosima {
 namespace fastrtps {
@@ -105,4 +105,4 @@ class StatefulPersistentWriter : public StatefulWriter, private PersistentWriter
 } // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_STATEFULPERSISTENTWRITER_H_ */
+#endif /* RTPS_WRITER__STATEFULPERSISTENTWRITER_HPP */
diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp
index 3dc6daa26f0..10cff88eab3 100644
--- a/src/cpp/rtps/writer/StatefulWriter.cpp
+++ b/src/cpp/rtps/writer/StatefulWriter.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "StatefulWriter.hpp"
+
 #include <mutex>
 #include <stdexcept>
 #include <vector>
@@ -30,7 +32,6 @@
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/writer/ReaderProxy.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
 #include <fastdds/rtps/writer/WriterListener.h>
 
 #include <rtps/builtin/BuiltinProtocols.h>
diff --git a/include/fastdds/rtps/writer/StatefulWriter.h b/src/cpp/rtps/writer/StatefulWriter.hpp
similarity index 99%
rename from include/fastdds/rtps/writer/StatefulWriter.h
rename to src/cpp/rtps/writer/StatefulWriter.hpp
index 64e8599f15d..f0dba3a93e3 100644
--- a/include/fastdds/rtps/writer/StatefulWriter.h
+++ b/src/cpp/rtps/writer/StatefulWriter.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file StatefulWriter.h
+ * @file StatefulWriter.hpp
  */
 
-#ifndef _FASTDDS_RTPS_STATEFULWRITER_H_
-#define _FASTDDS_RTPS_STATEFULWRITER_H_
+#ifndef RTPS_WRITER__STATEFULWRITER_HPP
+#define RTPS_WRITER__STATEFULWRITER_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
@@ -550,4 +550,4 @@ class StatefulWriter : public RTPSWriter
 } /* namespace eprosima */
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_STATEFULWRITER_H_ */
+#endif /* RTPS_WRITER__STATEFULWRITER_HPP */
diff --git a/src/cpp/rtps/writer/StatelessPersistentWriter.cpp b/src/cpp/rtps/writer/StatelessPersistentWriter.cpp
index 698084697ca..5fdbe31f156 100644
--- a/src/cpp/rtps/writer/StatelessPersistentWriter.cpp
+++ b/src/cpp/rtps/writer/StatelessPersistentWriter.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/writer/StatelessPersistentWriter.h>
+#include "StatelessPersistentWriter.hpp"
 
 #include <fastdds/rtps/history/WriterHistory.h>
 
diff --git a/include/fastdds/rtps/writer/StatelessPersistentWriter.h b/src/cpp/rtps/writer/StatelessPersistentWriter.hpp
similarity index 91%
rename from include/fastdds/rtps/writer/StatelessPersistentWriter.h
rename to src/cpp/rtps/writer/StatelessPersistentWriter.hpp
index d7ef75b01b9..06835438acb 100644
--- a/include/fastdds/rtps/writer/StatelessPersistentWriter.h
+++ b/src/cpp/rtps/writer/StatelessPersistentWriter.hpp
@@ -13,15 +13,15 @@
 // limitations under the License.
 
 /**
- * @file StatelessPersistentWriter.h
+ * @file StatelessPersistentWriter.hpp
  */
-#ifndef _FASTDDS_RTPS_STATELESSPERSISTENTWRITER_H_
-#define _FASTDDS_RTPS_STATELESSPERSISTENTWRITER_H_
+#ifndef RTPS_WRITER__STATELESSPERSISTENTWRITER_HPP
+#define RTPS_WRITER__STATELESSPERSISTENTWRITER_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/writer/StatelessWriter.h>
-#include <fastdds/rtps/writer/PersistentWriter.h>
+#include <rtps/writer/PersistentWriter.hpp>
+#include <rtps/writer/StatelessWriter.hpp>
 
 namespace eprosima {
 namespace fastrtps {
@@ -96,4 +96,4 @@ class StatelessPersistentWriter : public StatelessWriter, private PersistentWrit
 } // namespace eprosima
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_STATELESSPERSISTENTWRITER_H_ */
+#endif /* RTPS_WRITER__STATELESSPERSISTENTWRITER_HPP */
diff --git a/src/cpp/rtps/writer/StatelessWriter.cpp b/src/cpp/rtps/writer/StatelessWriter.cpp
index 3b5a373736a..7305819b2f6 100644
--- a/src/cpp/rtps/writer/StatelessWriter.cpp
+++ b/src/cpp/rtps/writer/StatelessWriter.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/writer/StatelessWriter.h>
+#include "StatelessWriter.hpp"
 
 #include <algorithm>
 #include <mutex>
diff --git a/include/fastdds/rtps/writer/StatelessWriter.h b/src/cpp/rtps/writer/StatelessWriter.hpp
similarity index 98%
rename from include/fastdds/rtps/writer/StatelessWriter.h
rename to src/cpp/rtps/writer/StatelessWriter.hpp
index 0f51fd9c60b..73ddf04811b 100644
--- a/include/fastdds/rtps/writer/StatelessWriter.h
+++ b/src/cpp/rtps/writer/StatelessWriter.hpp
@@ -13,13 +13,18 @@
 // limitations under the License.
 
 /**
- * @file StatelessWriter.h
+ * @file StatelessWriter.hpp
  */
-#ifndef _FASTDDS_RTPS_STATELESSWRITER_H_
-#define _FASTDDS_RTPS_STATELESSWRITER_H_
+#ifndef RTPS_WRITER__STATELESSWRITER_HPP
+#define RTPS_WRITER__STATELESSWRITER_HPP
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
+#include <condition_variable>
+#include <list>
+#include <memory>
+#include <mutex>
+
 #include <fastdds/rtps/common/Time_t.h>
 #include <fastdds/rtps/history/IChangePool.h>
 #include <fastdds/rtps/history/IPayloadPool.h>
@@ -29,11 +34,6 @@
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
 
-#include <condition_variable>
-#include <list>
-#include <memory>
-#include <mutex>
-
 namespace eprosima {
 namespace fastrtps {
 namespace rtps {
@@ -299,4 +299,4 @@ class StatelessWriter : public RTPSWriter
 } /* namespace eprosima */
 
 #endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
-#endif /* _FASTDDS_RTPS_STATELESSWRITER_H_ */
+#endif /* RTPS_WRITER__STATELESSWRITER_HPP */
diff --git a/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp b/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp
index 6044017c2b5..2552866ae58 100644
--- a/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp
+++ b/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp
@@ -30,11 +30,11 @@
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include "Interfaces.hpp"
 #include <rtps/history/ITopicPayloadPool.h>
 #include <rtps/resources/TimedEvent.h>
+#include <rtps/writer/StatefulWriter.hpp>
 #include <statistics/rtps/monitor-service/MonitorServiceListener.hpp>
 #include <statistics/types/monitorservice_types.hpp>
 #include <statistics/types/monitorservice_typesPubSubTypes.h>
diff --git a/test/mock/rtps/MessageReceiver/rtps/messages/MessageReceiver.h b/test/mock/rtps/MessageReceiver/rtps/messages/MessageReceiver.h
index fc8c8ec1456..466e564df7b 100644
--- a/test/mock/rtps/MessageReceiver/rtps/messages/MessageReceiver.h
+++ b/test/mock/rtps/MessageReceiver/rtps/messages/MessageReceiver.h
@@ -24,9 +24,9 @@
 
 #include <fastdds/rtps/common/CDRMessage_t.h>
 #include <fastdds/rtps/common/Locator.h>
-#include <fastdds/rtps/writer/StatelessWriter.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
 
+#include <rtps/writer/StatefulWriter.hpp>
+#include <rtps/writer/StatelessWriter.hpp>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/test/mock/rtps/StatefulWriter/fastdds/rtps/writer/StatefulWriter.h b/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp
similarity index 95%
rename from test/mock/rtps/StatefulWriter/fastdds/rtps/writer/StatefulWriter.h
rename to test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp
index d4b82eb490f..e34b8eaca7a 100644
--- a/test/mock/rtps/StatefulWriter/fastdds/rtps/writer/StatefulWriter.h
+++ b/test/mock/rtps/StatefulWriter/rtps/writer/StatefulWriter.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file StatefulWriter.h
+ * @file StatefulWriter.hpp
  */
 
-#ifndef _FASTDDS_RTPS_STATEFULWRITER_H_
-#define _FASTDDS_RTPS_STATEFULWRITER_H_
+#ifndef RTPS_WRITER__STATEFULWRITER_HPP
+#define RTPS_WRITER__STATEFULWRITER_HPP
 
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
@@ -129,4 +129,4 @@ class StatefulWriter : public RTPSWriter
 } // namespace fastrtps
 } // namespace eprosima
 
-#endif // _FASTDDS_RTPS_STATEFULWRITER_H_
+#endif // RTPS_WRITER__STATEFULWRITER_HPP
diff --git a/test/mock/rtps/StatelessWriter/fastdds/rtps/writer/StatelessWriter.h b/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp
similarity index 93%
rename from test/mock/rtps/StatelessWriter/fastdds/rtps/writer/StatelessWriter.h
rename to test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp
index d81fb836dd7..68ffa54361e 100644
--- a/test/mock/rtps/StatelessWriter/fastdds/rtps/writer/StatelessWriter.h
+++ b/test/mock/rtps/StatelessWriter/rtps/writer/StatelessWriter.hpp
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 /**
- * @file StatelessWriter.h
+ * @file StatelessWriter.hpp
  */
 
-#ifndef _FASTDDS_RTPS_STATELESSWRITER_H_
-#define _FASTDDS_RTPS_STATELESSWRITER_H_
+#ifndef RTPS_WRITER__STATELESSWRITER_HPP
+#define RTPS_WRITER__STATELESSWRITER_HPP
 
 #include <fastdds/rtps/writer/RTPSWriter.h>
 
diff --git a/test/unittest/dds/publisher/DataWriterTests.cpp b/test/unittest/dds/publisher/DataWriterTests.cpp
index 04773355cba..78ccbbbecba 100644
--- a/test/unittest/dds/publisher/DataWriterTests.cpp
+++ b/test/unittest/dds/publisher/DataWriterTests.cpp
@@ -36,9 +36,6 @@
 #include <fastdds/dds/subscriber/qos/DataReaderQos.hpp>
 #include <fastdds/dds/subscriber/qos/SubscriberQos.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
-#include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
-
 #include <fastdds/publisher/DataWriterImpl.hpp>
 
 #include "../../common/CustomPayloadPool.hpp"
diff --git a/test/unittest/rtps/security/SecurityTests.hpp b/test/unittest/rtps/security/SecurityTests.hpp
index ac7712a0197..a0e4499e553 100644
--- a/test/unittest/rtps/security/SecurityTests.hpp
+++ b/test/unittest/rtps/security/SecurityTests.hpp
@@ -20,8 +20,6 @@
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
-#include <fastdds/rtps/writer/StatelessWriter.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/StatefulReader.hpp>
@@ -32,6 +30,8 @@
 #include <rtps/security/MockCryptographyPlugin.h>
 #include <rtps/security/SecurityManager.h>
 #include <rtps/security/SecurityPluginFactory.h>
+#include <rtps/writer/StatefulWriter.hpp>
+#include <rtps/writer/StatelessWriter.hpp>
 
 using namespace eprosima::fastrtps::rtps;
 using namespace eprosima::fastrtps::rtps::security;
diff --git a/test/unittest/rtps/writer/CMakeLists.txt b/test/unittest/rtps/writer/CMakeLists.txt
index 8011e7f35b0..84925000a1a 100644
--- a/test/unittest/rtps/writer/CMakeLists.txt
+++ b/test/unittest/rtps/writer/CMakeLists.txt
@@ -38,6 +38,7 @@ add_executable(ReaderProxyTests ${WRITERPROXYTESTS_SOURCE})
 target_compile_definitions(ReaderProxyTests PRIVATE
     BOOST_ASIO_STANDALONE
     ASIO_STANDALONE
+    $<$<BOOL:${MSVC}>:NOMINMAX> # avoid conflict with std::min & std::max in visual studio
     $<$<AND:$<NOT:$<BOOL:${WIN32}>>,$<STREQUAL:"${CMAKE_BUILD_TYPE}","Debug">>:__DEBUG>
     $<$<BOOL:${INTERNAL_DEBUG}>:__INTERNALDEBUG> # Internal debug activated.
     )
diff --git a/test/unittest/rtps/writer/ReaderProxyTests.cpp b/test/unittest/rtps/writer/ReaderProxyTests.cpp
index e92d8473710..f4053ff2c64 100644
--- a/test/unittest/rtps/writer/ReaderProxyTests.cpp
+++ b/test/unittest/rtps/writer/ReaderProxyTests.cpp
@@ -16,9 +16,9 @@
 #include <gtest/gtest.h>
 
 #include <fastdds/rtps/writer/ReaderProxy.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include <rtps/messages/RTPSGapBuilder.hpp>
+#include <rtps/writer/StatefulWriter.hpp>
 
 //using namespace eprosima::fastrtps::rtps;
 namespace eprosima {
diff --git a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp
index 807cc46f717..ca6d5036af7 100644
--- a/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp
+++ b/test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp
@@ -30,10 +30,10 @@
 #include <fastdds/dds/publisher/qos/WriterQos.hpp>
 #include <fastdds/rtps/common/Guid.h>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include <rtps/history/ITopicPayloadPool.h>
 #include <rtps/resources/TimedEvent.h>
+#include <rtps/writer/StatefulWriter.hpp>
 #include <statistics/rtps/monitor-service/Interfaces.hpp>
 #include <statistics/rtps/monitor-service/MonitorServiceListener.hpp>
 #include <statistics/types/monitorservice_types.hpp>