diff --git a/include/fastrtps/rtps/messages/RTPSMessageCreator.h b/include/fastrtps/rtps/messages/RTPSMessageCreator.h
deleted file mode 100644
index 377e1a23142..00000000000
--- a/include/fastrtps/rtps/messages/RTPSMessageCreator.h
+++ /dev/null
@@ -1,23 +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 RTPSMessageCreator.h
-*/
-#ifndef CDRMESSAGECREATOR_H_
-#define CDRMESSAGECREATOR_H_
-
-#include <fastdds/rtps/messages/RTPSMessageCreator.h>
-
-#endif /* CDRMESSAGECREATOR_H_ */
diff --git a/src/cpp/rtps/messages/RTPSMessageCreator.cpp b/src/cpp/rtps/messages/RTPSMessageCreator.cpp
index 83314711540..6e1de4b2998 100644
--- a/src/cpp/rtps/messages/RTPSMessageCreator.cpp
+++ b/src/cpp/rtps/messages/RTPSMessageCreator.cpp
@@ -21,7 +21,7 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 #include <fastdds/rtps/messages/CDRMessage.h>
-#include <fastdds/rtps/messages/RTPSMessageCreator.h>
+#include <rtps/messages/RTPSMessageCreator.h>
 
 using namespace eprosima::fastrtps;
 using ParameterList = eprosima::fastdds::dds::ParameterList;
diff --git a/include/fastdds/rtps/messages/RTPSMessageCreator.h b/src/cpp/rtps/messages/RTPSMessageCreator.h
similarity index 100%
rename from include/fastdds/rtps/messages/RTPSMessageCreator.h
rename to src/cpp/rtps/messages/RTPSMessageCreator.h
diff --git a/src/cpp/rtps/messages/RTPSMessageGroup.cpp b/src/cpp/rtps/messages/RTPSMessageGroup.cpp
index fbb117ac942..827120e5805 100644
--- a/src/cpp/rtps/messages/RTPSMessageGroup.cpp
+++ b/src/cpp/rtps/messages/RTPSMessageGroup.cpp
@@ -22,7 +22,7 @@
 #include <algorithm>
 
 #include <fastdds/dds/log/Log.hpp>
-#include <fastdds/rtps/messages/RTPSMessageCreator.h>
+#include <rtps/messages/RTPSMessageCreator.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
 
diff --git a/src/cpp/rtps/messages/RTPSMessageGroup.h b/src/cpp/rtps/messages/RTPSMessageGroup.h
index b2e1d98dfcb..76613c009bd 100644
--- a/src/cpp/rtps/messages/RTPSMessageGroup.h
+++ b/src/cpp/rtps/messages/RTPSMessageGroup.h
@@ -22,7 +22,7 @@
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
 #include <fastdds/rtps/messages/RTPSMessageSenderInterface.hpp>
-#include <fastdds/rtps/messages/RTPSMessageCreator.h>
+#include <rtps/messages/RTPSMessageCreator.h>
 #include <fastdds/rtps/common/FragmentNumber.h>
 
 #include <vector>
diff --git a/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp b/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp
index f1b31218440..afa2ed303c9 100644
--- a/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp
+++ b/src/cpp/rtps/messages/RTPSMessageGroup_t.hpp
@@ -23,7 +23,7 @@
 
 #include <fastdds/rtps/common/CDRMessage_t.h>
 #include <fastdds/rtps/messages/CDRMessage.h>
-#include <fastdds/rtps/messages/RTPSMessageCreator.h>
+#include <rtps/messages/RTPSMessageCreator.h>
 
 namespace eprosima {
 namespace fastrtps {
diff --git a/src/cpp/rtps/reader/WriterProxy.cpp b/src/cpp/rtps/reader/WriterProxy.cpp
index 55f3a741855..b4a146cc7cc 100644
--- a/src/cpp/rtps/reader/WriterProxy.cpp
+++ b/src/cpp/rtps/reader/WriterProxy.cpp
@@ -21,7 +21,7 @@
 
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/data/WriterProxyData.h>
-#include <fastdds/rtps/messages/RTPSMessageCreator.h>
+#include <rtps/messages/RTPSMessageCreator.h>
 #include <fastdds/rtps/reader/StatefulReader.h>
 #include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
diff --git a/src/cpp/rtps/writer/StatefulWriter.cpp b/src/cpp/rtps/writer/StatefulWriter.cpp
index f2e35e819f1..6046dc187b1 100644
--- a/src/cpp/rtps/writer/StatefulWriter.cpp
+++ b/src/cpp/rtps/writer/StatefulWriter.cpp
@@ -26,7 +26,7 @@
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/interfaces/IReaderDataFilter.hpp>
-#include <fastdds/rtps/messages/RTPSMessageCreator.h>
+#include <rtps/messages/RTPSMessageCreator.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
 #include <fastdds/rtps/reader/RTPSReader.h>
 #include <fastdds/rtps/resources/ResourceEvent.h>
diff --git a/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp b/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp
index 3ae852e659c..64f7dfc475f 100644
--- a/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp
+++ b/src/cpp/statistics/rtps/messages/RTPSStatisticsMessages.hpp
@@ -26,7 +26,7 @@
 #include <fastdds/rtps/common/CDRMessage_t.h>
 #include <fastdds/rtps/common/Types.h>
 #include <fastdds/rtps/messages/CDRMessage.h>
-#include <fastdds/rtps/messages/RTPSMessageCreator.h>
+#include <rtps/messages/RTPSMessageCreator.h>
 
 #define FASTDDS_STATISTICS_NETWORK_SUBMESSAGE 0x80