diff --git a/src/cpp/fastdds/core/policy/ParameterList.hpp b/src/cpp/fastdds/core/policy/ParameterList.hpp
index 39dd77057fd..c42f78746d5 100644
--- a/src/cpp/fastdds/core/policy/ParameterList.hpp
+++ b/src/cpp/fastdds/core/policy/ParameterList.hpp
@@ -20,14 +20,14 @@
 #define _FASTDDS_DDS_QOS_PARAMETERLIST_HPP_
 #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC
 
+#include <functional>
+
 #include <fastdds/dds/core/policy/ParameterTypes.hpp>
-#include <fastdds/rtps/messages/RTPS_messages.h>
 #include <fastdds/rtps/common/CacheChange.h>
+#include <fastdds/rtps/messages/RTPS_messages.h>
 
 #include <rtps/messages/CDRMessage.hpp>
 
-#include <functional>
-
 namespace eprosima {
 namespace fastdds {
 namespace dds {
diff --git a/src/cpp/rtps/messages/CDRMessage.cpp b/src/cpp/rtps/messages/CDRMessage.cpp
index 3cff3eff4f8..aaaa8dd21d1 100644
--- a/src/cpp/rtps/messages/CDRMessage.cpp
+++ b/src/cpp/rtps/messages/CDRMessage.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include <rtps/messages/CDRMessage.hpp>
+#include "CDRMessage.hpp"
 
 #include <cassert>
 #include <cstring>
diff --git a/src/cpp/security/authentication/PKIDH.cpp b/src/cpp/security/authentication/PKIDH.cpp
index 856caef55f7..b1fbedb90b5 100644
--- a/src/cpp/security/authentication/PKIDH.cpp
+++ b/src/cpp/security/authentication/PKIDH.cpp
@@ -22,12 +22,13 @@
 
 #include <security/authentication/PKIDH.h>
 
+#include <openssl/opensslv.h>
+
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
 #include <fastdds/rtps/security/logging/Logging.h>
 
-#include <openssl/opensslv.h>
 #include <rtps/messages/CDRMessage.hpp>
 #include <security/authentication/PKIIdentityHandle.h>