All you need is make_string.

2 files changed, 4 insertions, 7 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
index 3750ba03f50..cbfdb4895cc 100644
--- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
@@ -5,7 +5,6 @@
 #include "feedstates.h"
 #include "i_feed_handler_owner.h"
 #include "ifeedview.h"
-#include "replaypacketdispatcher.h"
 #include "tlcproxy.h"
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/documentapi/messagebus/documentprotocol.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/tlcproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/tlcproxy.cpp
index 8dfcfead3c2..c377be9f73d 100644
--- a/searchcore/src/vespa/searchcore/proton/server/tlcproxy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/tlcproxy.cpp
@@ -1,22 +1,20 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "tlcproxy.h"
-#include <vespa/vespalib/objects/nbostream.h>
-#include <vespa/searchlib/common/bitvector.h>
-#include <vespa/document/bucket/bucketid.h>
 #include <vespa/vespalib/util/exceptions.h>
+
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.tlcproxy");
 
 using vespalib::nbostream;
+using search::transactionlog::Packet;
 
 namespace proton {
 
 void TlcProxy::commit(search::SerialNum serialNum, search::transactionlog::Type type, const vespalib::nbostream &buf)
 {
-    search::transactionlog::Packet::Entry
-        entry(serialNum, type, vespalib::ConstBufferRef(buf.c_str(), buf.size()));
-    search::transactionlog::Packet packet;
+    Packet::Entry entry(serialNum, type, vespalib::ConstBufferRef(buf.c_str(), buf.size()));
+    Packet packet;
     packet.add(entry);
     packet.close();
     if (_tlsDirectWriter != NULL) {