Avoid building all the document code in every file.

7 files changed, 18 insertions, 22 deletions

diff --git a/storage/src/tests/persistence/persistencetestutils.cpp b/storage/src/tests/persistence/persistencetestutils.cpp
index 47ec23147f1..1d5824ed62c 100644
--- a/storage/src/tests/persistence/persistencetestutils.cpp
+++ b/storage/src/tests/persistence/persistencetestutils.cpp
@@ -1,10 +1,10 @@
 // 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/document/datatype/documenttype.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <tests/persistence/persistencetestutils.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
+#include <vespa/document/update/assignvalueupdate.h>
 
 using document::DocumentType;
 using storage::framework::defaultimplementation::AllocationLogic;
diff --git a/storage/src/tests/persistence/testandsettest.cpp b/storage/src/tests/persistence/testandsettest.cpp
index 984e06dc6e3..efc549619f2 100644
--- a/storage/src/tests/persistence/testandsettest.cpp
+++ b/storage/src/tests/persistence/testandsettest.cpp
@@ -1,11 +1,11 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // @author Vegard Sjonfjell
-#include <vespa/fastos/fastos.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storage/persistence/persistencethread.h>
 #include <tests/persistence/persistencetestutils.h>
 #include <vespa/documentapi/messagebus/messages/testandsetcondition.h>
 #include <vespa/document/fieldvalue/fieldvalues.h>
+#include <vespa/document/update/assignvalueupdate.h>
 #include <functional>
 
 using std::unique_ptr;
diff --git a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp
index 656ad446da7..9997cc029d9 100644
--- a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp
@@ -1,16 +1,16 @@
 // 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/storage/distributor/operations/external/twophaseupdateoperation.h>
+
+#include "twophaseupdateoperation.h"
+#include "getoperation.h"
+#include "putoperation.h"
+#include "updateoperation.h"
 #include <vespa/document/fieldvalue/document.h>
-#include <vespa/storageapi/message/bucket.h>
+#include <vespa/document/select/parser.h>
 #include <vespa/storageapi/message/persistence.h>
-#include <vespa/log/log.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
-#include <vespa/storage/distributor/operations/external/getoperation.h>
-#include <vespa/storage/distributor/operations/external/putoperation.h>
-#include <vespa/storage/distributor/operations/external/updateoperation.h>
 #include <vespa/storageapi/message/batch.h>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".distributor.callback.twophaseupdate");
 
 using namespace std::literals::string_literals;
diff --git a/storage/src/vespa/storage/persistence/testandsethelper.cpp b/storage/src/vespa/storage/persistence/testandsethelper.cpp
index 9b3f0b9855b..56ce67a17b8 100644
--- a/storage/src/vespa/storage/persistence/testandsethelper.cpp
+++ b/storage/src/vespa/storage/persistence/testandsethelper.cpp
@@ -3,6 +3,7 @@
 
 #include <vespa/storage/persistence/fieldvisitor.h>
 #include <vespa/storage/persistence/testandsethelper.h>
+#include <vespa/document/select/parser.h>
 
 using namespace std::string_literals;
 
diff --git a/storage/src/vespa/storage/visiting/dumpvisitor.cpp b/storage/src/vespa/storage/visiting/dumpvisitor.cpp
index 8d94de010ae..051022521e8 100644
--- a/storage/src/vespa/storage/visiting/dumpvisitor.cpp
+++ b/storage/src/vespa/storage/visiting/dumpvisitor.cpp
@@ -1,13 +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 <vespa/storage/visiting/dumpvisitor.h>
+#include "dumpvisitor.h"
 #include <vespa/documentapi/messagebus/messages/multioperationmessage.h>
-#include <vespa/document/fieldvalue/document.h>
-#include <vespa/log/log.h>
+#include <vespa/document/update/documentupdate.h>
 #include <vespa/vdslib/container/mutabledocumentlist.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
-
+#include <vespa/log/log.h>
 LOG_SETUP(".visitor.instance.dumpvisitor");
 
 namespace storage {
diff --git a/storage/src/vespa/storage/visiting/dumpvisitorsingle.cpp b/storage/src/vespa/storage/visiting/dumpvisitorsingle.cpp
index d323dcf20d5..a7712ee189f 100644
--- a/storage/src/vespa/storage/visiting/dumpvisitorsingle.cpp
+++ b/storage/src/vespa/storage/visiting/dumpvisitorsingle.cpp
@@ -1,9 +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/storage/visiting/dumpvisitorsingle.h>
+#include "dumpvisitorsingle.h"
 #include <vespa/documentapi/messagebus/messages/multioperationmessage.h>
-#include <vespa/document/fieldvalue/document.h>
+#include <vespa/document/update/documentupdate.h>
 #include <vespa/log/log.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
 #include <vespa/documentapi/messagebus/messages/putdocumentmessage.h>
diff --git a/storage/src/vespa/storage/visiting/visitor.cpp b/storage/src/vespa/storage/visiting/visitor.cpp
index 7270752e7a9..7214ed005e9 100644
--- a/storage/src/vespa/storage/visiting/visitor.cpp
+++ b/storage/src/vespa/storage/visiting/visitor.cpp
@@ -1,17 +1,15 @@
 // 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/storage/visiting/visitor.h>
-
+#include "visitor.h"
+#include "visitormetrics.h"
 #include <vespa/log/log.h>
 #include <vespa/storageapi/message/datagram.h>
 #include <vespa/storageapi/message/visitor.h>
 #include <vespa/storage/persistence/messages.h>
-#include <vespa/storage/visiting/visitormetrics.h>
 #include <vespa/storageframework/storageframework.h>
 #include <vespa/documentapi/messagebus/messages/documentmessage.h>
 #include <vespa/documentapi/messagebus/messages/visitor.h>
-#include <ostream>
+#include <vespa/document/select/node.h>
 #include <sstream>
 #include <unordered_map>
 #include <cmath>