diff --git a/examples/cpp/dds/LivelinessQoS/LivelinessPublisher.h b/examples/cpp/dds/LivelinessQoS/LivelinessPublisher.h
index 9b8eb9d5f3e..f3cfca53c7b 100644
--- a/examples/cpp/dds/LivelinessQoS/LivelinessPublisher.h
+++ b/examples/cpp/dds/LivelinessQoS/LivelinessPublisher.h
@@ -22,15 +22,15 @@
 
 #include <mutex>
 
-#include "TopicPubSubTypes.h"
-#include "Topic.hpp"
-
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/publisher/DataWriter.hpp>
 #include <fastdds/dds/publisher/DataWriterListener.hpp>
 #include <fastdds/dds/publisher/Publisher.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
 
+#include "TopicPubSubTypes.h"
+#include "Topic.hpp"
+
 class LivelinessPublisher
 {
 public:
diff --git a/examples/cpp/dds/LivelinessQoS/LivelinessSubscriber.h b/examples/cpp/dds/LivelinessQoS/LivelinessSubscriber.h
index 9106595f451..fc3f2065053 100644
--- a/examples/cpp/dds/LivelinessQoS/LivelinessSubscriber.h
+++ b/examples/cpp/dds/LivelinessQoS/LivelinessSubscriber.h
@@ -20,9 +20,6 @@
 #ifndef LIVELINESSSUBSCRIBER_H_
 #define LIVELINESSSUBSCRIBER_H_
 
-#include "TopicPubSubTypes.h"
-#include "Topic.hpp"
-
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 #include <fastdds/dds/subscriber/DataReader.hpp>
@@ -31,6 +28,9 @@
 #include <fastdds/dds/topic/Topic.hpp>
 #include <fastdds/rtps/participant/ParticipantDiscoveryInfo.h>
 
+#include "TopicPubSubTypes.h"
+#include "Topic.hpp"
+
 class LivelinessSubscriber
 {
 public:
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
index 4c8a1738284..7a5e2ab085f 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -90,10 +90,6 @@ set(${PROJECT_NAME}_source_files
     fastdds/topic/TopicProxyFactory.cpp
     fastdds/topic/TypeSupport.cpp
     fastdds/utils/QosConverters.cpp
-    fastdds/xtypes/exception/Exception.cpp
-    fastdds/xtypes/type_representation/dds_xtypes_typeobjectPubSubTypes.cxx
-    fastdds/xtypes/type_representation/TypeObjectUtils.cpp
-    fastdds/xtypes/type_representation/TypeObjectRegistry.cpp
     rtps/attributes/PropertyPolicy.cpp
     rtps/attributes/RTPSParticipantAttributes.cpp
     rtps/attributes/ThreadSettings.cpp
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
index 9c9d99df772..62cc45d910c 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -20,7 +20,6 @@
 
 #include <mutex>
 
-#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/rtps/builtin/data/NetworkConfiguration.hpp>
 #include <fastdds/rtps/builtin/data/ParticipantProxyData.h>
@@ -34,6 +33,7 @@
 #include <fastdds/rtps/resources/TimedEvent.h>
 #include <fastdds/rtps/writer/StatelessWriter.h>
 
+#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <fastdds/utils/IPLocator.h>
 #include <rtps/builtin/BuiltinProtocols.h>
 #include <rtps/builtin/discovery/endpoint/EDPSimple.h>
diff --git a/test/blackbox/api/dds-pim/PubSubReader.hpp b/test/blackbox/api/dds-pim/PubSubReader.hpp
index 5c1e62ccce4..91913375c9d 100644
--- a/test/blackbox/api/dds-pim/PubSubReader.hpp
+++ b/test/blackbox/api/dds-pim/PubSubReader.hpp
@@ -55,7 +55,6 @@
 #include <fastdds/utils/IPLocator.h>
 
 using eprosima::fastdds::dds::DomainParticipantFactory;
-using eprosima::fastdds::dds::ReturnCode_t;
 using eprosima::fastdds::rtps::UDPTransportDescriptor;
 using eprosima::fastdds::rtps::UDPv4TransportDescriptor;
 using eprosima::fastdds::rtps::UDPv6TransportDescriptor;
diff --git a/test/blackbox/common/DDSBlackboxTestsStatisticsDomainParticipant.cpp b/test/blackbox/common/DDSBlackboxTestsStatisticsDomainParticipant.cpp
index 96eb9961bbe..81a80a88ff3 100644
--- a/test/blackbox/common/DDSBlackboxTestsStatisticsDomainParticipant.cpp
+++ b/test/blackbox/common/DDSBlackboxTestsStatisticsDomainParticipant.cpp
@@ -22,7 +22,6 @@
 #include <fastdds/statistics/topic_names.hpp>
 #include <gtest/gtest.h>
 
-#include <statistics/fastdds/domain/DomainParticipantImpl.hpp>
 #include "../types/statistics/types.hpp"
 #include "../types/statistics/typesPubSubTypes.h"
 #include "BlackboxTests.hpp"
diff --git a/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h b/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h
index c0a0c025ffd..d02b3ad8b72 100644
--- a/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h
+++ b/test/mock/rtps/BuiltinProtocols/rtps/builtin/BuiltinProtocols.h
@@ -19,22 +19,12 @@
 #ifndef _FASTDDS_RTPS_BUILTINPROTOCOLS_H_
 #define _FASTDDS_RTPS_BUILTINPROTOCOLS_H_
 
-#include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 #include <fastdds/rtps/attributes/RTPSParticipantAttributes.h>
 #include <fastdds/rtps/common/Locator.h>
 
 #include <fastdds/builtin/type_lookup_service/TypeLookupManager.hpp>
 
 namespace eprosima {
-namespace fastdds {
-namespace dds {
-namespace builtin {
-
-class TypeLookupManager;
-
-} // namespace builtin
-} // namespace dds
-} // namespace fastdds
 namespace fastrtps {
 namespace rtps {
 
@@ -45,16 +35,9 @@ class BuiltinProtocols
 {
 public:
 
-    BuiltinProtocols()
-        : mp_participantImpl(nullptr)
-        , mp_PDP(nullptr)
-        , mp_WLP(nullptr)
-    {
-    }
+    BuiltinProtocols() = default;
 
-    virtual ~BuiltinProtocols()
-    {
-    }
+    virtual ~BuiltinProtocols() = default;
 
     //!Locator list for metatraffic
     LocatorList_t m_metatrafficMulticastLocatorList;
@@ -70,16 +53,16 @@ class BuiltinProtocols
     std::list<eprosima::fastdds::rtps::RemoteServerAttributes> m_DiscoveryServers;
 
     //!Pointer to the RTPSParticipantImpl.
-    RTPSParticipantImpl* mp_participantImpl;
+    RTPSParticipantImpl* mp_participantImpl {nullptr};
 
     //!Pointer to the PDPSimple.
-    PDP* mp_PDP;
+    PDP* mp_PDP {nullptr};
 
     //!Pointer to the WLP
-    WLP* mp_WLP;
+    WLP* mp_WLP {nullptr};
 
     //!Pointer to the TypeLookupManager
-    fastdds::dds::builtin::TypeLookupManager* typelookup_manager_;
+    fastdds::dds::builtin::TypeLookupManager* typelookup_manager_ {nullptr};
 
 };
 
diff --git a/test/unittest/statistics/dds/CMakeLists.txt b/test/unittest/statistics/dds/CMakeLists.txt
index 3f73993aa35..eee820bae49 100644
--- a/test/unittest/statistics/dds/CMakeLists.txt
+++ b/test/unittest/statistics/dds/CMakeLists.txt
@@ -606,11 +606,10 @@ if (SQLITE3_SUPPORT AND FASTDDS_STATISTICS AND NOT QNX)
         ${THIRDPARTY_BOOST_INCLUDE_DIR})
     target_link_libraries(StatisticsDomainParticipantStatusQueryableTests ${PRIVACY}
         fastcdr
-        fastdds::xtypes::dynamic-types::impl
-        foonathan_memory
         fastdds::log
         fastdds::xtypes::dynamic-types::impl
         fastdds::xtypes::type-representation
+        foonathan_memory
         GTest::gmock
         ${CMAKE_DL_LIBS}
         ${TINYXML2_LIBRARY}
diff --git a/versions.md b/versions.md
index c5f578a40ee..d87808948b2 100644
--- a/versions.md
+++ b/versions.md
@@ -22,12 +22,14 @@ Forthcoming
   * shared_mutex
   * StringMatching
   * TimeConversion
+  * TypeLookupService
   * DBQueue
 * Added create participant methods that use environment XML profile for participant configuration.
 * XML Parser API no longer public.
 * New TypeObjectRegistry class to register/query TypeObjects/TypeIdentifiers.
 * New TypeObjectUtils class providing API to build and register TypeObjects/TypeIdentifiers.
-* Added `non_blocking_send` to TCP Transport.
+* Refactor Dynamic Language Binding API according to OMG XTypes v1.3 specification.
+* Refactor ReturnCode complying with OMG DDS specification.
 
 Version 2.14.0
 --------------