diff --git a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h
index d6fde6661f4..732b3a952ee 100644
--- a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h
+++ b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.h
@@ -46,7 +46,7 @@ struct ParticipantDiscoveryInfo
         REMOVED_PARTICIPANT,
         DROPPED_PARTICIPANT,
         IGNORED_PARTICIPANT
-    };
+    }
 
     ParticipantDiscoveryInfo(
             const ParticipantProxyData& data)
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
index 56b61f0bb75..f0e4f56bfcb 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -242,22 +242,30 @@ void PDP::initializeParticipantProxyData(
 
     if (attributes.builtin.use_WriterLivelinessProtocol)
     {
-        participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_WRITER;
-        participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_READER;
+        participant_data->m_availableBuiltinEndpoints |=
+                fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_WRITER;
+        participant_data->m_availableBuiltinEndpoints |=
+                fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_DATA_READER;
 
 #if HAVE_SECURITY
         if (mp_RTPSParticipant->is_secure())
         {
-            participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_WRITER;
-            participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_READER;
+            participant_data->m_availableBuiltinEndpoints |=
+                    fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_WRITER;
+            participant_data->m_availableBuiltinEndpoints |=
+                    fastdds::rtps::BUILTIN_ENDPOINT_PARTICIPANT_MESSAGE_SECURE_DATA_READER;
         }
 #endif // if HAVE_SECURITY
     }
-    participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_READER;
-    participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_WRITER;
+    participant_data->m_availableBuiltinEndpoints |=
+            fastdds::rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_READER;
+    participant_data->m_availableBuiltinEndpoints |=
+            fastdds::rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_WRITER;
 
-    participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_WRITER;
-    participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_READER;
+    participant_data->m_availableBuiltinEndpoints |=
+            fastdds::rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REQUEST_DATA_WRITER;
+    participant_data->m_availableBuiltinEndpoints |=
+            fastdds::rtps::BUILTIN_ENDPOINT_TYPELOOKUP_SERVICE_REPLY_DATA_READER;
 
 #if HAVE_SECURITY
     if (mp_RTPSParticipant->is_secure())
diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
index dc8520148c1..e0d8c080d81 100644
--- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
+++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp
@@ -119,22 +119,27 @@ void PDPSimple::initializeParticipantProxyData(
                         use_PublicationReaderANDSubscriptionWriter)
         {
             participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_DETECTOR;
-            participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_ANNOUNCER;
+            participant_data->m_availableBuiltinEndpoints |=
+                    fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_ANNOUNCER;
         }
 
 #if HAVE_SECURITY
         if (getRTPSParticipant()->getAttributes().builtin.discovery_config.m_simpleEDP.
                         enable_builtin_secure_publications_writer_and_subscriptions_reader)
         {
-            participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_ANNOUNCER;
-            participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_DETECTOR;
+            participant_data->m_availableBuiltinEndpoints |=
+                    fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_ANNOUNCER;
+            participant_data->m_availableBuiltinEndpoints |=
+                    fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_DETECTOR;
         }
 
         if (getRTPSParticipant()->getAttributes().builtin.discovery_config.m_simpleEDP.
                         enable_builtin_secure_subscriptions_writer_and_publications_reader)
         {
-            participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_ANNOUNCER;
-            participant_data->m_availableBuiltinEndpoints |= fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_DETECTOR;
+            participant_data->m_availableBuiltinEndpoints |=
+                    fastdds::rtps::DISC_BUILTIN_ENDPOINT_SUBSCRIPTION_SECURE_ANNOUNCER;
+            participant_data->m_availableBuiltinEndpoints |=
+                    fastdds::rtps::DISC_BUILTIN_ENDPOINT_PUBLICATION_SECURE_DETECTOR;
         }
 #endif // if HAVE_SECURITY
     }
diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h
index f54ece520af..b35e1ea3e03 100644
--- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h
+++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h
@@ -45,7 +45,7 @@ class MockAccessControlPlugin : public AccessControl
                 SecurityException & exception), (override));
 
     MOCK_METHOD(bool, get_permissions_token, (
-                PermissionsToken * *permissions_token,
+                PermissionsToken** permissions_token,
                 const PermissionsHandle& handle,
                 SecurityException & exception), (override));
 
@@ -54,7 +54,7 @@ class MockAccessControlPlugin : public AccessControl
                 SecurityException & exception), (override));
 
     MOCK_METHOD(bool, get_permissions_credential_token, (
-                PermissionsCredentialToken * *permissions_credential_token,
+                PermissionsCredentialToken** permissions_credential_token,
                 const PermissionsHandle& handle,
                 SecurityException & exception), (override));
 
diff --git a/test/unittest/rtps/discovery/PDPTests.cpp b/test/unittest/rtps/discovery/PDPTests.cpp
index f71ea1c470d..7e04d245017 100644
--- a/test/unittest/rtps/discovery/PDPTests.cpp
+++ b/test/unittest/rtps/discovery/PDPTests.cpp
@@ -64,7 +64,8 @@ class TesterPDPEndpoints : public fastdds::rtps::PDPEndpoints
 
     fastrtps::rtps::BuiltinEndpointSet_t builtin_endpoints() const override
     {
-        return fastdds::rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_ANNOUNCER | fastdds::rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR;
+        return fastdds::rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_ANNOUNCER |
+               fastdds::rtps::DISC_BUILTIN_ENDPOINT_PARTICIPANT_DETECTOR;
     }
 
     const std::unique_ptr<fastrtps::rtps::ReaderListener>& main_listener() const override