diff --git a/src/cpp/fastdds/log/Log.cpp b/src/cpp/fastdds/log/Log.cpp
index 9063fd4efb9..b1f46e1a492 100644
--- a/src/cpp/fastdds/log/Log.cpp
+++ b/src/cpp/fastdds/log/Log.cpp
@@ -18,13 +18,13 @@
 #include <memory>
 #include <mutex>
 
-#include <fastrtps/utils/DBQueue.h>
-
+#include <fastdds/dds/log/Colors.hpp>
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/dds/log/OStreamConsumer.hpp>
 #include <fastdds/dds/log/StdoutConsumer.hpp>
 #include <fastdds/dds/log/StdoutErrConsumer.hpp>
-#include <fastdds/dds/log/Colors.hpp>
+
+#include <utils/DBQueue.hpp>
 #include <utils/SystemInfo.hpp>
 #include <utils/thread.hpp>
 #include <utils/threading.hpp>
@@ -341,7 +341,7 @@ struct LogResources
         return true;
     }
 
-    fastrtps::DBQueue<Log::Entry> logs_;
+    DBQueue<Log::Entry> logs_;
     std::vector<std::unique_ptr<LogConsumer>> consumers_;
     eprosima::thread logging_thread_;
 
diff --git a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
index 2c363f12f32..7077b10e2c3 100644
--- a/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
+++ b/src/cpp/rtps/builtin/discovery/database/DiscoveryDataBase.hpp
@@ -27,17 +27,17 @@
 #include <set>
 #include <vector>
 
+#include <nlohmann/json.hpp>
+
+#include <fastdds/rtps/common/CacheChange.h>
 #include <fastdds/rtps/history/WriterHistory.h>
 #include <fastdds/rtps/writer/ReaderProxy.h>
-#include <fastdds/rtps/common/CacheChange.h>
-#include <fastrtps/utils/DBQueue.h>
 
 #include <rtps/builtin/discovery/database/DiscoveryDataFilter.hpp>
-#include <rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp>
-#include <rtps/builtin/discovery/database/DiscoveryEndpointInfo.hpp>
 #include <rtps/builtin/discovery/database/DiscoveryDataQueueInfo.hpp>
-
-#include <nlohmann/json.hpp>
+#include <rtps/builtin/discovery/database/DiscoveryEndpointInfo.hpp>
+#include <rtps/builtin/discovery/database/DiscoveryParticipantInfo.hpp>
+#include <utils/DBQueue.hpp>
 
 namespace eprosima {
 namespace fastdds {
@@ -520,9 +520,9 @@ class DiscoveryDataBase
     ////////////////
     // Variables
 
-    fastrtps::DBQueue<eprosima::fastdds::rtps::ddb::DiscoveryPDPDataQueueInfo> pdp_data_queue_;
+    DBQueue<eprosima::fastdds::rtps::ddb::DiscoveryPDPDataQueueInfo> pdp_data_queue_;
 
-    fastrtps::DBQueue<eprosima::fastdds::rtps::ddb::DiscoveryEDPDataQueueInfo> edp_data_queue_;
+    DBQueue<eprosima::fastdds::rtps::ddb::DiscoveryEDPDataQueueInfo> edp_data_queue_;
 
     //! Covenient per-topic mapping of readers and writers to speed-up queries
     std::map<std::string, std::vector<eprosima::fastrtps::rtps::GUID_t>> readers_by_topic_;
diff --git a/src/cpp/rtps/transport/shared_mem/SharedMemLog.hpp b/src/cpp/rtps/transport/shared_mem/SharedMemLog.hpp
index 22754952850..04d2ac249c6 100644
--- a/src/cpp/rtps/transport/shared_mem/SharedMemLog.hpp
+++ b/src/cpp/rtps/transport/shared_mem/SharedMemLog.hpp
@@ -19,9 +19,9 @@
 
 #include <fastdds/rtps/attributes/ThreadSettings.hpp>
 #include <fastdds/rtps/common/Locator.h>
-#include <fastrtps/utils/DBQueue.h>
 
 #include <rtps/transport/shared_mem/SharedMemManager.hpp>
+#include <utils/DBQueue.hpp>
 #include <utils/SystemInfo.hpp>
 #include <utils/thread.hpp>
 #include <utils/threading.hpp>
@@ -334,7 +334,7 @@ class PacketsLog
 
     struct Resources
     {
-        eprosima::fastrtps::DBQueue<typename TPacketConsumer::Pkt> logs;
+        DBQueue<typename TPacketConsumer::Pkt> logs;
         std::vector<std::unique_ptr<SHMPacketFileConsumer>> consumers;
         eprosima::thread logging_thread;
 
diff --git a/include/fastrtps/utils/DBQueue.h b/src/cpp/utils/DBQueue.hpp
similarity index 97%
rename from include/fastrtps/utils/DBQueue.h
rename to src/cpp/utils/DBQueue.hpp
index f2d91b6cebc..5e74ca5e1b6 100644
--- a/include/fastrtps/utils/DBQueue.h
+++ b/src/cpp/utils/DBQueue.hpp
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#ifndef DBQUEUE_H
-#define DBQUEUE_H
+#ifndef _FASTDDS_DBQUEUE_HPP
+#define _FASTDDS_DBQUEUE_HPP
 
-#include <queue>
-#include <mutex>
-#include <memory>
 #include <condition_variable>
+#include <memory>
+#include <mutex>
+#include <queue>
 
 namespace eprosima {
-namespace fastrtps {
+namespace fastdds {
 
 /**
  * Double buffered, threadsafe queue for MPSC (multi-producer, single-consumer) comms.
@@ -151,7 +151,7 @@ class DBQueue
 };
 
 
-} // namespace fastrtps
+} // namespace fastdds
 } // namespace eprosima
 
 #endif // ifndef DBQUEUE_H