Now make all works

28 files changed, 83 insertions, 52 deletions

diff --git a/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp b/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp
index 6fea98e3c8e..5b622987e73 100644
--- a/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp
+++ b/memfilepersistence/src/tests/spi/iteratorhandlertest.cpp
@@ -9,6 +9,7 @@
 #include <tests/spi/simulatedfailurefile.h>
 #include <tests/spi/options_builder.h>
 #include <vespa/document/fieldset/fieldsets.h>
+#include <vespa/document/select/parser.h>
 
 namespace storage {
 namespace memfile {
diff --git a/memfilepersistence/src/tests/spi/memfiletestutils.cpp b/memfilepersistence/src/tests/spi/memfiletestutils.cpp
index 1e882ccbe6b..7cf782376c9 100644
--- a/memfilepersistence/src/tests/spi/memfiletestutils.cpp
+++ b/memfilepersistence/src/tests/spi/memfiletestutils.cpp
@@ -7,6 +7,7 @@
 #include <tests/spi/simulatedfailurefile.h>
 #include <vespa/memfilepersistence/memfile/memfilecache.h>
 #include <vespa/storageframework/defaultimplementation/memory/simplememorylogic.h>
+#include <vespa/document/update/assignvalueupdate.h>
 #include <sys/time.h>
 
 using document::DocumentType;
diff --git a/memfilepersistence/src/tests/spi/memfiletestutils.h b/memfilepersistence/src/tests/spi/memfiletestutils.h
index 796294fcaa3..d2bf5a9c635 100644
--- a/memfilepersistence/src/tests/spi/memfiletestutils.h
+++ b/memfilepersistence/src/tests/spi/memfiletestutils.h
@@ -17,10 +17,12 @@
 #include <vespa/persistence/spi/persistenceprovider.h>
 #include <vespa/memfilepersistence/spi/memfilepersistenceprovider.h>
 #include <vespa/document/base/testdocman.h>
+#include <vespa/document/update/documentupdate.h>
 #include <vespa/storageframework/defaultimplementation/clock/realclock.h>
 #include <vespa/storageframework/defaultimplementation/component/componentregisterimpl.h>
 #include <vespa/storageframework/defaultimplementation/memory/memorymanager.h>
 
+
 namespace storage {
 namespace memfile {
 
diff --git a/persistence/src/tests/proxy/mockprovider.h b/persistence/src/tests/proxy/mockprovider.h
index c2fd844a010..42d21d393b8 100644
--- a/persistence/src/tests/proxy/mockprovider.h
+++ b/persistence/src/tests/proxy/mockprovider.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include <vespa/persistence/spi/persistenceprovider.h>
+#include <vespa/document/fieldvalue/document.h>
 
 namespace storage {
 namespace spi {
@@ -56,7 +57,7 @@ struct MockProvider : PersistenceProvider {
                                            BucketInfo::ACTIVE));
     }
 
-    virtual Result put(const Bucket &, Timestamp, const Document::SP&, Context&) {
+    virtual Result put(const Bucket &, Timestamp, const DocumentSP&, Context&) {
         last_called = PUT;
         return Result();
     }
@@ -80,7 +81,7 @@ struct MockProvider : PersistenceProvider {
     }
 
     virtual UpdateResult update(const Bucket &, Timestamp timestamp,
-                                const DocumentUpdate::SP&, Context&) {
+                                const DocumentUpdateSP&, Context&) {
         last_called = UPDATE;
         return UpdateResult(Timestamp(timestamp - 10));
     }
diff --git a/persistence/src/tests/proxy/providerproxy_test.cpp b/persistence/src/tests/proxy/providerproxy_test.cpp
index 34537b170e6..ab21750c28f 100644
--- a/persistence/src/tests/proxy/providerproxy_test.cpp
+++ b/persistence/src/tests/proxy/providerproxy_test.cpp
@@ -10,6 +10,8 @@ LOG_SETUP("providerproxy_test");
 #include <vespa/document/bucket/bucketid.h>
 #include <vespa/document/datatype/datatype.h>
 #include <vespa/document/repo/documenttyperepo.h>
+#include <vespa/document/fieldvalue/document.h>
+#include <vespa/document/update/documentupdate.h>
 #include <vespa/persistence/proxy/providerproxy.h>
 #include <vespa/persistence/proxy/providerstub.h>
 #include <vespa/persistence/spi/abstractpersistenceprovider.h>
@@ -19,6 +21,8 @@ LOG_SETUP("providerproxy_test");
 #include <vespa/vespalib/util/sync.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 #include <vespa/document/fieldset/fieldsets.h>
+#include <vespa/vdslib/state/clusterstate.h>
+#include <vespa/vdslib/distribution/distribution.h>
 
 using document::BucketId;
 using document::DataType;
diff --git a/persistence/src/tests/proxy/providerstub_test.cpp b/persistence/src/tests/proxy/providerstub_test.cpp
index 07eed26db19..3d66cc6d77c 100644
--- a/persistence/src/tests/proxy/providerstub_test.cpp
+++ b/persistence/src/tests/proxy/providerstub_test.cpp
@@ -9,11 +9,15 @@ LOG_SETUP("providerstub_test");
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/serialization/vespadocumentserializer.h>
 #include <vespa/document/util/bytebuffer.h>
+#include <vespa/document/fieldvalue/document.h>
+#include <vespa/document/update/documentupdate.h>
 #include <vespa/persistence/proxy/buildid.h>
 #include <vespa/persistence/proxy/providerstub.h>
 #include <vespa/persistence/spi/abstractpersistenceprovider.h>
 #include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/vdslib/distribution/distribution.h>
+#include <vespa/vdslib/state/clusterstate.h>
 
 using document::BucketId;
 using document::ByteBuffer;
diff --git a/persistence/src/tests/spi/clusterstatetest.cpp b/persistence/src/tests/spi/clusterstatetest.cpp
index d89c99b912d..87e2a8de163 100644
--- a/persistence/src/tests/spi/clusterstatetest.cpp
+++ b/persistence/src/tests/spi/clusterstatetest.cpp
@@ -5,6 +5,8 @@
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/persistence/conformancetest/conformancetest.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
+#include <vespa/vdslib/distribution/distribution.h>
+#include <vespa/vdslib/state/clusterstate.h>
 
 LOG_SETUP(".test.dummyimpl");
 
diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
index 4de66da599f..0fadb300173 100644
--- a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
+++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
@@ -6,6 +6,13 @@
 #include <vespa/persistence/conformancetest/conformancetest.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/document/fieldset/fieldsets.h>
+#include <vespa/document/update/documentupdate.h>
+#include <vespa/document/update/assignvalueupdate.h>
+#include <vespa/vdslib/state/state.h>
+#include <vespa/vdslib/state/node.h>
+#include <vespa/vdslib/state/nodestate.h>
+#include <vespa/vdslib/state/clusterstate.h>
+#include <vespa/vdslib/distribution/distribution.h>
 
 LOG_SETUP(".test.conformance");
 
diff --git a/persistence/src/vespa/persistence/spi/docentry.cpp b/persistence/src/vespa/persistence/spi/docentry.cpp
index 542c773f6aa..a4b297ffb69 100644
--- a/persistence/src/vespa/persistence/spi/docentry.cpp
+++ b/persistence/src/vespa/persistence/spi/docentry.cpp
@@ -120,6 +120,11 @@ DocEntry::prettyPrint(std::ostream& out) const
     out << flags << ")";
 }
 
+std::ostream &
+operator << (std::ostream & os, const DocEntry & r) {
+    return os << r.toString();
+}
+
 bool
 DocEntry::operator==(const DocEntry& entry) const {
     if (_timestamp != entry._timestamp) {
diff --git a/persistence/src/vespa/persistence/spi/docentry.h b/persistence/src/vespa/persistence/spi/docentry.h
index 1648a56a522..69c65465d8e 100644
--- a/persistence/src/vespa/persistence/spi/docentry.h
+++ b/persistence/src/vespa/persistence/spi/docentry.h
@@ -93,6 +93,8 @@ public:
     bool operator==(const DocEntry& entry) const;
 };
 
+std::ostream & operator << (std::ostream & os, const DocEntry & r);
+
 } // spi
 } // storage
 
diff --git a/persistence/src/vespa/persistence/spi/result.cpp b/persistence/src/vespa/persistence/spi/result.cpp
index 2991b51d6ad..4734a669c6e 100644
--- a/persistence/src/vespa/persistence/spi/result.cpp
+++ b/persistence/src/vespa/persistence/spi/result.cpp
@@ -14,6 +14,11 @@ Result::toString() const {
     return os.str();
 }
 
+std::ostream &
+operator << (std::ostream & os, const Result & r) {
+    return os << r.toString();
+}
+
 GetResult::GetResult(Document::UP doc, Timestamp timestamp)
     : Result(),
       _timestamp(timestamp),
diff --git a/persistence/src/vespa/persistence/spi/result.h b/persistence/src/vespa/persistence/spi/result.h
index 14956feddf5..3cda34f33e0 100644
--- a/persistence/src/vespa/persistence/spi/result.h
+++ b/persistence/src/vespa/persistence/spi/result.h
@@ -62,6 +62,8 @@ private:
     vespalib::string _errorMessage;
 };
 
+std::ostream & operator << (std::ostream & os, const Result & r);
+
 class BucketInfoResult : public Result {
 public:
     /**
diff --git a/searchcore/src/apps/proton/downpersistence.cpp b/searchcore/src/apps/proton/downpersistence.cpp
index 2217121c491..3509d59d635 100644
--- a/searchcore/src/apps/proton/downpersistence.cpp
+++ b/searchcore/src/apps/proton/downpersistence.cpp
@@ -1,19 +1,18 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".downpersistence");
 #include <vespa/persistence/spi/persistenceprovider.h>
 #include <vespa/searchlib/util/statefile.h>
+#include <vespa/document/fieldvalue/document.h>
+#include <vespa/document/update/documentupdate.h>
 #include "downpersistence.h"
+#include <vespa/log/log.h>
+LOG_SETUP(".downpersistence");
 
-namespace storage
-{
+namespace storage {
 
-namespace spi
-{
+namespace spi {
 
-namespace
-{
+namespace {
 
 Result errorResult(Result::FATAL_ERROR, "Node is down");
 
diff --git a/searchcore/src/apps/proton/downpersistence.h b/searchcore/src/apps/proton/downpersistence.h
index ee49416b6dc..4eeb301e617 100644
--- a/searchcore/src/apps/proton/downpersistence.h
+++ b/searchcore/src/apps/proton/downpersistence.h
@@ -1,10 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-namespace storage
-{
+namespace storage {
 
-namespace spi
-{
+namespace spi {
 
 /*
  * Persistence provider that returns error code for all operations
diff --git a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
index eb6b77cd1b3..369f37b4c69 100644
--- a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
+++ b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
@@ -1,16 +1,17 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("vespa-transactionlog-inspect");
-
 #include <vespa/config/helper/configgetter.h>
 #include <vespa/document/repo/documenttyperepo.h>
+#include <vespa/document/fieldvalue/document.h>
 #include <vespa/searchcore/proton/server/replaypacketdispatcher.h>
 #include <vespa/searchlib/common/fileheadercontext.h>
 #include <vespa/searchlib/transactionlog/translogclient.h>
 #include <vespa/searchlib/transactionlog/translogserver.h>
 #include <vespa/vespalib/util/programoptions.h>
 #include <iostream>
+#include <vespa/log/log.h>
+LOG_SETUP("vespa-transactionlog-inspect");
+
 
 using namespace proton;
 using namespace search;
diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h
index aa267d33af0..97a61c253ce 100644
--- a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h
+++ b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h
@@ -8,6 +8,7 @@
 #include <vespa/searchcore/proton/common/subdbtype.h>
 #include <vespa/persistence/spi/result.h>
 #include "bucketstate.h"
+#include <map>
 
 namespace proton
 {
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.cpp
index 4d3196e1ea1..729aefd6419 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.cpp
@@ -1,10 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".proton.feedoperation.documentoperation");
-
 #include "documentoperation.h"
 #include <vespa/vespalib/util/stringfmt.h>
+#include <vespa/document/base/documentid.h>
 
 using document::BucketId;
 using document::DocumentId;
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.cpp
index ca8e21cbf86..43c9f768aa9 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.cpp
@@ -1,10 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".proton.feedoperation.moveoperation");
-
 #include "moveoperation.h"
 #include <vespa/vespalib/util/stringfmt.h>
+#include <vespa/document/fieldvalue/document.h>
 
 using document::BucketId;
 using document::Document;
@@ -17,8 +15,7 @@ namespace proton {
 MoveOperation::MoveOperation()
     : DocumentOperation(FeedOperation::MOVE),
       _doc()
-{
-}
+{ }
 
 
 MoveOperation::MoveOperation(const BucketId &bucketId,
@@ -33,6 +30,7 @@ MoveOperation::MoveOperation(const BucketId &bucketId,
     setDbDocumentId(DbDocumentId(targetSubDbId, 0u));
 }
 
+MoveOperation::~MoveOperation() { }
 
 void
 MoveOperation::serialize(vespalib::nbostream &os) const
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.h
index 0789b2afc1d..90e29422718 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.h
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.h
@@ -8,18 +8,19 @@ namespace proton {
 class MoveOperation : public DocumentOperation
 {
 private:
-    document::Document::SP _doc;
+    using DocumentSP = std::shared_ptr<document::Document>;
+    DocumentSP _doc;
 public:
     typedef std::unique_ptr<MoveOperation> UP;
 
     MoveOperation();
     MoveOperation(const document::BucketId &bucketId,
                   const storage::spi::Timestamp &timestamp,
-                  const document::Document::SP &doc,
+                  const DocumentSP &doc,
                   DbDocumentId sourceDbdId,
                   uint32_t targetSubDbId);
-    virtual ~MoveOperation() {}
-    const document::Document::SP &getDocument() const { return _doc; }
+    virtual ~MoveOperation();
+    const DocumentSP &getDocument() const { return _doc; }
     DbDocumentId getSourceDbdId() const { return getPrevDbDocumentId(); }
     DbDocumentId getTargetDbdId() const { return getDbDocumentId(); }
     void setTargetLid(search::DocumentIdT lid) {
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.cpp
index 7f5f52bfec4..88d5f8315f8 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.cpp
@@ -1,9 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".proton.feedoperation.putoperation");
-
 #include "putoperation.h"
+#include <vespa/document/fieldvalue/document.h>
 
 using document::BucketId;
 using document::Document;
@@ -16,8 +14,7 @@ namespace proton {
 PutOperation::PutOperation()
     : DocumentOperation(FeedOperation::PUT),
       _doc()
-{
-}
+{ }
 
 
 PutOperation::PutOperation(const BucketId &bucketId,
@@ -27,8 +24,7 @@ PutOperation::PutOperation(const BucketId &bucketId,
                         bucketId,
                         timestamp),
       _doc(doc)
-{
-}
+{ }
 
 
 PutOperation::PutOperation(const document::BucketId &bucketId,
@@ -44,9 +40,9 @@ PutOperation::PutOperation(const document::BucketId &bucketId,
                         dbdId,
                         prevDbdId),
       _doc(doc)
-{
-}
+{ }
 
+PutOperation::~PutOperation() { }
 
 void
 PutOperation::serialize(vespalib::nbostream &os) const
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.h
index 61c067530d2..84092903778 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.h
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/putoperation.h
@@ -7,21 +7,22 @@ namespace proton {
 
 class PutOperation : public DocumentOperation
 {
-    document::Document::SP _doc;
+    using DocumentSP = std::shared_ptr<document::Document>;
+    DocumentSP _doc;
 
 public:
     PutOperation();
     PutOperation(const document::BucketId &bucketId,
                  const storage::spi::Timestamp &timestamp,
-                 const document::Document::SP &doc);
+                 const DocumentSP &doc);
     PutOperation(const document::BucketId &bucketId,
                  const storage::spi::Timestamp &timestamp,
-                 const document::Document::SP &doc,
+                 const DocumentSP &doc,
                  SerialNum serialNum,
                  DbDocumentId dbdId,
                  DbDocumentId prevDbdId);
-    virtual ~PutOperation() {}
-    const document::Document::SP &getDocument() const { return _doc; }
+    virtual ~PutOperation();
+    const DocumentSP &getDocument() const { return _doc; }
     void assertValid() const;
     virtual void serialize(vespalib::nbostream &os) const;
     virtual void deserialize(vespalib::nbostream &is,
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/removeoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/removeoperation.h
index 54e2936150b..9b58a382ad3 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/removeoperation.h
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/removeoperation.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include "documentoperation.h"
+#include <vespa/document/base/documentid.h>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp
index 21c008eec99..9e2b024806f 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp
@@ -1,10 +1,11 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
+#include "updateoperation.h"
+#include <vespa/vespalib/util/stringfmt.h>
+#include <vespa/document/base/exceptions.h>
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.feedoperation.updateoperation");
 
-#include "updateoperation.h"
-#include <vespa/vespalib/util/stringfmt.h>
 
 using document::BucketId;
 using document::DocumentTypeRepo;
diff --git a/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.h b/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.h
index 086bbd33c48..88e604b6665 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.h
+++ b/searchcore/src/vespa/searchcore/proton/server/bucketmovejob.h
@@ -12,6 +12,7 @@
 #include "ibucketstatechangedhandler.h"
 #include "i_disk_mem_usage_listener.h"
 #include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h>
+#include <set>
 
 namespace proton
 {
diff --git a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.h b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.h
index f4569a9114b..aeb48804031 100644
--- a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.h
@@ -9,6 +9,7 @@
 #include <vespa/persistence/spi/clusterstate.h>
 #include <vespa/searchcore/proton/persistenceengine/resulthandler.h>
 #include <vespa/vespalib/util/threadstackexecutorbase.h>
+#include <set>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
index 39025c78b31..665507b5bc0 100644
--- a/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/combiningfeedview.cpp
@@ -1,11 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".proton.server.combiningfeedview");
 #include "combiningfeedview.h"
 #include <vespa/searchcore/proton/documentmetastore/i_document_meta_store.h>
 #include <vespa/searchcore/proton/feedoperation/moveoperation.h>
+#include <vespa/document/fieldvalue/document.h>
+#include <vespa/log/log.h>
+LOG_SETUP(".proton.server.combiningfeedview");
 
 using document::DocumentTypeRepo;
 using document::DocumentId;
diff --git a/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.cpp
index 32177a99564..22798376055 100644
--- a/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.cpp
@@ -1,9 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".proton.server.persistencproviderproxy");
-
 #include "persistenceproviderproxy.h"
 
 using storage::spi::PersistenceProvider;
diff --git a/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.h b/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.h
index fab92066456..b977415939c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.h
+++ b/searchcore/src/vespa/searchcore/proton/server/persistenceproviderproxy.h
@@ -61,7 +61,7 @@ public:
 
     virtual Result put(const Bucket &bucket,
                        Timestamp timestamp,
-                       const document::Document::SP& doc,
+                       const storage::spi::DocumentSP& doc,
                        Context& context) {
         return _pp.put(bucket, timestamp, doc, context);
     }
@@ -82,7 +82,7 @@ public:
 
     virtual UpdateResult update(const Bucket &bucket,
                                 Timestamp timestamp,
-                                const document::DocumentUpdate::SP& docUpd,
+                                const storage::spi::DocumentUpdateSP& docUpd,
                                 Context& context) {
         return _pp.update(bucket, timestamp, docUpd, context);
     }