diff --git a/src/cpp/fastdds/domain/DomainParticipant.cpp b/src/cpp/fastdds/domain/DomainParticipant.cpp
index e3ca26df51d..df90f9c64bd 100644
--- a/src/cpp/fastdds/domain/DomainParticipant.cpp
+++ b/src/cpp/fastdds/domain/DomainParticipant.cpp
@@ -24,7 +24,7 @@
 
 namespace eprosima {
 namespace fastdds {
-namespace dds{
+namespace dds {
 
 DomainParticipant::DomainParticipant(
         const StatusMask& mask)
diff --git a/src/cpp/fastdds/publisher/Publisher.cpp b/src/cpp/fastdds/publisher/Publisher.cpp
index a05dffbf18f..831510fcd59 100644
--- a/src/cpp/fastdds/publisher/Publisher.cpp
+++ b/src/cpp/fastdds/publisher/Publisher.cpp
@@ -25,7 +25,7 @@
 
 namespace eprosima {
 namespace fastdds {
-namespace dds{
+namespace dds {
 
 Publisher::Publisher(
         PublisherImpl* p,
diff --git a/src/cpp/fastdds/publisher/qos/DataWriterQos.cpp b/src/cpp/fastdds/publisher/qos/DataWriterQos.cpp
index 5702b43848c..0c353c6022c 100644
--- a/src/cpp/fastdds/publisher/qos/DataWriterQos.cpp
+++ b/src/cpp/fastdds/publisher/qos/DataWriterQos.cpp
@@ -21,7 +21,7 @@
 #include <fastdds/core/policy/QosPolicyUtils.hpp>
 namespace eprosima {
 namespace fastdds {
-namespace dds{
+namespace dds {
 
 const DataWriterQos DATAWRITER_QOS_DEFAULT;
 const DataWriterQos DATAWRITER_QOS_USE_TOPIC_QOS;
diff --git a/src/cpp/fastdds/subscriber/ReadCondition.cpp b/src/cpp/fastdds/subscriber/ReadCondition.cpp
index 9a1b0ef517e..dceff372061 100644
--- a/src/cpp/fastdds/subscriber/ReadCondition.cpp
+++ b/src/cpp/fastdds/subscriber/ReadCondition.cpp
@@ -20,7 +20,7 @@
 
 namespace eprosima {
 namespace fastdds {
-namespace dds{
+namespace dds {
 
 ReadCondition::ReadCondition()
 {
diff --git a/src/cpp/fastdds/subscriber/Subscriber.cpp b/src/cpp/fastdds/subscriber/Subscriber.cpp
index 841f8266ed2..88b058f3c4f 100644
--- a/src/cpp/fastdds/subscriber/Subscriber.cpp
+++ b/src/cpp/fastdds/subscriber/Subscriber.cpp
@@ -23,7 +23,7 @@
 
 namespace eprosima {
 namespace fastdds {
-namespace dds{
+namespace dds {
 
 Subscriber::Subscriber(
         SubscriberImpl* pimpl,
diff --git a/src/cpp/fastdds/topic/qos/TopicQos.cpp b/src/cpp/fastdds/topic/qos/TopicQos.cpp
index 4699631e535..73a542c11d0 100644
--- a/src/cpp/fastdds/topic/qos/TopicQos.cpp
+++ b/src/cpp/fastdds/topic/qos/TopicQos.cpp
@@ -21,7 +21,7 @@
 
 namespace eprosima {
 namespace fastdds {
-namespace dds{
+namespace dds {
 
 const TopicQos TOPIC_QOS_DEFAULT;
 
diff --git a/src/cpp/rtps/attributes/PropertyPolicy.cpp b/src/cpp/rtps/attributes/PropertyPolicy.cpp
index d76e6081624..08c15b9039b 100644
--- a/src/cpp/rtps/attributes/PropertyPolicy.cpp
+++ b/src/cpp/rtps/attributes/PropertyPolicy.cpp
@@ -22,7 +22,7 @@
 
 namespace eprosima {
 namespace fastdds {
-namespace rtps{
+namespace rtps {
 
 PropertyPolicy PropertyPolicyHelper::get_properties_with_prefix(
         const PropertyPolicy& property_policy,
diff --git a/src/cpp/rtps/attributes/ThreadSettings.cpp b/src/cpp/rtps/attributes/ThreadSettings.cpp
index 684a1befe4f..802d473e1bf 100644
--- a/src/cpp/rtps/attributes/ThreadSettings.cpp
+++ b/src/cpp/rtps/attributes/ThreadSettings.cpp
@@ -16,7 +16,7 @@
 
 namespace eprosima {
 namespace fastdds {
-namespace rtps{
+namespace rtps {
 
 bool ThreadSettings::operator ==(
         const ThreadSettings& rhs) const
diff --git a/src/cpp/rtps/exceptions/Exception.cpp b/src/cpp/rtps/exceptions/Exception.cpp
index 9df62a5727b..aa0f58803ad 100644
--- a/src/cpp/rtps/exceptions/Exception.cpp
+++ b/src/cpp/rtps/exceptions/Exception.cpp
@@ -17,7 +17,7 @@
 namespace eprosima {
 namespace fastdds {
 namespace rtps {
-    
+
 Exception::Exception(
         const char* const& message)
     : message_(message)
diff --git a/src/cpp/rtps/reader/StatelessReader.cpp b/src/cpp/rtps/reader/StatelessReader.cpp
index a69a7a4ffa4..ebcda902449 100644
--- a/src/cpp/rtps/reader/StatelessReader.cpp
+++ b/src/cpp/rtps/reader/StatelessReader.cpp
@@ -45,7 +45,7 @@
 namespace eprosima {
 namespace fastdds {
 namespace rtps {
-    
+
 using BaseReader = eprosima::fastdds::rtps::BaseReader;
 
 StatelessReader::~StatelessReader()
diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp
index 8798f14601b..f1198114746 100644
--- a/src/cpp/rtps/security/SecurityManager.cpp
+++ b/src/cpp/rtps/security/SecurityManager.cpp
@@ -87,14 +87,14 @@ SecurityManager::SecurityManager(
     , auth_last_sequence_number_(1)
     , crypto_last_sequence_number_(1)
     , temp_reader_proxies_({
-    participant->getRTPSParticipantAttributes().allocation.locators.max_unicast_locators,
-    participant->getRTPSParticipantAttributes().allocation.locators.max_multicast_locators,
-    participant->getRTPSParticipantAttributes().allocation.data_limits,
-    participant->getRTPSParticipantAttributes().allocation.content_filter})
+                participant->getRTPSParticipantAttributes().allocation.locators.max_unicast_locators,
+                participant->getRTPSParticipantAttributes().allocation.locators.max_multicast_locators,
+                participant->getRTPSParticipantAttributes().allocation.data_limits,
+                participant->getRTPSParticipantAttributes().allocation.content_filter})
     , temp_writer_proxies_({
-    participant->getRTPSParticipantAttributes().allocation.locators.max_unicast_locators,
-    participant->getRTPSParticipantAttributes().allocation.locators.max_multicast_locators,
-    participant->getRTPSParticipantAttributes().allocation.data_limits})
+                participant->getRTPSParticipantAttributes().allocation.locators.max_unicast_locators,
+                participant->getRTPSParticipantAttributes().allocation.locators.max_multicast_locators,
+                participant->getRTPSParticipantAttributes().allocation.data_limits})
 {
     assert(participant != nullptr);
     static OpenSSLInit openssl_init;
diff --git a/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyQueryable.hpp b/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyQueryable.hpp
index 8fb0ff59fcc..a993cc4cf13 100644
--- a/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyQueryable.hpp
+++ b/src/cpp/statistics/rtps/monitor-service/interfaces/IProxyQueryable.hpp
@@ -29,7 +29,7 @@ namespace eprosima {
 namespace fastdds {
 namespace statistics {
 namespace rtps {
-        
+
 struct IProxyQueryable
 {
     /**
diff --git a/src/cpp/utils/IPFinder.cpp b/src/cpp/utils/IPFinder.cpp
index 10acc633150..ac0df526e8c 100644
--- a/src/cpp/utils/IPFinder.cpp
+++ b/src/cpp/utils/IPFinder.cpp
@@ -73,7 +73,7 @@
 namespace eprosima {
 namespace fastdds {
 namespace rtps {
-    
+
 IPFinder::IPFinder()
 {
 }
diff --git a/test/blackbox/common/RTPSWithRegistrationReader.hpp b/test/blackbox/common/RTPSWithRegistrationReader.hpp
index 81191eac424..d8bad599752 100644
--- a/test/blackbox/common/RTPSWithRegistrationReader.hpp
+++ b/test/blackbox/common/RTPSWithRegistrationReader.hpp
@@ -112,6 +112,7 @@ class RTPSWithRegistrationReader
         }
 
     private:
+
         Listener& operator =(
                 const Listener&) = delete;