Include what we need.

8 files changed, 36 insertions, 19 deletions

diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/environment.h b/memfilepersistence/src/vespa/memfilepersistence/common/environment.h
index 8a944f6921e..a73ad4ceea9 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/common/environment.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/common/environment.h
@@ -21,6 +21,7 @@
 #include <vespa/storageframework/storageframework.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/memfilepersistence/device/mountpointlist.h>
+#include <vespa/document/bucket/bucketidfactory.h>
 
 namespace storage {
 namespace memfile {
diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/iteratorhandler.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/iteratorhandler.cpp
index c95d59001f4..3985459a5be 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/spi/iteratorhandler.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/spi/iteratorhandler.cpp
@@ -1,13 +1,14 @@
 // 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>
 #include <iterator>
 #include <vespa/document/fieldset/fieldsets.h>
 #include <vespa/document/select/bodyfielddetector.h>
+#include <vespa/document/select/node.h>
 #include <vespa/memfilepersistence/spi/iteratorhandler.h>
 #include <vespa/memfilepersistence/spi/visitorslotmatcher.h>
 #include <vespa/memfilepersistence/spi/cacheevictionguard.h>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".persistence.memfile.handler.iterator");
 
 namespace storage {
diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp
index cec695423af..7b0954aaa5b 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp
@@ -4,6 +4,8 @@
 #include <vespa/document/fieldset/fieldsetrepo.h>
 #include <vespa/memfilepersistence/spi/memfilepersistenceprovider.h>
 #include <vespa/memfilepersistence/common/exceptions.h>
+#include <vespa/document/fieldvalue/document.h>
+#include <vespa/document/update/documentupdate.h>
 #include <vespa/log/log.h>
 
 LOG_SETUP(".memfilepersistenceprovider");
diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.h b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.h
index 69edb680d5c..a1b0b1bd0ae 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.h
@@ -45,59 +45,59 @@ public:
 
     ~MemFilePersistenceProvider();
 
-    spi::PartitionStateListResult getPartitionStates() const;
+    spi::PartitionStateListResult getPartitionStates() const override;
 
-    spi::BucketIdListResult listBuckets(spi::PartitionId) const;
+    spi::BucketIdListResult listBuckets(spi::PartitionId) const override;
 
-    spi::BucketIdListResult getModifiedBuckets() const;
+    spi::BucketIdListResult getModifiedBuckets() const override;
 
-    spi::BucketInfoResult getBucketInfo(const spi::Bucket&) const;
+    spi::BucketInfoResult getBucketInfo(const spi::Bucket&) const override;
 
     spi::Result put(const spi::Bucket&, spi::Timestamp,
-                    const document::Document::SP&, spi::Context&);
+                    const spi::DocumentSP&, spi::Context&) override;
 
     spi::RemoveResult remove(const spi::Bucket&, spi::Timestamp,
-                             const DocumentId&, spi::Context&);
+                             const DocumentId&, spi::Context&) override;
 
     spi::RemoveResult removeIfFound(const spi::Bucket&, spi::Timestamp,
-                                    const DocumentId&, spi::Context&);
+                                    const DocumentId&, spi::Context&) override;
 
     spi::UpdateResult update(const spi::Bucket&, spi::Timestamp,
-                             const document::DocumentUpdate::SP&, spi::Context&);
+                             const spi::DocumentUpdateSP&, spi::Context&) override;
 
     spi::GetResult get(const spi::Bucket&, const document::FieldSet&,
-                       const spi::DocumentId&, spi::Context&) const;
+                       const spi::DocumentId&, spi::Context&) const override;
 
-    spi::Result flush(const spi::Bucket&, spi::Context&);
+    spi::Result flush(const spi::Bucket&, spi::Context&) override;
 
     spi::CreateIteratorResult createIterator(const spi::Bucket&,
                                              const document::FieldSet&,
                                              const spi::Selection&,
                                              spi::IncludedVersions versions,
-                                             spi::Context&);
+                                             spi::Context&) override;
 
     spi::IterateResult iterate(spi::IteratorId,
-                               uint64_t maxByteSize, spi::Context&) const;
+                               uint64_t maxByteSize, spi::Context&) const override;
 
-    spi::Result destroyIterator(spi::IteratorId, spi::Context&);
+    spi::Result destroyIterator(spi::IteratorId, spi::Context&) override;
 
-    spi::Result deleteBucket(const spi::Bucket&, spi::Context&);
+    spi::Result deleteBucket(const spi::Bucket&, spi::Context&) override;
 
     spi::Result split(const spi::Bucket& source,
                       const spi::Bucket& target1,
                       const spi::Bucket& target2,
-                      spi::Context&);
+                      spi::Context&) override;
 
     spi::Result join(const spi::Bucket& source1,
                      const spi::Bucket& source2,
                      const spi::Bucket& target,
-                     spi::Context&);
+                     spi::Context&) override;
 
     spi::Result removeEntry(const spi::Bucket&,
-                            spi::Timestamp, spi::Context&);
+                            spi::Timestamp, spi::Context&) override;
 
     spi::Result maintain(const spi::Bucket&,
-                         spi::MaintenanceLevel level);
+                         spi::MaintenanceLevel level) override;
 
     Environment& getEnvironment() {
         return *_env;
diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.cpp
index 349663fb7c1..86cf7f50ba2 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.cpp
@@ -2,6 +2,7 @@
 
 #include <vespa/fastos/fastos.h>
 #include <vespa/memfilepersistence/spi/operationhandler.h>
+#include <vespa/document/select/parser.h>
 
 #include <vespa/log/log.h>
 
diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.h b/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.h
index fad723de4aa..708ab34922a 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.h
@@ -21,6 +21,12 @@
 #include <vespa/memfilepersistence/common/environment.h>
 #include <vespa/document/fieldset/fieldsetrepo.h>
 
+namespace document {
+    namespace select {
+        class Node;
+    }
+}
+
 namespace storage {
 namespace memfile {
 
diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/visitorslotmatcher.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/visitorslotmatcher.cpp
index 37779feb60f..d5b3927018c 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/spi/visitorslotmatcher.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/spi/visitorslotmatcher.cpp
@@ -2,6 +2,7 @@
 #include <vespa/fastos/fastos.h>
 #include <vespa/memfilepersistence/spi/visitorslotmatcher.h>
 #include <vespa/document/select/bodyfielddetector.h>
+#include <vespa/document/select/node.h>
 
 namespace storage {
 namespace memfile {
diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/visitorslotmatcher.h b/memfilepersistence/src/vespa/memfilepersistence/spi/visitorslotmatcher.h
index 9b1412da4b7..cc85716eecc 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/spi/visitorslotmatcher.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/spi/visitorslotmatcher.h
@@ -2,6 +2,11 @@
 #pragma once
 
 #include <vespa/memfilepersistence/common/slotmatcher.h>
+namespace document {
+    namespace select {
+        class Node;
+    }
+}
 
 namespace storage {
 namespace memfile {