From f0686afe0afc977db1b31e66b236ca0543a5362e Mon Sep 17 00:00:00 2001
From: elianalf <62831776+elianalf@users.noreply.github.com>
Date: Thu, 25 Apr 2024 09:36:36 +0200
Subject: [PATCH] Refs #20819: Make TimedEvent private

Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com>
---
 include/fastrtps/rtps/resources/TimedEvent.h  | 25 -------------------
 src/cpp/fastdds/publisher/DataWriterImpl.cpp  |  2 +-
 src/cpp/fastdds/subscriber/DataReaderImpl.cpp |  2 +-
 .../builtin/data/ParticipantProxyData.cpp     |  2 +-
 .../DS/PDPSecurityInitiatorListener.cpp       |  2 +-
 .../builtin/discovery/participant/PDP.cpp     |  2 +-
 .../discovery/participant/PDPListener.cpp     |  2 +-
 .../discovery/participant/PDPSimple.cpp       |  2 +-
 .../participant/timedevent/DSClientEvent.h    |  2 +-
 .../participant/timedevent/DServerEvent.hpp   |  2 +-
 src/cpp/rtps/builtin/liveliness/WLP.cpp       |  2 +-
 src/cpp/rtps/reader/WriterProxy.cpp           |  2 +-
 src/cpp/rtps/resources/TimedEvent.cpp         |  2 +-
 .../cpp}/rtps/resources/TimedEvent.h          |  0
 src/cpp/rtps/resources/TimedEventImpl.h       |  2 +-
 src/cpp/rtps/security/SecurityManager.h       |  3 +--
 src/cpp/rtps/writer/LivelinessManager.hpp     |  3 +--
 src/cpp/rtps/writer/ReaderProxy.cpp           | 15 ++++++-----
 src/cpp/rtps/writer/StatefulWriter.cpp        |  2 +-
 .../rtps/monitor-service/MonitorService.hpp   |  2 +-
 .../{fastdds => }/rtps/resources/TimedEvent.h |  0
 .../rtps/reader/WriterProxyAcknackTests.cpp   |  4 +--
 .../rtps/reader/WriterProxyStopTest.cpp       |  4 +--
 .../unittest/rtps/reader/WriterProxyTests.cpp |  4 +--
 .../resources/timedevent/mock/MockEvent.h     |  2 +-
 .../rtps/monitor-service/MonitorService.hpp   |  2 +-
 26 files changed, 29 insertions(+), 63 deletions(-)
 delete mode 100644 include/fastrtps/rtps/resources/TimedEvent.h
 rename {include/fastdds => src/cpp}/rtps/resources/TimedEvent.h (100%)
 rename test/mock/rtps/TimedEvent/{fastdds => }/rtps/resources/TimedEvent.h (100%)

diff --git a/include/fastrtps/rtps/resources/TimedEvent.h b/include/fastrtps/rtps/resources/TimedEvent.h
deleted file mode 100644
index f61eac2a567..00000000000
--- a/include/fastrtps/rtps/resources/TimedEvent.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2016 Proyectos y Sistemas de Mantenimiento SL (eProsima).
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/**
- * @file TimedEvent.h
- *
- */
-
-#ifndef _RTPS_RESOURCES_TIMEDEVENT_H_
-#define _RTPS_RESOURCES_TIMEDEVENT_H_
-
-#include <fastdds/rtps/resources/TimedEvent.h>
-
-#endif //_RTPS_RESOURCES_TIMEDEVENT_H_
diff --git a/src/cpp/fastdds/publisher/DataWriterImpl.cpp b/src/cpp/fastdds/publisher/DataWriterImpl.cpp
index 85000195b4e..8efef889650 100644
--- a/src/cpp/fastdds/publisher/DataWriterImpl.cpp
+++ b/src/cpp/fastdds/publisher/DataWriterImpl.cpp
@@ -39,7 +39,6 @@
 #include <fastdds/rtps/attributes/TopicAttributes.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
@@ -50,6 +49,7 @@
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/RTPSDomainImpl.hpp>
+#include <rtps/resources/TimedEvent.h>
 #include <utils/TimeConversion.hpp>
 
 #ifdef FASTDDS_STATISTICS
diff --git a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp b/src/cpp/fastdds/subscriber/DataReaderImpl.cpp
index 11653e7ace5..365c5d42585 100644
--- a/src/cpp/fastdds/subscriber/DataReaderImpl.cpp
+++ b/src/cpp/fastdds/subscriber/DataReaderImpl.cpp
@@ -39,7 +39,6 @@
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/subscriber/DataReaderImpl.hpp>
 #include <fastdds/subscriber/DataReaderImpl/ReadTakeCommand.hpp>
@@ -50,6 +49,7 @@
 
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/resources/TimedEvent.h>
 #include <utils/TimeConversion.hpp>
 
 #ifdef FASTDDS_STATISTICS
diff --git a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
index c06e5337d9e..d6e6692c113 100644
--- a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
+++ b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
@@ -28,11 +28,11 @@
 #include <fastdds/rtps/builtin/data/ReaderProxyData.h>
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/common/VendorId_t.hpp>
-#include <fastdds/rtps/resources/TimedEvent.h>
 
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/discovery/participant/PDPSimple.h>
 #include <rtps/network/NetworkFactory.h>
+#include <rtps/resources/TimedEvent.h>
 #include <rtps/transport/shared_mem/SHMLocator.hpp>
 #include <utils/TimeConversion.hpp>
 
diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp
index 6a6dc849263..fd8d4fcbbbd 100644
--- a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp
@@ -27,7 +27,6 @@
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
 
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
@@ -35,6 +34,7 @@
 #include <rtps/builtin/discovery/participant/PDPListener.h>
 #include <rtps/network/utils/external_locators.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/resources/TimedEvent.h>
 
 using ParameterList = eprosima::fastdds::dds::ParameterList;
 
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
index 89989335e65..a57349827bd 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -35,7 +35,6 @@
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/reader/StatelessReader.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/writer/StatelessWriter.h>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
@@ -49,6 +48,7 @@
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/network/utils/external_locators.hpp>
+#include <rtps/resources/TimedEvent.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <utils/shared_mutex.hpp>
 #include <utils/TimeConversion.hpp>
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
index 98aee8fc88f..7cb29a8f696 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
@@ -27,13 +27,13 @@
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
 
 #include <rtps/builtin/discovery/endpoint/EDP.h>
 #include <rtps/builtin/discovery/participant/PDP.h>
 #include <rtps/builtin/discovery/participant/PDPEndpoints.hpp>
 #include <rtps/network/utils/external_locators.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/resources/TimedEvent.h>
 #ifdef FASTDDS_STATISTICS
 #include <statistics/rtps/monitor-service/interfaces/IConnectionsObserver.hpp>
 #endif //FASTDDS_STATISTICS
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
index 62cc45d910c..769eb45b73a 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -30,7 +30,6 @@
 #include <fastdds/rtps/participant/RTPSParticipantListener.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/reader/StatelessReader.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/writer/StatelessWriter.h>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
@@ -45,6 +44,7 @@
 #include <rtps/builtin/liveliness/WLP.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/resources/TimedEvent.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.h b/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.h
index e52ba8e05bc..06f95325635 100644
--- a/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.h
+++ b/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.h
@@ -21,7 +21,7 @@
 #define _FASTDDS_RTPS_DSCLIENTEVENT_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/resources/TimedEvent.h>
+#include <rtps/resources/TimedEvent.h>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp
index b0efdf9c469..425e69144da 100644
--- a/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp
+++ b/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.hpp
@@ -21,7 +21,7 @@
 #define _FASTDDS_RTPS_DSERVEREVENT2_H_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
-#include <fastdds/rtps/resources/TimedEvent.h>
+#include <rtps/resources/TimedEvent.h>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/rtps/builtin/liveliness/WLP.cpp b/src/cpp/rtps/builtin/liveliness/WLP.cpp
index 123aa2f4dd2..2e62081f1d1 100644
--- a/src/cpp/rtps/builtin/liveliness/WLP.cpp
+++ b/src/cpp/rtps/builtin/liveliness/WLP.cpp
@@ -29,7 +29,6 @@
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
 
 #include <fastdds/rtps/writer/StatefulWriter.h>
 #include <fastdds/rtps/writer/WriterListener.h>
@@ -39,6 +38,7 @@
 #include <rtps/builtin/liveliness/WLPListener.h>
 #include <rtps/history/TopicPayloadPoolRegistry.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/resources/TimedEvent.h>
 #include <rtps/writer/LivelinessManager.hpp>
 #include <utils/TimeConversion.hpp>
 
diff --git a/src/cpp/rtps/reader/WriterProxy.cpp b/src/cpp/rtps/reader/WriterProxy.cpp
index 55f3a741855..7fc1988669d 100644
--- a/src/cpp/rtps/reader/WriterProxy.cpp
+++ b/src/cpp/rtps/reader/WriterProxy.cpp
@@ -23,7 +23,6 @@
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/messages/RTPSMessageCreator.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 
 #include "rtps/RTPSDomainImpl.hpp"
@@ -31,6 +30,7 @@
 #include <rtps/network/utils/external_locators.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/resources/TimedEvent.h>
 
 #if !defined(NDEBUG) && !defined(ANDROID) && defined(FASTDDS_SOURCE) && defined(__unix__)
 #define SHOULD_DEBUG_LINUX
diff --git a/src/cpp/rtps/resources/TimedEvent.cpp b/src/cpp/rtps/resources/TimedEvent.cpp
index 5b83b1640ce..1377e840b8a 100644
--- a/src/cpp/rtps/resources/TimedEvent.cpp
+++ b/src/cpp/rtps/resources/TimedEvent.cpp
@@ -17,7 +17,7 @@
  *
  */
 
-#include <fastdds/rtps/resources/TimedEvent.h>
+#include <rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
 
 #include "TimedEventImpl.h"
diff --git a/include/fastdds/rtps/resources/TimedEvent.h b/src/cpp/rtps/resources/TimedEvent.h
similarity index 100%
rename from include/fastdds/rtps/resources/TimedEvent.h
rename to src/cpp/rtps/resources/TimedEvent.h
diff --git a/src/cpp/rtps/resources/TimedEventImpl.h b/src/cpp/rtps/resources/TimedEventImpl.h
index 01ab3c8cdbb..a36f767c279 100644
--- a/src/cpp/rtps/resources/TimedEventImpl.h
+++ b/src/cpp/rtps/resources/TimedEventImpl.h
@@ -23,7 +23,7 @@
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <fastdds/rtps/common/Time_t.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
+#include <rtps/resources/TimedEvent.h>
 
 #include <atomic>
 #include <functional>
diff --git a/src/cpp/rtps/security/SecurityManager.h b/src/cpp/rtps/security/SecurityManager.h
index f2da36a54b0..ee3807a927b 100644
--- a/src/cpp/rtps/security/SecurityManager.h
+++ b/src/cpp/rtps/security/SecurityManager.h
@@ -32,10 +32,9 @@
 #include <fastdds/rtps/common/SequenceNumber.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
 #include <fastdds/rtps/reader/ReaderListener.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/security/authentication/Handshake.h>
 #include <fastdds/rtps/security/common/ParticipantGenericMessage.h>
-
+#include <rtps/resources/TimedEvent.h>
 #include <rtps/security/ISecurityPluginFactory.h>
 #include <utils/ProxyPool.hpp>
 #include <utils/shared_mutex.hpp>
diff --git a/src/cpp/rtps/writer/LivelinessManager.hpp b/src/cpp/rtps/writer/LivelinessManager.hpp
index d2f811afc33..4a37c5599b4 100644
--- a/src/cpp/rtps/writer/LivelinessManager.hpp
+++ b/src/cpp/rtps/writer/LivelinessManager.hpp
@@ -20,9 +20,8 @@
 
 #include <mutex>
 
-#include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/utils/collections/ResourceLimitedVector.hpp>
-
+#include <rtps/resources/TimedEvent.h>
 #include <rtps/writer/LivelinessData.hpp>
 #include <utils/shared_mutex.hpp>
 
diff --git a/src/cpp/rtps/writer/ReaderProxy.cpp b/src/cpp/rtps/writer/ReaderProxy.cpp
index 005ad3e7716..3a567292fd3 100644
--- a/src/cpp/rtps/writer/ReaderProxy.cpp
+++ b/src/cpp/rtps/writer/ReaderProxy.cpp
@@ -17,24 +17,23 @@
  *
  */
 
+#include <fastdds/rtps/writer/ReaderProxy.h>
+
+#include <mutex>
+#include <cassert>
+#include <algorithm>
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/history/WriterHistory.h>
-#include <fastdds/rtps/writer/ReaderProxy.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
-#include <utils/TimeConversion.hpp>
 #include <fastdds/rtps/common/LocatorListComparisons.hpp>
-
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/history/HistoryAttributesExtension.hpp>
-
 #include "rtps/messages/RTPSGapBuilder.hpp"
 #include <rtps/DataSharing/DataSharingNotifier.hpp>
+#include <rtps/resources/TimedEvent.h>
+#include <utils/TimeConversion.hpp>
 
-#include <mutex>
-#include <cassert>
-#include <algorithm>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp
index ec2b10342dc..c3a31dba31c 100644
--- a/src/cpp/rtps/writer/StatefulWriter.cpp
+++ b/src/cpp/rtps/writer/StatefulWriter.cpp
@@ -31,7 +31,6 @@
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/writer/ReaderProxy.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
 #include <fastdds/rtps/writer/WriterListener.h>
@@ -47,6 +46,7 @@
 #include <rtps/messages/RTPSGapBuilder.hpp>
 #include <rtps/network/utils/external_locators.hpp>
 #include <rtps/participant/RTPSParticipantImpl.h>
+#include <rtps/resources/TimedEvent.h>
 #include <rtps/RTPSDomainImpl.hpp>
 
 #ifdef FASTDDS_STATISTICS
diff --git a/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp b/src/cpp/statistics/rtps/monitor-service/MonitorService.hpp
index 14d90c0bd3a..6044017c2b5 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/resources/TimedEvent.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include "Interfaces.hpp"
 #include <rtps/history/ITopicPayloadPool.h>
+#include <rtps/resources/TimedEvent.h>
 #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/TimedEvent/fastdds/rtps/resources/TimedEvent.h b/test/mock/rtps/TimedEvent/rtps/resources/TimedEvent.h
similarity index 100%
rename from test/mock/rtps/TimedEvent/fastdds/rtps/resources/TimedEvent.h
rename to test/mock/rtps/TimedEvent/rtps/resources/TimedEvent.h
diff --git a/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp b/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp
index e3a203f670d..6d75c509181 100644
--- a/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp
+++ b/test/unittest/rtps/reader/WriterProxyAcknackTests.cpp
@@ -24,12 +24,10 @@
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
-
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/WriterProxy.h>
-
 #include <rtps/reader/WriterProxy.cpp>
+#include <rtps/resources/TimedEvent.h>
 
 #include "../../common/operators.hpp"
 
diff --git a/test/unittest/rtps/reader/WriterProxyStopTest.cpp b/test/unittest/rtps/reader/WriterProxyStopTest.cpp
index 038382f0894..bab10b6a294 100644
--- a/test/unittest/rtps/reader/WriterProxyStopTest.cpp
+++ b/test/unittest/rtps/reader/WriterProxyStopTest.cpp
@@ -21,12 +21,10 @@
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
-
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/WriterProxy.h>
-
 #include <rtps/reader/WriterProxy.cpp>
+#include <rtps/resources/TimedEvent.h>
 
 namespace testing {
 namespace internal {
diff --git a/test/unittest/rtps/reader/WriterProxyTests.cpp b/test/unittest/rtps/reader/WriterProxyTests.cpp
index 649db33f020..493bc644bef 100644
--- a/test/unittest/rtps/reader/WriterProxyTests.cpp
+++ b/test/unittest/rtps/reader/WriterProxyTests.cpp
@@ -24,12 +24,10 @@
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
-#include <fastdds/rtps/resources/TimedEvent.h>
-
 #include <rtps/participant/RTPSParticipantImpl.h>
 #include <rtps/reader/WriterProxy.h>
-
 #include <rtps/reader/WriterProxy.cpp>
+#include <rtps/resources/TimedEvent.h>
 
 #include "../../common/operators.hpp"
 
diff --git a/test/unittest/rtps/resources/timedevent/mock/MockEvent.h b/test/unittest/rtps/resources/timedevent/mock/MockEvent.h
index dc00803d984..22b000fbcd4 100644
--- a/test/unittest/rtps/resources/timedevent/mock/MockEvent.h
+++ b/test/unittest/rtps/resources/timedevent/mock/MockEvent.h
@@ -21,7 +21,7 @@
 
 #include <asio.hpp>
 
-#include <fastdds/rtps/resources/TimedEvent.h>
+#include <rtps/resources/TimedEvent.h>
 
 class MockEvent
 {
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 636a93084af..807cc46f717 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/resources/TimedEvent.h>
 #include <fastdds/rtps/writer/StatefulWriter.h>
 
 #include <rtps/history/ITopicPayloadPool.h>
+#include <rtps/resources/TimedEvent.h>
 #include <statistics/rtps/monitor-service/Interfaces.hpp>
 #include <statistics/rtps/monitor-service/MonitorServiceListener.hpp>
 #include <statistics/types/monitorservice_types.hpp>