2 files changed, 5 insertions, 8 deletions
diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index 27076ccad8..1b1cec9f85 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -21,6 +21,7 @@
 
 #include "Message.h"
 #include "ExchangeRegistry.h"
+#include "qpid/StringUtils.h"
 #include "qpid/framing/frame_functors.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/framing/MessageTransferBody.h"
@@ -28,8 +29,6 @@
 #include "qpid/framing/SequenceNumber.h"
 #include "qpid/framing/TypeFilter.h"
 #include "qpid/log/Statement.h"
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/split.hpp>
 
 using boost::intrusive_ptr;
 using namespace qpid::broker;
@@ -259,8 +258,7 @@ bool Message::isExcluded(const std::vector<std::string>& excludes) const
     if (headers) {
         std::string traceStr = headers->getString(X_QPID_TRACE);
         if (traceStr.size()) {
-            std::vector<std::string> trace;
-            boost::split(trace, traceStr, boost::is_any_of(", ") );
+            std::vector<std::string> trace = split(traceStr, ", ");
 
             for (std::vector<std::string>::const_iterator i = excludes.begin(); i != excludes.end(); i++) {
                 for (std::vector<std::string>::const_iterator j = trace.begin(); j != trace.end(); j++) {
diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp
index 06009a208d..4ac061ac25 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/cpp/src/qpid/broker/Queue.cpp
@@ -26,6 +26,7 @@
 #include "MessageStore.h"
 #include "QueueRegistry.h"
 
+#include "qpid/StringUtils.h"
 #include "qpid/log/Statement.h"
 #include "qpid/framing/reply_exceptions.h"
 #include "qpid/sys/Monitor.h"
@@ -37,8 +38,6 @@
 
 #include <boost/bind.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/split.hpp>
 
 using namespace qpid::broker;
 using namespace qpid::sys;
@@ -517,9 +516,9 @@ void Queue::configure(const FieldTable& _settings)
     traceId = _settings.getString(qpidTraceIdentity);
     std::string excludeList = _settings.getString(qpidTraceExclude);
     if (excludeList.size()) {
-        boost::split(traceExclude, excludeList, boost::is_any_of(", ") );
+        split(traceExclude, excludeList, ", ");
     }
-    QPID_LOG(info, "Configured queue " << getName() << " with qpid.trace.id='" << traceId 
+    QPID_LOG(debug, "Configured queue " << getName() << " with qpid.trace.id='" << traceId 
              << "' and qpid.trace.exclude='"<< excludeList << "' i.e. " << traceExclude.size() << " elements");
 
     if (mgmtObject.get() != 0)