diff --git a/base/base_tests/fifo_cache_test.cpp b/base/base_tests/fifo_cache_test.cpp
index 7b63f1fb93..554e4e9b8a 100644
--- a/base/base_tests/fifo_cache_test.cpp
+++ b/base/base_tests/fifo_cache_test.cpp
@@ -67,7 +67,7 @@ UNIT_TEST(FifoCache)
     TEST_EQUAL(cache.GetMap(), expectedMap, ());
     list<Key> expectedList({2, 3, 1});
     boost::circular_buffer<Key> expectedCB(expectedList.cbegin(), expectedList.cend());
-    TEST_EQUAL(cache.GetFifo(), expectedCB, ());
+    TEST(cache.GetFifo() == expectedCB, ());
   }
 
   TEST_EQUAL(cache.GetValue(7), 7, ());
@@ -77,7 +77,7 @@ UNIT_TEST(FifoCache)
     TEST_EQUAL(cache.GetMap(), expectedMap, ());
     list<Key> expectedList({7, 2, 3});
     boost::circular_buffer<Key> expectedCB(expectedList.cbegin(), expectedList.cend());
-    TEST_EQUAL(cache.GetFifo(), expectedCB, ());
+    TEST(cache.GetFifo() == expectedCB, ());
   }
 }
 
diff --git a/base/internal/message.hpp b/base/internal/message.hpp
index c668ca54b8..99dcae5a05 100644
--- a/base/internal/message.hpp
+++ b/base/internal/message.hpp
@@ -19,8 +19,6 @@
 #include <utility>
 #include <vector>
 
-#include <boost/circular_buffer.hpp>
-
 /// @name Declarations.
 //@{
 template <typename T> inline std::string DebugPrint(T const & t);
@@ -42,8 +40,6 @@ template <class Key, class Hash = std::hash<Key>, class Pred = std::equal_to<Key
 inline std::string DebugPrint(std::unordered_set<Key, Hash, Pred> const & v);
 template <class Key, class T, class Hash = std::hash<Key>, class Pred = std::equal_to<Key>>
 inline std::string DebugPrint(std::unordered_map<Key, T, Hash, Pred> const & v);
-
-template <typename T> inline std::string DebugPrint(boost::circular_buffer<T> const & v);
 //@}
 
 template <typename T> inline std::string DebugPrint(T const & t)
@@ -170,11 +166,6 @@ template <typename T> inline std::string DebugPrint(std::unique_ptr<T> const & v
   return out.str();
 }
 
-template <typename T> inline std::string DebugPrint(boost::circular_buffer<T> const & v)
-{
-  return DebugPrintSequence(v.begin(), v.end());
-}
-
 namespace base
 {
 inline std::string Message() { return std::string(); }