diff --git a/fastdds_python/src/swig/fastdds.i b/fastdds_python/src/swig/fastdds.i
index 62bcb5e8..11a48f6a 100644
--- a/fastdds_python/src/swig/fastdds.i
+++ b/fastdds_python/src/swig/fastdds.i
@@ -162,6 +162,7 @@ namespace xtypes {
 %include "fastdds/rtps/attributes/RTPSParticipantAttributes.i"
 %include "fastdds/rtps/attributes/ReaderAttributes.i"
 %include "fastdds/rtps/attributes/WriterAttributes.i"
+%include "fastdds/rtps/common/RemoteLocators.i"
 %include "fastdds/rtps/common/SequenceNumber.i"
 %include "fastdds/rtps/common/SampleIdentity.i"
 %include "fastdds/rtps/common/WriteParams.i"
diff --git a/fastdds_python/src/swig/fastdds/dds/builtin/topic/BuiltinTopicKey.i b/fastdds_python/src/swig/fastdds/dds/builtin/topic/BuiltinTopicKey.i
index dae98743..296942e2 100644
--- a/fastdds_python/src/swig/fastdds/dds/builtin/topic/BuiltinTopicKey.i
+++ b/fastdds_python/src/swig/fastdds/dds/builtin/topic/BuiltinTopicKey.i
@@ -16,4 +16,5 @@
 #include "fastdds/dds/builtin/topic/BuiltinTopicKey.hpp"
 %}
 
+%include "fastdds/rtps/builtin/data/BuiltinTopicKey.hpp"
 %include "fastdds/dds/builtin/topic/BuiltinTopicKey.hpp"
diff --git a/fastdds_python/src/swig/fastdds/dds/builtin/topic/PublicationBuiltinTopicData.i b/fastdds_python/src/swig/fastdds/dds/builtin/topic/PublicationBuiltinTopicData.i
index a5468968..09a5fda2 100644
--- a/fastdds_python/src/swig/fastdds/dds/builtin/topic/PublicationBuiltinTopicData.i
+++ b/fastdds_python/src/swig/fastdds/dds/builtin/topic/PublicationBuiltinTopicData.i
@@ -16,4 +16,5 @@
 #include "fastdds/dds/builtin/topic/PublicationBuiltinTopicData.hpp"
 %}
 
+%include "fastdds/rtps/builtin/data/PublicationBuiltinTopicData.hpp"
 %include "fastdds/dds/builtin/topic/PublicationBuiltinTopicData.hpp"
diff --git a/fastdds_python/src/swig/fastdds/rtps/builtin/data/WriterProxyData.i b/fastdds_python/src/swig/fastdds/rtps/builtin/data/WriterProxyData.i
deleted file mode 100644
index 9d7b6135..00000000
--- a/fastdds_python/src/swig/fastdds/rtps/builtin/data/WriterProxyData.i
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2022 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.
-
-%{
-#include "fastdds/rtps/builtin/data/WriterProxyData.hpp"
-%}
-
-%include "fastdds/rtps/builtin/data/WriterProxyData.hpp"
diff --git a/fastdds_python/src/swig/fastdds/rtps/writer/WriterDiscoveryInfo.i b/fastdds_python/src/swig/fastdds/rtps/writer/WriterDiscoveryInfo.i
index ba055cf6..af03fe71 100644
--- a/fastdds_python/src/swig/fastdds/rtps/writer/WriterDiscoveryInfo.i
+++ b/fastdds_python/src/swig/fastdds/rtps/writer/WriterDiscoveryInfo.i
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 %{
-#include "fastdds/rtps/writer/WriterDiscoveryInfo.hpp"
+#include "fastdds/rtps/writer/WriterDiscoveryStatus.hpp"
 %}
 
-%include "fastdds/rtps/writer/WriterDiscoveryInfo.hpp"
+%include "fastdds/rtps/writer/WriterDiscoveryStatus.hpp"
diff --git a/fastdds_python/test/api/test_datareader.py b/fastdds_python/test/api/test_datareader.py
index 3b9e7406..da3faef5 100644
--- a/fastdds_python/test/api/test_datareader.py
+++ b/fastdds_python/test/api/test_datareader.py
@@ -850,7 +850,7 @@ def test_get_liveliness_changed_status(datareader):
 def test_get_matched_publication_data(datareader):
     """
     This test checks:
-    - DataWriter::get_matched_publication_data
+    - DataReader::get_matched_publication_data
     """
     pub_data = fastdds.PublicationBuiltinTopicData()
     ih = fastdds.InstanceHandle_t()