diff --git a/examples/cpp/configuration/Application.hpp b/examples/cpp/configuration/Application.hpp
index 34679fd3dda..eb92a49c6ec 100644
--- a/examples/cpp/configuration/Application.hpp
+++ b/examples/cpp/configuration/Application.hpp
@@ -52,4 +52,4 @@ class Application
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_CONFIGURATION__APPLICATION_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_CONFIGURATION__APPLICATION_HPP 
diff --git a/examples/cpp/configuration/CLIParser.hpp b/examples/cpp/configuration/CLIParser.hpp
index 4fe1fa61f40..676e20ae090 100644
--- a/examples/cpp/configuration/CLIParser.hpp
+++ b/examples/cpp/configuration/CLIParser.hpp
@@ -21,8 +21,8 @@
 #include <fastdds/rtps/attributes/BuiltinTransports.hpp>
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 
-#ifndef FASTDDS_EXAMPLES_CPP_CONFIGURATION__CLI_PARSER_HPP
-#define FASTDDS_EXAMPLES_CPP_CONFIGURATION__CLI_PARSER_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_CONFIGURATION__CLIPARSER_HPP
+#define FASTDDS_EXAMPLES_CPP_CONFIGURATION__CLIPARSER_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -1137,4 +1137,4 @@ class CLIParser
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_EXAMPLES_CPP_CONFIGURATION__CLI_PARSER_HPP
+#endif // FASTDDS_EXAMPLES_CPP_CONFIGURATION__CLIPARSER_HPP
diff --git a/examples/cpp/configuration/PublisherApp.cpp b/examples/cpp/configuration/PublisherApp.cpp
index 475599f2af1..5ea65fa74b1 100644
--- a/examples/cpp/configuration/PublisherApp.cpp
+++ b/examples/cpp/configuration/PublisherApp.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "PublisherApp.hpp"
+
 #include <algorithm>
 #include <condition_variable>
 #include <csignal>
@@ -34,7 +36,6 @@
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
 
 #include "ConfigurationPubSubTypes.hpp"
-#include "PublisherApp.hpp"
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/configuration/PublisherApp.hpp b/examples/cpp/configuration/PublisherApp.hpp
index 8e2d520cbbd..7a31e61a34b 100644
--- a/examples/cpp/configuration/PublisherApp.hpp
+++ b/examples/cpp/configuration/PublisherApp.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_CONFIGURATION__PUBLISHER_APP_HPP
-#define FASTDDS_EXAMPLES_CPP_CONFIGURATION__PUBLISHER_APP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_CONFIGURATION__PUBLISHERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_CONFIGURATION__PUBLISHERAPP_HPP
 
 
 #include <condition_variable>
@@ -118,4 +118,4 @@ class PublisherApp : public Application, public DataWriterListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_CONFIGURATION__PUBLISHER_APP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_CONFIGURATION__PUBLISHERAPP_HPP 
diff --git a/examples/cpp/configuration/SubscriberApp.cpp b/examples/cpp/configuration/SubscriberApp.cpp
index 353f29e87ed..9bf1347b4af 100644
--- a/examples/cpp/configuration/SubscriberApp.cpp
+++ b/examples/cpp/configuration/SubscriberApp.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "SubscriberApp.hpp"
+
 #include <condition_variable>
 #include <stdexcept>
 
@@ -34,7 +36,6 @@
 #include "Application.hpp"
 #include "CLIParser.hpp"
 #include "ConfigurationPubSubTypes.hpp"
-#include "SubscriberApp.hpp"
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/configuration/SubscriberApp.hpp b/examples/cpp/configuration/SubscriberApp.hpp
index 3951e2addf9..b6d71ed198d 100644
--- a/examples/cpp/configuration/SubscriberApp.hpp
+++ b/examples/cpp/configuration/SubscriberApp.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_CONFIGURATION__SUBSCRIBER_APP_HPP
-#define FASTDDS_EXAMPLES_CPP_CONFIGURATION__SUBSCRIBER_APP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_CONFIGURATION__SUBSCRIBERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_CONFIGURATION__SUBSCRIBERAPP_HPP
 
 #include <atomic>
 #include <condition_variable>
@@ -123,4 +123,4 @@ class SubscriberApp : public Application,  public DataReaderListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_CONFIGURATION__SUBSCRIBER_APP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_CONFIGURATION__SUBSCRIBERAPP_HPP
diff --git a/examples/cpp/content_filter/Application.hpp b/examples/cpp/content_filter/Application.hpp
index d457ffa013a..02c4ab9db5e 100644
--- a/examples/cpp/content_filter/Application.hpp
+++ b/examples/cpp/content_filter/Application.hpp
@@ -53,4 +53,4 @@ class Application
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__APPLICATION_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__APPLICATION_HPP
diff --git a/examples/cpp/content_filter/CLIParser.hpp b/examples/cpp/content_filter/CLIParser.hpp
index 7d3845fd4c3..291ce9a2d22 100644
--- a/examples/cpp/content_filter/CLIParser.hpp
+++ b/examples/cpp/content_filter/CLIParser.hpp
@@ -19,8 +19,8 @@
 
 #include <fastdds/dds/log/Log.hpp>
 
-#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CLI_PARSER_HPP
-#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CLI_PARSER_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CLIPARSER_HPP
+#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CLIPARSER_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -465,4 +465,4 @@ class CLIParser
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CLI_PARSER_HPP
+#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CLIPARSER_HPP
diff --git a/examples/cpp/content_filter/CustomContentFilter.hpp b/examples/cpp/content_filter/CustomContentFilter.hpp
index 661459ab9f2..ae63b9759f3 100644
--- a/examples/cpp/content_filter/CustomContentFilter.hpp
+++ b/examples/cpp/content_filter/CustomContentFilter.hpp
@@ -1,5 +1,5 @@
-#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOM_CONTENT_FILTER_HPP
-#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOM_CONTENT_FILTER_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTER_HPP
+#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTER_HPP
 
 #include <fastcdr/Cdr.h>
 
@@ -78,4 +78,4 @@ class CustomContentFilter : public eprosima::fastdds::dds::IContentFilter
 
 };
 
-#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOM_CONTENT_FILTER_HPP
+#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTER_HPP
diff --git a/examples/cpp/content_filter/CustomContentFilterFactory.hpp b/examples/cpp/content_filter/CustomContentFilterFactory.hpp
index 1ad1ffb13b5..aed72191c01 100644
--- a/examples/cpp/content_filter/CustomContentFilterFactory.hpp
+++ b/examples/cpp/content_filter/CustomContentFilterFactory.hpp
@@ -1,5 +1,5 @@
-#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOM_CONTENT_FILTER_FACTORY_HPP
-#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOM_CONTENT_FILTER_FACTORY_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTERFACTORY_HPP
+#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTERFACTORY_HPP
 
 #include <fastdds/dds/topic/IContentFilter.hpp>
 #include <fastdds/dds/topic/IContentFilterFactory.hpp>
@@ -88,4 +88,4 @@ class CustomContentFilterFactory : public eprosima::fastdds::dds::IContentFilter
     }
 
 };
-#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOM_CONTENT_FILTER_FACTORY_HPP
+#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__CUSTOMCONTENTFILTERFACTORY_HPP
diff --git a/examples/cpp/content_filter/PublisherApp.cpp b/examples/cpp/content_filter/PublisherApp.cpp
index 341a971fa39..ff333af0b97 100644
--- a/examples/cpp/content_filter/PublisherApp.cpp
+++ b/examples/cpp/content_filter/PublisherApp.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "PublisherApp.hpp"
+
 #include <thread>
 
 #include <fastdds/dds/core/status/PublicationMatchedStatus.hpp>
@@ -31,7 +33,6 @@
 
 #include "HelloWorldPubSubTypes.hpp"
 #include "HelloWorldTypeObjectSupport.hpp"
-#include "PublisherApp.hpp"
 
 namespace eprosima {
 namespace fastdds {
diff --git a/examples/cpp/content_filter/PublisherApp.hpp b/examples/cpp/content_filter/PublisherApp.hpp
index c2cf1ccab2b..acc48d63885 100644
--- a/examples/cpp/content_filter/PublisherApp.hpp
+++ b/examples/cpp/content_filter/PublisherApp.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__PUBLISHER_APP_HPP
-#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__PUBLISHER_APP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__PUBLISHERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__PUBLISHERAPP_HPP
 
 #include <condition_variable>
 
@@ -95,4 +95,4 @@ class PublisherApp : public Application, public DataWriterListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__PUBLISHER_APP_HPP
+#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__PUBLISHERAPP_HPP
diff --git a/examples/cpp/content_filter/SubscriberApp.cpp b/examples/cpp/content_filter/SubscriberApp.cpp
index bbfc7300d4e..9c3dc62cdf9 100644
--- a/examples/cpp/content_filter/SubscriberApp.cpp
+++ b/examples/cpp/content_filter/SubscriberApp.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "SubscriberApp.hpp"
+
 #include <stdexcept>
 
 #include <fastdds/dds/core/status/SubscriptionMatchedStatus.hpp>
@@ -31,7 +33,6 @@
 
 #include "HelloWorldPubSubTypes.hpp"
 #include "HelloWorldTypeObjectSupport.hpp"
-#include "SubscriberApp.hpp"
 
 namespace eprosima {
 namespace fastdds {
diff --git a/examples/cpp/content_filter/SubscriberApp.hpp b/examples/cpp/content_filter/SubscriberApp.hpp
index ccbf3e5c32f..256864bead4 100644
--- a/examples/cpp/content_filter/SubscriberApp.hpp
+++ b/examples/cpp/content_filter/SubscriberApp.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__SUBSCRIBER_APP_HPP
-#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__SUBSCRIBER_APP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__SUBSCRIBERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__SUBSCRIBERAPP_HPP
 
 #include <atomic>
 #include <condition_variable>
@@ -107,4 +107,4 @@ class SubscriberApp : public Application, public DataReaderListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__SUBSCRIBER_APP_HPP
+#endif // FASTDDS_EXAMPLES_CPP_CONTENT_FILTER__SUBSCRIBERAPP_HPP
diff --git a/examples/cpp/custom_payload_pool/Application.hpp b/examples/cpp/custom_payload_pool/Application.hpp
index 55c3bf60a3d..fb47bf6810b 100644
--- a/examples/cpp/custom_payload_pool/Application.hpp
+++ b/examples/cpp/custom_payload_pool/Application.hpp
@@ -53,4 +53,4 @@ class Application
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__APPLICATION_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__APPLICATION_HPP
diff --git a/examples/cpp/custom_payload_pool/CLIParser.hpp b/examples/cpp/custom_payload_pool/CLIParser.hpp
index b0aea0c03e8..1ad01dc6288 100644
--- a/examples/cpp/custom_payload_pool/CLIParser.hpp
+++ b/examples/cpp/custom_payload_pool/CLIParser.hpp
@@ -18,8 +18,8 @@
 
 #include <fastdds/dds/log/Log.hpp>
 
-#ifndef FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CLI_PARSER_HPP
-#define FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CLI_PARSER_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CLIPARSER_HPP
+#define FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CLIPARSER_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -329,4 +329,4 @@ class CLIParser
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CLI_PARSER_HPP
+#endif // FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CLIPARSER_HPP
diff --git a/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp b/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp
index 3c1457ea599..22dd6a92cdb 100644
--- a/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp
+++ b/examples/cpp/custom_payload_pool/CustomPayloadPool.hpp
@@ -16,8 +16,8 @@
  * @file CustomPayloadPool.hpp
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CUSTOM_PAYLOAD_POOL_HPP
-#define FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CUSTOM_PAYLOAD_POOL_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CUSTOMPAYLOADPOOL_HPP
+#define FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CUSTOMPAYLOADPOOL_HPP
 
 #include <assert.h>
 #include <stdio.h>
@@ -97,4 +97,4 @@ class CustomPayloadPool : public eprosima::fastdds::rtps::IPayloadPool
 
 };
 
-#endif  // FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CUSTOM_PAYLOAD_POOL_HPP
+#endif  // FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__CUSTOMPAYLOADPOOL_HPP
diff --git a/examples/cpp/custom_payload_pool/PublisherApp.cpp b/examples/cpp/custom_payload_pool/PublisherApp.cpp
index 3ff2dfdaa42..0c9c3c002ee 100644
--- a/examples/cpp/custom_payload_pool/PublisherApp.cpp
+++ b/examples/cpp/custom_payload_pool/PublisherApp.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "PublisherApp.hpp"
+
 #include <csignal>
 #include <thread>
 
@@ -27,7 +29,6 @@
 #include <fastdds/dds/publisher/qos/PublisherQos.hpp>
 
 #include "HelloWorldPubSubTypes.hpp"
-#include "PublisherApp.hpp"
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/custom_payload_pool/PublisherApp.hpp b/examples/cpp/custom_payload_pool/PublisherApp.hpp
index ff113eb7b15..3dd31206bc9 100644
--- a/examples/cpp/custom_payload_pool/PublisherApp.hpp
+++ b/examples/cpp/custom_payload_pool/PublisherApp.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__PUBLISHER_APP_HPP
-#define FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__PUBLISHER_APP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__PUBLISHERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__PUBLISHERAPP_HPP
 
 #include <condition_variable>
 #include <mutex>
@@ -103,4 +103,4 @@ class PublisherApp : public Application, public DataWriterListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__PUBLISHER_APP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__PUBLISHERAPP_HPP
diff --git a/examples/cpp/custom_payload_pool/SubscriberApp.cpp b/examples/cpp/custom_payload_pool/SubscriberApp.cpp
index 7ac4600d1c2..0372b6fa641 100644
--- a/examples/cpp/custom_payload_pool/SubscriberApp.cpp
+++ b/examples/cpp/custom_payload_pool/SubscriberApp.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "SubscriberApp.hpp"
+
 #include <condition_variable>
 #include <csignal>
 
@@ -29,7 +31,6 @@
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 
 #include "HelloWorldPubSubTypes.hpp"
-#include "SubscriberApp.hpp"
 
 using namespace eprosima::fastdds::dds;
 namespace eprosima {
diff --git a/examples/cpp/custom_payload_pool/SubscriberApp.hpp b/examples/cpp/custom_payload_pool/SubscriberApp.hpp
index 1b7cfb05946..9dc13fa16f3 100644
--- a/examples/cpp/custom_payload_pool/SubscriberApp.hpp
+++ b/examples/cpp/custom_payload_pool/SubscriberApp.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__SUBSCRIBER_APP_HPP
-#define FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__SUBSCRIBER_APP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__SUBSCRIBERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__SUBSCRIBERAPP_HPP
 
 #include <condition_variable>
 #include <mutex>
@@ -101,4 +101,4 @@ class SubscriberApp : public Application,  public DataReaderListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__SUBSCRIBER_APP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_CUSTOM_PAYLOAD_POOL__SUBSCRIBERAPP_HPP
diff --git a/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldPublisher.cpp b/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldPublisher.cpp
index 49b6ecee547..c91b27a4c30 100644
--- a/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldPublisher.cpp
+++ b/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldPublisher.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "HelloWorldPublisher.h"
+
 #include <thread>
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
@@ -27,8 +29,6 @@
 #include <fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
 
-#include "HelloWorldPublisher.h"
-
 using namespace eprosima::fastdds::dds;
 
 HelloWorldPublisher::HelloWorldPublisher()
diff --git a/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldPublisher.h b/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldPublisher.h
index 380e8447535..190b3e28b95 100644
--- a/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldPublisher.h
+++ b/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldPublisher.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLO_WORLD_PUBLISHER_H
-#define FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLO_WORLD_PUBLISHER_H
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLOWORLDPUBLISHER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLOWORLDPUBLISHER_H
 
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
 #include <fastdds/dds/publisher/DataWriterListener.hpp>
@@ -89,4 +89,4 @@ class HelloWorldPublisher
 
 
 
-#endif /* FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLO_WORLD_PUBLISHER_H */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLOWORLDPUBLISHER_H
diff --git a/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldSubscriber.cpp b/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldSubscriber.cpp
index 852af105bbf..f65d324a2cf 100644
--- a/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldSubscriber.cpp
+++ b/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldSubscriber.cpp
@@ -16,6 +16,9 @@
  * @file HelloWorldSubscriber.cpp
  *
  */
+
+#include "HelloWorldSubscriber.h"
+
 #include <chrono>
 #include <mutex>
 #include <thread>
@@ -27,8 +30,6 @@
 #include <fastdds/dds/xtypes/dynamic_types/DynamicDataFactory.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/DynamicData.hpp>
 
-#include "HelloWorldSubscriber.h"
-
 using namespace eprosima::fastdds::dds;
 
 HelloWorldSubscriber::HelloWorldSubscriber()
diff --git a/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldSubscriber.h b/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldSubscriber.h
index 1dfd166341b..21ad956f5ae 100644
--- a/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldSubscriber.h
+++ b/examples/cpp/dds/DynamicHelloWorldExample/HelloWorldSubscriber.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLO_WORLD_SUBSCRIBER_H
-#define FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLO_WORLD_SUBSCRIBER_H
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLOWORLDSUBSCRIBER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLOWORLDSUBSCRIBER_H
 
 #include <atomic>
 #include <condition_variable>
@@ -112,4 +112,4 @@ class HelloWorldSubscriber
 
 };
 
-#endif /* FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLO_WORLD_SUBSCRIBER_H */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_DYNAMIC_HELLO_WORLD_EXAMPLE__HELLOWORLDSUBSCRIBER_H
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPublisher.cpp b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPublisher.cpp
index 0bf073f6bc6..354ca892290 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPublisher.cpp
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPublisher.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "HelloWorldPublisher.h"
+
 #include <thread>
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
@@ -25,7 +27,6 @@
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/publisher/qos/PublisherQos.hpp>
 
-#include "HelloWorldPublisher.h"
 #include "HelloWorldPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPublisher.h b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPublisher.h
index b82241a34df..9b5e4f3135d 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPublisher.h
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldPublisher.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_DATA_SHARING__HELLO_WORLD_PUBLISHER_H
-#define FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_DATA_SHARING__HELLO_WORLD_PUBLISHER_H
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_DATA_SHARING__HELLOWORLDPUBLISHER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_DATA_SHARING__HELLOWORLDPUBLISHER_H
 
 #include <fastdds/dds/publisher/DataWriterListener.hpp>
 #include <fastdds/dds/topic/TypeSupport.hpp>
@@ -92,4 +92,4 @@ class HelloWorldPublisher
 
 
 
-#endif /* FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_DATA_SHARING__HELLO_WORLD_PUBLISHER_H */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_DATA_SHARING__HELLOWORLDPUBLISHER_H
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldSubscriber.cpp b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldSubscriber.cpp
index 358783b0df6..aa47451609b 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldSubscriber.cpp
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldSubscriber.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "HelloWorldSubscriber.h"
+
 #include <chrono>
 #include <thread>
 
@@ -27,7 +29,6 @@
 #include <fastdds/dds/subscriber/Subscriber.hpp>
 
 #include "HelloWorldPubSubTypes.hpp"
-#include "HelloWorldSubscriber.h"
 
 using namespace eprosima::fastdds::dds;
 
diff --git a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldSubscriber.h b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldSubscriber.h
index fdb05f15e11..2aab6e8191a 100644
--- a/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldSubscriber.h
+++ b/examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldSubscriber.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_DATA_SHARING__HELLO_WORLD_SUBSCRIBER_H
-#define FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_DATA_SHARING__HELLO_WORLD_SUBSCRIBER_H
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_DATA_SHARING__HELLOWORLDSUBSCRIBER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_DATA_SHARING__HELLOWORLDSUBSCRIBER_H
 
 #include <fastdds/dds/core/status/SubscriptionMatchedStatus.hpp>
 #include <fastdds/dds/domain/DomainParticipant.hpp>
@@ -87,4 +87,4 @@ class HelloWorldSubscriber
     listener_;
 };
 
-#endif /* FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_DATA_SHARING__HELLO_WORLD_SUBSCRIBER_H */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_DATA_SHARING__HELLOWORLDSUBSCRIBER_H
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp
index a9c9503ca47..233c3897678 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.cpp
@@ -17,13 +17,14 @@
  *
  */
 
+#include "HelloWorldPublisher.h"
+
 #include <thread>
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/rtps/transport/shared_mem/SharedMemTransportDescriptor.hpp>
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
-#include "HelloWorldPublisher.h"
 #include "HelloWorldPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.h b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.h
index 6d70d284f79..0737504e980 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.h
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldPublisher.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_SHARED_MEM__HELLO_WORLD_PUBLISHER_H
-#define FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_SHARED_MEM__HELLO_WORLD_PUBLISHER_H
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_SHARED_MEM__HELLOWORLDPUBLISHER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_SHARED_MEM__HELLOWORLDPUBLISHER_H
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/publisher/Publisher.hpp>
@@ -95,4 +95,4 @@ class HelloWorldPublisher
     eprosima::fastdds::dds::TypeSupport type_;
 };
 
-#endif /* FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_SHARED_MEM__HELLO_WORLD_PUBLISHER_H */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_SHARED_MEM__HELLOWORLDPUBLISHER_H
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp
index b7bbfc9e92e..d10208fcb27 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.cpp
@@ -17,6 +17,7 @@
  *
  */
 
+#include "HelloWorldSubscriber.h"
 
 #include <chrono>
 #include <thread>
@@ -27,7 +28,6 @@
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 
 #include "HelloWorldPubSubTypes.hpp"
-#include "HelloWorldSubscriber.h"
 
 using namespace eprosima::fastdds::dds;
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.h b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.h
index da9b4ba2bb3..70e5fee145b 100644
--- a/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.h
+++ b/examples/cpp/dds/HelloWorldExampleSharedMem/HelloWorldSubscriber.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_SHARED_MEM__HELLO_WORLD_SUBSCRIBER_H
-#define FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_SHARED_MEM__HELLO_WORLD_SUBSCRIBER_H
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_SHARED_MEM__HELLOWORLDSUBSCRIBER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_SHARED_MEM__HELLOWORLDSUBSCRIBER_H
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
@@ -91,4 +91,4 @@ class HelloWorldSubscriber
     listener_;
 };
 
-#endif /* FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_SHARED_MEM__HELLO_WORLD_SUBSCRIBER_H */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_SHARED_MEM__HELLOWORLDSUBSCRIBER_H
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp
index dd9c97eb7d2..3833c1fb8e1 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.cpp
@@ -17,13 +17,14 @@
  *
  */
 
+#include "HelloWorldPublisher.h"
+
 #include <thread>
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
 #include <fastdds/utils/IPLocator.hpp>
 
-#include "HelloWorldPublisher.h"
 #include "HelloWorldPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.h b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.h
index fc9b99469ac..915ead5e66d 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.h
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldPublisher.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_TCP__HELLO_WORLD_PUBLISHER_H
-#define FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_TCP__HELLO_WORLD_PUBLISHER_H
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_TCP__HELLOWORLDPUBLISHER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_TCP__HELLOWORLDPUBLISHER_H
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/publisher/Publisher.hpp>
@@ -100,4 +100,4 @@ class HelloWorldPublisher
 
 
 
-#endif /* FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_TCP__HELLO_WORLD_PUBLISHER_H */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_TCP__HELLOWORLDPUBLISHER_H
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp
index e04394a8e20..e7bfbb6f5b2 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.cpp
@@ -17,6 +17,7 @@
  *
  */
 
+#include "HelloWorldSubscriber.h"
 
 #include <chrono>
 #include <thread>
@@ -26,7 +27,6 @@
 #include <fastdds/rtps/transport/TCPv4TransportDescriptor.hpp>
 #include <fastdds/utils/IPLocator.hpp>
 
-#include "HelloWorldSubscriber.h"
 #include "HelloWorldPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
diff --git a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.h b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.h
index ca65e34fec6..30435da8ced 100644
--- a/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.h
+++ b/examples/cpp/dds/HelloWorldExampleTCP/HelloWorldSubscriber.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_TCP__HELLO_WORLD_SUBSCRIBER_H
-#define FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_TCP__HELLO_WORLD_SUBSCRIBER_H
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_TCP__HELLOWORLDSUBSCRIBER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_TCP__HELLOWORLDSUBSCRIBER_H
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/subscriber/Subscriber.hpp>
@@ -93,4 +93,4 @@ class HelloWorldSubscriber
             uint32_t number);
 };
 
-#endif /* FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_TCP__HELLO_WORLD_SUBSCRIBER_H */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_HELLO_WORLD_EXAMPLE_TCP__HELLOWORLDSUBSCRIBER_H
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPublisher.cpp b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPublisher.cpp
index cbe96942815..af280f5437d 100644
--- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPublisher.cpp
+++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPublisher.cpp
@@ -18,6 +18,7 @@
  */
 
 #include "HelloWorldPublisher.h"
+
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPublisher.h b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPublisher.h
index e6a6319826a..e1376bd9191 100644
--- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPublisher.h
+++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldPublisher.h
@@ -17,10 +17,9 @@
  *
  */
 
-#ifndef HELLOWORLDPUBLISHER_H_
-#define HELLOWORLDPUBLISHER_H_
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_SECURE_HELLO_WORLD_EXAMPLE__HELLOWORLDPUBLISHER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_SECURE_HELLO_WORLD_EXAMPLE__HELLOWORLDPUBLISHER_H
 
-#include "HelloWorldPubSubTypes.hpp"
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
@@ -90,4 +89,4 @@ class HelloWorldPublisher
 
 
 
-#endif /* HELLOWORLDPUBLISHER_H_ */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_SECURE_HELLO_WORLD_EXAMPLE__HELLOWORLDPUBLISHER_H
diff --git a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldSubscriber.h b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldSubscriber.h
index e189e33fe0d..da1455248a9 100644
--- a/examples/cpp/dds/SecureHelloWorldExample/HelloWorldSubscriber.h
+++ b/examples/cpp/dds/SecureHelloWorldExample/HelloWorldSubscriber.h
@@ -17,10 +17,8 @@
  *
  */
 
-#ifndef HELLOWORLDSUBSCRIBER_H_
-#define HELLOWORLDSUBSCRIBER_H_
-
-#include "HelloWorldPubSubTypes.hpp"
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_SECURE_HELLO_WORLD_EXAMPLE__HELLOWORLDSUBSCRIBER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_SECURE_HELLO_WORLD_EXAMPLE__HELLOWORLDSUBSCRIBER_H
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
@@ -94,4 +92,4 @@ class HelloWorldSubscriber
 
 };
 
-#endif /* HELLOWORLDSUBSCRIBER_H_ */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_SECURE_HELLO_WORLD_EXAMPLE__HELLOWORLDSUBSCRIBER_H
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPublisher.cpp b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPublisher.cpp
index 97684f1682e..6a5b40c9ccc 100644
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPublisher.cpp
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPublisher.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "HelloWorldPublisher.h"
+
 #include <chrono>
 #include <thread>
 
@@ -24,7 +26,6 @@
 #include <fastdds/dds/domain/qos/DomainParticipantQos.hpp>
 #include <fastdds/dds/publisher/Publisher.hpp>
 
-#include "HelloWorldPublisher.h"
 #include "HelloWorldPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPublisher.h b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPublisher.h
index 4d72c2ff120..baa2cc8d917 100644
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPublisher.h
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldPublisher.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_DDS_STATIC_HELLO_WORLD_EXAMPLE__HELLO_WORLD_PUBLISHER_H
-#define FASTDDS_EXAMPLES_CPP_DDS_STATIC_HELLO_WORLD_EXAMPLE__HELLO_WORLD_PUBLISHER_H
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_STATIC_HELLO_WORLD_EXAMPLE__HELLOWORLDPUBLISHER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_STATIC_HELLO_WORLD_EXAMPLE__HELLOWORLDPUBLISHER_H
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/publisher/DataWriter.hpp>
@@ -85,4 +85,4 @@ class HelloWorldPublisher
 
 
 
-#endif /* FASTDDS_EXAMPLES_CPP_DDS_STATIC_HELLO_WORLD_EXAMPLE__HELLO_WORLD_PUBLISHER_H */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_STATIC_HELLO_WORLD_EXAMPLE__HELLOWORLDPUBLISHER_H
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldSubscriber.cpp b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldSubscriber.cpp
index 446da024f66..a133fc30c28 100644
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldSubscriber.cpp
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldSubscriber.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "HelloWorldSubscriber.h"
+
 #include <chrono>
 #include <thread>
 
@@ -25,7 +27,6 @@
 #include <fastdds/dds/subscriber/SampleInfo.hpp>
 
 #include "HelloWorldPubSubTypes.hpp"
-#include "HelloWorldSubscriber.h"
 
 using namespace eprosima::fastdds::dds;
 
diff --git a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldSubscriber.h b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldSubscriber.h
index 828b4a9a7a4..a45e079a2b0 100644
--- a/examples/cpp/dds/StaticHelloWorldExample/HelloWorldSubscriber.h
+++ b/examples/cpp/dds/StaticHelloWorldExample/HelloWorldSubscriber.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_DDS_STATIC_HELLO_WORLD_EXAMPLE__HELLO_WORLD_SUBSCRIBER_H
-#define FASTDDS_EXAMPLES_CPP_DDS_STATIC_HELLO_WORLD_EXAMPLE__HELLO_WORLD_SUBSCRIBER_H
+#ifndef FASTDDS_EXAMPLES_CPP_DDS_STATIC_HELLO_WORLD_EXAMPLE__HELLOWORLDSUBSCRIBER_H
+#define FASTDDS_EXAMPLES_CPP_DDS_STATIC_HELLO_WORLD_EXAMPLE__HELLOWORLDSUBSCRIBER_H
 
 #include <fastdds/dds/domain/DomainParticipant.hpp>
 #include <fastdds/dds/topic/Topic.hpp>
@@ -90,4 +90,4 @@ class HelloWorldSubscriber
 
 };
 
-#endif /* FASTDDS_EXAMPLES_CPP_DDS_STATIC_HELLO_WORLD_EXAMPLE__HELLO_WORLD_SUBSCRIBER_H */
+#endif // FASTDDS_EXAMPLES_CPP_DDS_STATIC_HELLO_WORLD_EXAMPLE__HELLOWORLDSUBSCRIBER_H
diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPublisher.h b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPublisher.h
index bf54b57a7c5..ff3aed9410d 100644
--- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPublisher.h
+++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldPublisher.h
@@ -66,4 +66,4 @@ class LoanableHelloWorldPublisher
     listener_;
 };
 
-#endif // FASTDDS_EXAMPLES_CPP_DDS_WRITER_LOANS_EXAMPLE__LOANABLE_HELLO_WORLD_PUBLISHER_H
\ No newline at end of file
+#endif // FASTDDS_EXAMPLES_CPP_DDS_WRITER_LOANS_EXAMPLE__LOANABLE_HELLO_WORLD_PUBLISHER_H
diff --git a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldSubscriber.h b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldSubscriber.h
index 6428472be63..bf805fe6469 100644
--- a/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldSubscriber.h
+++ b/examples/cpp/dds/WriterLoansExample/LoanableHelloWorldSubscriber.h
@@ -69,4 +69,4 @@ class LoanableHelloWorldSubscriber
     listener_;
 };
 
-#endif // FASTDDS_EXAMPLES_CPP_DDS_WRITER_LOANS_EXAMPLE__LOANABLE_HELLO_WORLD_SUBSCRIBER_H
\ No newline at end of file
+#endif // FASTDDS_EXAMPLES_CPP_DDS_WRITER_LOANS_EXAMPLE__LOANABLE_HELLO_WORLD_SUBSCRIBER_H
diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPublisher.h b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPublisher.h
index 7afb516ef3f..94b7386ba7e 100644
--- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPublisher.h
+++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldPublisher.h
@@ -66,4 +66,4 @@ class LoanableHelloWorldPublisher
     listener_;
 };
 
-#endif // FASTDDS_EXAMPLES_CPP_DDS_ZERO_COPY_EXAMPLE__LOANABLE_HELLO_WORLD_PUBLISHER_H
\ No newline at end of file
+#endif // FASTDDS_EXAMPLES_CPP_DDS_ZERO_COPY_EXAMPLE__LOANABLE_HELLO_WORLD_PUBLISHER_H
diff --git a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldSubscriber.h b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldSubscriber.h
index 3d45fbd724d..4b1afdde962 100644
--- a/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldSubscriber.h
+++ b/examples/cpp/dds/ZeroCopyExample/LoanableHelloWorldSubscriber.h
@@ -69,4 +69,4 @@ class LoanableHelloWorldSubscriber
     listener_;
 };
 
-#endif // FASTDDS_EXAMPLES_CPP_DDS_ZERO_COPY_EXAMPLE__LOANABLE_HELLO_WORLD_SUBSCRIBER_H
\ No newline at end of file
+#endif // FASTDDS_EXAMPLES_CPP_DDS_ZERO_COPY_EXAMPLE__LOANABLE_HELLO_WORLD_SUBSCRIBER_H
diff --git a/examples/cpp/delivery_mechanisms/Application.hpp b/examples/cpp/delivery_mechanisms/Application.hpp
index 71e6734df67..26066749693 100644
--- a/examples/cpp/delivery_mechanisms/Application.hpp
+++ b/examples/cpp/delivery_mechanisms/Application.hpp
@@ -53,4 +53,4 @@ class Application
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__APPLICATION_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__APPLICATION_HPP
diff --git a/examples/cpp/delivery_mechanisms/CLIParser.hpp b/examples/cpp/delivery_mechanisms/CLIParser.hpp
index 721c9df5fc3..11649e3bb71 100644
--- a/examples/cpp/delivery_mechanisms/CLIParser.hpp
+++ b/examples/cpp/delivery_mechanisms/CLIParser.hpp
@@ -20,8 +20,8 @@
 #include <fastdds/rtps/attributes/BuiltinTransports.hpp>
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
 
-#ifndef FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__CLIPARSERAPP_HPP
-#define FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__CLIPARSERAPP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__CLIPARSER_HPP
+#define FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__CLIPARSER_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -414,4 +414,4 @@ class CLIParser
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__CLIPARSERAPP_HPP
+#endif // FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__CLIPARSER_HPP
diff --git a/examples/cpp/delivery_mechanisms/PubSubApp.cpp b/examples/cpp/delivery_mechanisms/PubSubApp.cpp
index 1e6a4891862..4781d9c097c 100644
--- a/examples/cpp/delivery_mechanisms/PubSubApp.cpp
+++ b/examples/cpp/delivery_mechanisms/PubSubApp.cpp
@@ -43,8 +43,8 @@
 #include "CLIParser.hpp"
 #include "DeliveryMechanismsPubSubTypes.hpp"
 
-using namespace eprosima::fastdds::rtps;
 using namespace eprosima::fastdds::dds;
+using namespace eprosima::fastdds::rtps;
 
 namespace eprosima {
 namespace fastdds {
@@ -119,7 +119,7 @@ PubSubApp::PubSubApp(
         {
             // Large Data is a builtin transport
             pqos.transport().use_builtin_transports = true;
-            pqos.setup_transports(::BuiltinTransports::LARGE_DATA);
+            pqos.setup_transports(BuiltinTransports::LARGE_DATA);
             break;
         }
         case CLIParser::DeliveryMechanismKind::TCPv4:
diff --git a/examples/cpp/delivery_mechanisms/PubSubApp.hpp b/examples/cpp/delivery_mechanisms/PubSubApp.hpp
index 9ee917c505d..95a51f11ed9 100644
--- a/examples/cpp/delivery_mechanisms/PubSubApp.hpp
+++ b/examples/cpp/delivery_mechanisms/PubSubApp.hpp
@@ -115,4 +115,4 @@ class PubSubApp : public Application, public dds::DataReaderListener, public dds
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__PUBSUBAPP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__PUBSUBAPP_HPP
diff --git a/examples/cpp/delivery_mechanisms/PublisherApp.cpp b/examples/cpp/delivery_mechanisms/PublisherApp.cpp
index 0cb5c25d918..e548d745c5e 100644
--- a/examples/cpp/delivery_mechanisms/PublisherApp.cpp
+++ b/examples/cpp/delivery_mechanisms/PublisherApp.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "PublisherApp.hpp"
+
 #include <algorithm>
 #include <condition_variable>
 #include <csignal>
@@ -35,7 +37,6 @@
 #include <fastdds/rtps/transport/UDPv4TransportDescriptor.hpp>
 #include <fastdds/rtps/transport/UDPv6TransportDescriptor.hpp>
 
-#include "PublisherApp.hpp"
 #include "DeliveryMechanismsPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::rtps;
diff --git a/examples/cpp/delivery_mechanisms/PublisherApp.hpp b/examples/cpp/delivery_mechanisms/PublisherApp.hpp
index acb09e4e0ad..279e03357f5 100644
--- a/examples/cpp/delivery_mechanisms/PublisherApp.hpp
+++ b/examples/cpp/delivery_mechanisms/PublisherApp.hpp
@@ -94,4 +94,4 @@ class PublisherApp : public Application, public dds::DataWriterListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__PUBLISHERAPP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__PUBLISHERAPP_HPP
diff --git a/examples/cpp/delivery_mechanisms/SubscriberApp.hpp b/examples/cpp/delivery_mechanisms/SubscriberApp.hpp
index 7f61dbacdb5..96cc44817d8 100644
--- a/examples/cpp/delivery_mechanisms/SubscriberApp.hpp
+++ b/examples/cpp/delivery_mechanisms/SubscriberApp.hpp
@@ -94,4 +94,4 @@ class SubscriberApp : public Application, public dds::DataReaderListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__SUBSCRIBERAPP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_DELIVERY_MECHANISMS__SUBSCRIBERAPP_HPP
diff --git a/examples/cpp/discovery_server/Application.hpp b/examples/cpp/discovery_server/Application.hpp
index 14df294260e..fa966818b8f 100644
--- a/examples/cpp/discovery_server/Application.hpp
+++ b/examples/cpp/discovery_server/Application.hpp
@@ -52,4 +52,4 @@ class Application
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_DISCOVERY_SERVER__APPLICATION_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_DISCOVERY_SERVER__APPLICATION_HPP
diff --git a/examples/cpp/discovery_server/ClientPublisherApp.hpp b/examples/cpp/discovery_server/ClientPublisherApp.hpp
index 0f88b6c0219..9857c4c90e3 100644
--- a/examples/cpp/discovery_server/ClientPublisherApp.hpp
+++ b/examples/cpp/discovery_server/ClientPublisherApp.hpp
@@ -95,4 +95,4 @@ class ClientPublisherApp : public Application, public DataWriterListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_DISCOVERY_SERVER__CLIENTPUBLISHERAPP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_DISCOVERY_SERVER__CLIENTPUBLISHERAPP_HPP
diff --git a/examples/cpp/discovery_server/ClientSubscriberApp.hpp b/examples/cpp/discovery_server/ClientSubscriberApp.hpp
index 82dd38d5f1c..6b237e8d776 100644
--- a/examples/cpp/discovery_server/ClientSubscriberApp.hpp
+++ b/examples/cpp/discovery_server/ClientSubscriberApp.hpp
@@ -94,4 +94,4 @@ class ClientSubscriberApp : public Application,  public DataReaderListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_DISCOVERY_SERVER__CLIENTSUBSCRIBERAPP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_DISCOVERY_SERVER__CLIENTSUBSCRIBERAPP_HPP
diff --git a/examples/cpp/discovery_server/Helpers.hpp b/examples/cpp/discovery_server/Helpers.hpp
index 6b62890395a..d70b4a13779 100644
--- a/examples/cpp/discovery_server/Helpers.hpp
+++ b/examples/cpp/discovery_server/Helpers.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_DDS_DISCOVERY_SERVER_EXAMPLE__COMMON_H
-#define FASTDDS_EXAMPLES_CPP_DDS_DISCOVERY_SERVER_EXAMPLE__COMMON_H
+#ifndef FASTDDS_EXAMPLES_CPP_DISCOVERY_SERVER__HELPERS_HPP
+#define FASTDDS_EXAMPLES_CPP_DISCOVERY_SERVER__HELPERS_HPP
 
 #include <fastdds/rtps/common/GuidPrefix_t.hpp>
 #include <fastdds/utils/IPLocator.hpp>
@@ -78,4 +78,4 @@ inline std::string get_ip_from_dns(
     return domain_name;
 }
 
-#endif /* FASTDDS_EXAMPLES_CPP_DDS_DISCOVERY_SERVER_EXAMPLE__COMMON_H */
+#endif // FASTDDS_EXAMPLES_CPP_DISCOVERY_SERVER__HELPERS_HPP
diff --git a/examples/cpp/discovery_server/ServerApp.hpp b/examples/cpp/discovery_server/ServerApp.hpp
index f9eca825559..7e738cd06e7 100644
--- a/examples/cpp/discovery_server/ServerApp.hpp
+++ b/examples/cpp/discovery_server/ServerApp.hpp
@@ -83,4 +83,4 @@ class ServerApp : public Application, public DomainParticipantListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_DISCOVERY_SERVER__SERVERAPP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_DISCOVERY_SERVER__SERVERAPP_HPP
diff --git a/examples/cpp/hello_world/Application.cpp b/examples/cpp/hello_world/Application.cpp
index 8242de34545..3db1a1ebaa8 100644
--- a/examples/cpp/hello_world/Application.cpp
+++ b/examples/cpp/hello_world/Application.cpp
@@ -19,6 +19,7 @@
 
 
 #include "Application.hpp"
+
 #include "CLIParser.hpp"
 #include "ListenerSubscriberApp.hpp"
 #include "PublisherApp.hpp"
diff --git a/examples/cpp/hello_world/Application.hpp b/examples/cpp/hello_world/Application.hpp
index 333273d826d..0978ffd938d 100644
--- a/examples/cpp/hello_world/Application.hpp
+++ b/examples/cpp/hello_world/Application.hpp
@@ -53,4 +53,4 @@ class Application
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_HELLO_WORLD__APPLICATION_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_HELLO_WORLD__APPLICATION_HPP
diff --git a/examples/cpp/hello_world/CLIParser.hpp b/examples/cpp/hello_world/CLIParser.hpp
index 47a658bc83d..edd0863e321 100644
--- a/examples/cpp/hello_world/CLIParser.hpp
+++ b/examples/cpp/hello_world/CLIParser.hpp
@@ -18,8 +18,8 @@
 
 #include <fastdds/dds/log/Log.hpp>
 
-#ifndef FASTDDS_EXAMPLES_CPP_HELLO_WORLD__CLI_PARSER_HPP
-#define FASTDDS_EXAMPLES_CPP_HELLO_WORLD__CLI_PARSER_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_HELLO_WORLD__CLIPARSER_HPP
+#define FASTDDS_EXAMPLES_CPP_HELLO_WORLD__CLIPARSER_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -258,4 +258,4 @@ class CLIParser
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_EXAMPLES_CPP_HELLO_WORLD__CLI_PARSER_HPP
+#endif // FASTDDS_EXAMPLES_CPP_HELLO_WORLD__CLIPARSER_HPP
diff --git a/examples/cpp/hello_world/ListenerSubscriberApp.hpp b/examples/cpp/hello_world/ListenerSubscriberApp.hpp
index d39dcc4c31e..6d8978494dd 100644
--- a/examples/cpp/hello_world/ListenerSubscriberApp.hpp
+++ b/examples/cpp/hello_world/ListenerSubscriberApp.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_HELLO_WORLD__LISTENER_SUBSCRIBER_APP_HPP
-#define FASTDDS_EXAMPLES_CPP_HELLO_WORLD__LISTENER_SUBSCRIBER_APP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_HELLO_WORLD__LISTENERSUBSCRIBERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_HELLO_WORLD__LISTENERSUBSCRIBERAPP_HPP
 
 #include <condition_variable>
 
@@ -95,4 +95,4 @@ class ListenerSubscriberApp : public Application,  public DataReaderListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_HELLO_WORLD__LISTENER_SUBSCRIBER_APP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_HELLO_WORLD__LISTENERSUBSCRIBERAPP_HPP
diff --git a/examples/cpp/hello_world/PublisherApp.hpp b/examples/cpp/hello_world/PublisherApp.hpp
index cfcdcf70ba7..ed62f856780 100644
--- a/examples/cpp/hello_world/PublisherApp.hpp
+++ b/examples/cpp/hello_world/PublisherApp.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_HELLO_WORLD__PUBLISHER_APP_HPP
-#define FASTDDS_EXAMPLES_CPP_HELLO_WORLD__PUBLISHER_APP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_HELLO_WORLD__PUBLISHERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_HELLO_WORLD__PUBLISHERAPP_HPP
 
 #include <condition_variable>
 
@@ -96,4 +96,4 @@ class PublisherApp : public Application, public DataWriterListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_HELLO_WORLD__PUBLISHER_APP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_HELLO_WORLD__PUBLISHERAPP_HPP
diff --git a/examples/cpp/hello_world/WaitsetSubscriberApp.hpp b/examples/cpp/hello_world/WaitsetSubscriberApp.hpp
index ad290bf64b4..88894a324ae 100644
--- a/examples/cpp/hello_world/WaitsetSubscriberApp.hpp
+++ b/examples/cpp/hello_world/WaitsetSubscriberApp.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_HELLO_WORLD__WAITSET_SUBSCRIBER_APP_HPP
-#define FASTDDS_EXAMPLES_CPP_HELLO_WORLD__WAITSET_SUBSCRIBER_APP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_HELLO_WORLD__WAITSETSUBSCRIBERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_HELLO_WORLD__WAITSETSUBSCRIBERAPP_HPP
 
 #include <fastdds/dds/core/condition/GuardCondition.hpp>
 #include <fastdds/dds/core/condition/WaitSet.hpp>
@@ -88,4 +88,4 @@ class WaitsetSubscriberApp : public Application
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_HELLO_WORLD__WAITSET_SUBSCRIBER_APP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_HELLO_WORLD__WAITSETSUBSCRIBERAPP_HPP
diff --git a/examples/cpp/rtps/AsSocket/TestReaderSocket.h b/examples/cpp/rtps/AsSocket/TestReaderSocket.h
index fce29a1211e..665074146f1 100644
--- a/examples/cpp/rtps/AsSocket/TestReaderSocket.h
+++ b/examples/cpp/rtps/AsSocket/TestReaderSocket.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_RTPS_AS_SOCKET__TEST_READER_SOCKET_H
-#define FASTDDS_EXAMPLES_CPP_RTPS_AS_SOCKET__TEST_READER_SOCKET_H
+#ifndef FASTDDS_EXAMPLES_CPP_RTPS_AS_SOCKET__TESTREADERSOCKET_H
+#define FASTDDS_EXAMPLES_CPP_RTPS_AS_SOCKET__TESTREADERSOCKET_H
 
 #include <fastdds/rtps/reader/ReaderListener.hpp>
 
@@ -75,4 +75,4 @@ class TestReaderSocket
 
 };
 
-#endif /* FASTDDS_EXAMPLES_CPP_RTPS_AS_SOCKET__TEST_READER_SOCKET_H */
+#endif // FASTDDS_EXAMPLES_CPP_RTPS_AS_SOCKET__TESTREADERSOCKET_H
diff --git a/examples/cpp/rtps/AsSocket/TestWriterSocket.h b/examples/cpp/rtps/AsSocket/TestWriterSocket.h
index e9b21b2dbd8..59c4ea042c7 100644
--- a/examples/cpp/rtps/AsSocket/TestWriterSocket.h
+++ b/examples/cpp/rtps/AsSocket/TestWriterSocket.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_RTPS_AS_SOCKET__TEST_WRITER_SOCKET_H
-#define FASTDDS_EXAMPLES_CPP_RTPS_AS_SOCKET__TEST_WRITER_SOCKET_H
+#ifndef FASTDDS_EXAMPLES_CPP_RTPS_AS_SOCKET__TESTWRITERSOCKET_H
+#define FASTDDS_EXAMPLES_CPP_RTPS_AS_SOCKET__TESTWRITERSOCKET_H
 
 #include <cstdint>
 #include <cstdio>
@@ -57,4 +57,4 @@ class TestWriterSocket
             uint16_t nmsgs);
 };
 
-#endif /* FASTDDS_EXAMPLES_CPP_RTPS_AS_SOCKET__TEST_WRITER_SOCKET_H */
+#endif // FASTDDS_EXAMPLES_CPP_RTPS_AS_SOCKET__TESTWRITERSOCKET_H
diff --git a/examples/cpp/rtps/Persistent/TestReaderPersistent.h b/examples/cpp/rtps/Persistent/TestReaderPersistent.h
index 33e5e73d49c..3a7b05047d5 100644
--- a/examples/cpp/rtps/Persistent/TestReaderPersistent.h
+++ b/examples/cpp/rtps/Persistent/TestReaderPersistent.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_RTPS_PERSISTENT__TEST_READER_PERSISTENT_H
-#define FASTDDS_EXAMPLES_CPP_RTPS_PERSISTENT__TEST_READER_PERSISTENT_H
+#ifndef FASTDDS_EXAMPLES_CPP_RTPS_PERSISTENT__TESTREADERPERSISTENT_H
+#define FASTDDS_EXAMPLES_CPP_RTPS_PERSISTENT__TESTREADERPERSISTENT_H
 
 #include <fastdds/rtps/reader/ReaderListener.hpp>
 
@@ -78,4 +78,4 @@ class TestReaderPersistent
     m_listener;
 };
 
-#endif /* FASTDDS_EXAMPLES_CPP_RTPS_PERSISTENT__TEST_READER_PERSISTENT_H */
+#endif // FASTDDS_EXAMPLES_CPP_RTPS_PERSISTENT__TESTREADERPERSISTENT_H
diff --git a/examples/cpp/rtps/Persistent/TestWriterPersistent.h b/examples/cpp/rtps/Persistent/TestWriterPersistent.h
index 2bbc6ca4ab3..313ad1a7300 100644
--- a/examples/cpp/rtps/Persistent/TestWriterPersistent.h
+++ b/examples/cpp/rtps/Persistent/TestWriterPersistent.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_RTPS_PERSISTENT__TEST_WRITER_PERSISTENT_H
-#define FASTDDS_EXAMPLES_CPP_RTPS_PERSISTENT__TEST_WRITER_PERSISTENT_H
+#ifndef FASTDDS_EXAMPLES_CPP_RTPS_PERSISTENT__TESTWRITERPERSISTENT_H
+#define FASTDDS_EXAMPLES_CPP_RTPS_PERSISTENT__TESTWRITERPERSISTENT_H
 
 #include <fastdds/rtps/writer/WriterListener.hpp>
 
@@ -77,4 +77,4 @@ class TestWriterPersistent
     m_listener;
 };
 
-#endif /* FASTDDS_EXAMPLES_CPP_RTPS_PERSISTENT__TEST_WRITER_PERSISTENT_H */
+#endif // FASTDDS_EXAMPLES_CPP_RTPS_PERSISTENT__TESTWRITERPERSISTENT_H
diff --git a/examples/cpp/rtps/Registered/TestReaderRegistered.h b/examples/cpp/rtps/Registered/TestReaderRegistered.h
index 8483256cc08..c177224ba3f 100644
--- a/examples/cpp/rtps/Registered/TestReaderRegistered.h
+++ b/examples/cpp/rtps/Registered/TestReaderRegistered.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_RTPS_REGISTERED__TEST_READER_REGISTERED_H
-#define FASTDDS_EXAMPLES_CPP_RTPS_REGISTERED__TEST_READER_REGISTERED_H
+#ifndef FASTDDS_EXAMPLES_CPP_RTPS_REGISTERED__TESTREADERREGISTERED_H
+#define FASTDDS_EXAMPLES_CPP_RTPS_REGISTERED__TESTREADERREGISTERED_H
 
 #include <fastdds/rtps/reader/ReaderListener.hpp>
 
@@ -79,4 +79,4 @@ class TestReaderRegistered
     m_listener;
 };
 
-#endif /* FASTDDS_EXAMPLES_CPP_RTPS_REGISTERED__TEST_READER_REGISTERED_H */
+#endif // FASTDDS_EXAMPLES_CPP_RTPS_REGISTERED__TESTREADERREGISTERED_H
diff --git a/examples/cpp/rtps/Registered/TestWriterRegistered.h b/examples/cpp/rtps/Registered/TestWriterRegistered.h
index 6ca8b61a49a..90f70f3eb87 100644
--- a/examples/cpp/rtps/Registered/TestWriterRegistered.h
+++ b/examples/cpp/rtps/Registered/TestWriterRegistered.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_RTPS_REGISTERED__TEST_WRITER_REGISTERED_H
-#define FASTDDS_EXAMPLES_CPP_RTPS_REGISTERED__TEST_WRITER_REGISTERED_H
+#ifndef FASTDDS_EXAMPLES_CPP_RTPS_REGISTERED__TESTWRITERREGISTERED_H
+#define FASTDDS_EXAMPLES_CPP_RTPS_REGISTERED__TESTWRITERREGISTERED_H
 
 #include <fastdds/rtps/writer/WriterListener.hpp>
 
@@ -76,4 +76,4 @@ class TestWriterRegistered
     m_listener;
 };
 
-#endif /* FASTDDS_EXAMPLES_CPP_RTPS_REGISTERED__TEST_WRITER_REGISTERED_H */
+#endif // FASTDDS_EXAMPLES_CPP_RTPS_REGISTERED__TESTWRITERREGISTERED_H
diff --git a/examples/cpp/security/Application.hpp b/examples/cpp/security/Application.hpp
index 535b84dad08..1fcf49403a8 100644
--- a/examples/cpp/security/Application.hpp
+++ b/examples/cpp/security/Application.hpp
@@ -53,4 +53,4 @@ class Application
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_SECURITY__APPLICATION_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_SECURITY__APPLICATION_HPP
diff --git a/examples/cpp/security/CLIParser.hpp b/examples/cpp/security/CLIParser.hpp
index c41aaf1fa86..4e2484698d0 100644
--- a/examples/cpp/security/CLIParser.hpp
+++ b/examples/cpp/security/CLIParser.hpp
@@ -19,8 +19,8 @@
 
 #include <fastdds/dds/log/Log.hpp>
 
-#ifndef FASTDDS_EXAMPLES_CPP_SECURITY__CLI_PARSER_HPP
-#define FASTDDS_EXAMPLES_CPP_SECURITY__CLI_PARSER_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_SECURITY__CLIPARSER_HPP
+#define FASTDDS_EXAMPLES_CPP_SECURITY__CLIPARSER_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -292,4 +292,4 @@ class CLIParser
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_EXAMPLES_CPP_SECURITY__CLI_PARSER_HPP
+#endif // FASTDDS_EXAMPLES_CPP_SECURITY__CLIPARSER_HPP
diff --git a/examples/cpp/security/PublisherApp.cpp b/examples/cpp/security/PublisherApp.cpp
index dbaf7581541..2650d299509 100644
--- a/examples/cpp/security/PublisherApp.cpp
+++ b/examples/cpp/security/PublisherApp.cpp
@@ -17,6 +17,8 @@
  *
  */
 
+#include "PublisherApp.hpp"
+
 #include <condition_variable>
 #include <stdexcept>
 
@@ -26,7 +28,6 @@
 #include <fastdds/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/dds/publisher/qos/PublisherQos.hpp>
 
-#include "PublisherApp.hpp"
 #include "HelloWorldPubSubTypes.hpp"
 
 using namespace eprosima::fastdds::dds;
diff --git a/examples/cpp/security/PublisherApp.hpp b/examples/cpp/security/PublisherApp.hpp
index 18edbd483de..2b35ddedaf9 100644
--- a/examples/cpp/security/PublisherApp.hpp
+++ b/examples/cpp/security/PublisherApp.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_SECURITY__PUBLISHER_APP_HPP
-#define FASTDDS_EXAMPLES_CPP_SECURITY__PUBLISHER_APP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_SECURITY__PUBLISHERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_SECURITY__PUBLISHERAPP_HPP
 
 #include <condition_variable>
 
@@ -97,4 +97,4 @@ class PublisherApp : public Application, public DataWriterListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_SECURITY__PUBLISHER_APP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_SECURITY__PUBLISHERAPP_HPP
diff --git a/examples/cpp/security/README.md b/examples/cpp/security/README.md
index 29489c232a4..c5a436e6ab9 100644
--- a/examples/cpp/security/README.md
+++ b/examples/cpp/security/README.md
@@ -23,7 +23,7 @@ For simplicity, in this example, the subscriber class inherits from the listener
 ## Run the example
 
 To launch this example, two different terminals are required.
-One of them will run the publisher example application, and the other will run the subscriber application. Before running both applications, it is necessary to export the path of the folder where the certificates are located in the environment variable ``CERTS_PATH``:
+One of them will run the publisher example application, and the other will run the subscriber application. Before running the applications, it is necessary to export both the path of the folder where the certificates are located in the environment variable ``CERTS_PATH`` and the path to the corresponding xml profile with ``FASTDDS_DEFAULT_PROFILES_FILE`` (see [XML playground](#xml-profile-playground)):
 
 * Ubuntu ( / MacOS )
 
diff --git a/examples/cpp/security/SubscriberApp.hpp b/examples/cpp/security/SubscriberApp.hpp
index a24b913bd59..f4a11661a0c 100644
--- a/examples/cpp/security/SubscriberApp.hpp
+++ b/examples/cpp/security/SubscriberApp.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_SECURITY__SUBSCRIBER_APP_HPP
-#define FASTDDS_EXAMPLES_CPP_SECURITY__SUBSCRIBER_APP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_SECURITY__SUBSCRIBERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_SECURITY__SUBSCRIBERAPP_HPP
 
 #include <condition_variable>
 
@@ -95,4 +95,4 @@ class SubscriberApp : public Application,  public DataReaderListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_SECURITY__SUBSCRIBER_APP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_SECURITY__SUBSCRIBERAPP_HPP
diff --git a/examples/cpp/xtypes/Application.hpp b/examples/cpp/xtypes/Application.hpp
index 8fbb766cda4..546e6ffff54 100644
--- a/examples/cpp/xtypes/Application.hpp
+++ b/examples/cpp/xtypes/Application.hpp
@@ -53,4 +53,4 @@ class Application
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_XTYPES__APPLICATION_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_XTYPES__APPLICATION_HPP
diff --git a/examples/cpp/xtypes/CLIParser.hpp b/examples/cpp/xtypes/CLIParser.hpp
index 09efafe898c..6b006a0beb3 100644
--- a/examples/cpp/xtypes/CLIParser.hpp
+++ b/examples/cpp/xtypes/CLIParser.hpp
@@ -18,8 +18,8 @@
 
 #include <fastdds/dds/log/Log.hpp>
 
-#ifndef FASTDDS_EXAMPLES_CPP_XTYPES__CLI_PARSER_HPP
-#define FASTDDS_EXAMPLES_CPP_XTYPES__CLI_PARSER_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_XTYPES__CLIPARSER_HPP
+#define FASTDDS_EXAMPLES_CPP_XTYPES__CLIPARSER_HPP
 
 namespace eprosima {
 namespace fastdds {
@@ -246,4 +246,4 @@ class CLIParser
 } // namespace fastdds
 } // namespace eprosima
 
-#endif // FASTDDS_EXAMPLES_CPP_XTYPES__CLI_PARSER_HPP
+#endif // FASTDDS_EXAMPLES_CPP_XTYPES__CLIPARSER_HPP
diff --git a/examples/cpp/xtypes/PublisherApp.hpp b/examples/cpp/xtypes/PublisherApp.hpp
index e93ee4f2e49..664dd0e45fa 100644
--- a/examples/cpp/xtypes/PublisherApp.hpp
+++ b/examples/cpp/xtypes/PublisherApp.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_XTYPES__PUBLISHER_APP_HPP
-#define FASTDDS_EXAMPLES_CPP_XTYPES__PUBLISHER_APP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_XTYPES__PUBLISHERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_XTYPES__PUBLISHERAPP_HPP
 
 #include <condition_variable>
 
@@ -115,4 +115,4 @@ class PublisherApp : public Application, public DataWriterListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_XTYPES__PUBLISHER_APP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_XTYPES__PUBLISHERAPP_HPP
diff --git a/examples/cpp/xtypes/SubscriberApp.hpp b/examples/cpp/xtypes/SubscriberApp.hpp
index 73e21d80538..c4e18ccda76 100644
--- a/examples/cpp/xtypes/SubscriberApp.hpp
+++ b/examples/cpp/xtypes/SubscriberApp.hpp
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef FASTDDS_EXAMPLES_CPP_XTYPES__SUBSCRIBER_APP_HPP
-#define FASTDDS_EXAMPLES_CPP_XTYPES__SUBSCRIBER_APP_HPP
+#ifndef FASTDDS_EXAMPLES_CPP_XTYPES__SUBSCRIBERAPP_HPP
+#define FASTDDS_EXAMPLES_CPP_XTYPES__SUBSCRIBERAPP_HPP
 
 #include <condition_variable>
 
@@ -112,4 +112,4 @@ class SubscriberApp : public Application, public DomainParticipantListener
 } // namespace fastdds
 } // namespace eprosima
 
-#endif /* FASTDDS_EXAMPLES_CPP_XTYPES__SUBSCRIBER_APP_HPP */
+#endif // FASTDDS_EXAMPLES_CPP_XTYPES__SUBSCRIBERAPP_HPP