diff --git a/code/CodeTester.cpp b/code/CodeTester.cpp
index dbb3be40f..ca60dd998 100644
--- a/code/CodeTester.cpp
+++ b/code/CodeTester.cpp
@@ -1,4 +1,6 @@
+#include <fstream>
 
+#include <fastdds/dds/subscriber/SampleInfo.hpp>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/history/ReaderHistory.h>
 #include <fastdds/rtps/participant/RTPSParticipant.h>
@@ -6,16 +8,14 @@
 #include <fastdds/rtps/reader/ReaderListener.h>
 #include <fastdds/rtps/RTPSDomain.h>
 #include <fastdds/rtps/writer/RTPSWriter.h>
-#include <fastdds/dds/subscriber/SampleInfo.hpp>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/log/Log.h>
 #include <fastrtps/log/FileConsumer.h>
 #include <fastrtps/TopicDataType.h>
 #include <fastrtps/types/DynamicDataFactory.h>
 #include <fastrtps/types/DynamicTypeBuilderFactory.h>
 #include <fastrtps/types/DynamicTypeBuilderPtr.h>
-#include <fastrtps/utils/IPLocator.h>
 
-#include <fstream>
 
 using namespace eprosima::fastrtps;
 using namespace ::rtps;
diff --git a/code/DDSCodeTester.cpp b/code/DDSCodeTester.cpp
index 51f1c2909..d674944bc 100644
--- a/code/DDSCodeTester.cpp
+++ b/code/DDSCodeTester.cpp
@@ -46,11 +46,11 @@
 #include <fastdds/statistics/dds/domain/DomainParticipant.hpp>
 #include <fastdds/statistics/dds/publisher/qos/DataWriterQos.hpp>
 #include <fastdds/statistics/topic_names.hpp>
+#include <fastdds/utils/IPLocator.h>
 #include <fastrtps/types/DynamicDataFactory.h>
 #include <fastrtps/types/DynamicTypeBuilderFactory.h>
 #include <fastrtps/types/DynamicTypeBuilderPtr.h>
 #include <fastrtps/types/DynamicTypePtr.h>
-#include <fastrtps/utils/IPLocator.h>
 
 
 using namespace eprosima::fastdds::dds;
diff --git a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h
index cb61cd6ba..545c68b12 100644
--- a/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h
+++ b/code/Examples/C++/DDSHelloWorld/src/HelloWorldPubSubTypes.h
@@ -27,7 +27,7 @@
 #include <fastdds/dds/topic/TopicDataType.hpp>
 #include <fastdds/rtps/common/InstanceHandle.h>
 #include <fastdds/rtps/common/SerializedPayload.h>
-#include <fastrtps/utils/md5.h>
+#include <fastdds/utils/md5.h>
 
 #include "HelloWorld.h"
 
diff --git a/docs/fastdds/api_reference/spelling_wordlist.txt b/docs/fastdds/api_reference/spelling_wordlist.txt
index 009a2f5ae..fa6995d47 100644
--- a/docs/fastdds/api_reference/spelling_wordlist.txt
+++ b/docs/fastdds/api_reference/spelling_wordlist.txt
@@ -97,6 +97,7 @@ myFilterFactory
 nackResponseDelay
 nackSupressionDuration
 netmask
+Netmask
 NonConstEnabler
 NoOpDomainParticipantListener
 nullptr
@@ -141,7 +142,6 @@ SecurityException
 sequenceNumber
 serializedPaylaod
 SetVerbosity
-SetVerbosity
 sn
 StatefulReader
 StatefulWriter
@@ -176,7 +176,6 @@ TypeIdV
 TypeInformation
 typelookup
 TypeLookup
-TypeLookup
 TypeLookupReplyListener
 TypeLookupRequestListener
 TypeObjectV