Break some more large include dependencies.

18 files changed, 58 insertions, 39 deletions

diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
index 9412439f086..d6504c90c46 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
@@ -6,8 +6,9 @@
 #include <vespa/searchlib/attribute/integerbase.h>
 #include <vespa/searchlib/attribute/floatbase.h>
 #include <vespa/searchlib/tensor/tensor_attribute.h>
-#include <vespa/searchsummary/docsummary/docsumwriter.h>
-#include <vespa/searchsummary/docsummary/attributedfw.h>
+#include "docsumwriter.h"
+#include "attributedfw.h"
+#include "docsumstate.h"
 #include <vespa/vespalib/tensor/tensor.h>
 #include <vespa/vespalib/tensor/serialization/slime_binary_format.h>
 
@@ -57,6 +58,11 @@ AttrDFW::AttrDFW(const vespalib::string & attrName) :
 {
 }
 
+const attribute::IAttributeVector &
+AttrDFW::vec(const GetDocsumsState & s) const {
+    return *s.getAttribute(getIndex());
+}
+
 //-----------------------------------------------------------------------------
 
 class SingleAttrDFW : public AttrDFW
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h
index b8ac9b30510..77f524740b5 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <vespa/searchlib/attribute/iattributemanager.h>
-#include <vespa/searchsummary/docsummary/docsumfieldwriter.h>
+#include "docsumfieldwriter.h"
 
 namespace search {
 namespace docsummary {
@@ -13,9 +13,7 @@ class AttrDFW : public IDocsumFieldWriter
 private:
     vespalib::string _attrName;
 protected:
-    const attribute::IAttributeVector & vec(const GetDocsumsState & s) const {
-        return *s.getAttribute(getIndex());
-    }
+    const attribute::IAttributeVector & vec(const GetDocsumsState & s) const;
     virtual const vespalib::string & getAttributeName() const { return _attrName; }
 public:
     AttrDFW(const vespalib::string & attrName);
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp
index 43fc72f3aad..be188e9a871 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.cpp
@@ -7,9 +7,10 @@
 #include <vespa/searchlib/attribute/iattributemanager.h>
 #include <vespa/searchlib/common/documentlocations.h>
 #include <vespa/searchlib/common/location.h>
-#include <vespa/searchsummary/docsummary/docsumfieldwriter.h>
-#include <vespa/searchsummary/docsummary/idocsumenvironment.h>
-#include <vespa/searchsummary/docsummary/docsumformat.h>
+#include "docsumfieldwriter.h"
+#include "idocsumenvironment.h"
+#include "docsumformat.h"
+#include "docsumstate.h"
 #include <vespa/searchlib/parsequery/stackdumpiterator.h>
 
 LOG_SETUP(".searchlib.docsummary.docsumfieldwriter");
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h
index 4986697c5bd..babda75cff1 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumfieldwriter.h
@@ -7,13 +7,13 @@
 #include <vespa/searchlib/util/rawbuf.h>
 #include <vespa/searchlib/attribute/iattributemanager.h>
 #include <vespa/searchsummary/docsummary/urlresult.h>
-#include <vespa/searchsummary/docsummary/docsumstate.h>
 #include <vespa/searchsummary/docsummary/resultconfig.h>
 #include <vespa/vespalib/data/slime/inserter.h>
 
 namespace search {
 namespace docsummary {
 
+class GetDocsumsState;
 
 using search::IAttributeManager;
 
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp
index f8139dcb2a9..f4e457f5681 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.cpp
@@ -3,7 +3,9 @@
 // Copyright (C) 2003 Overture Services Norway AS
 
 #include <vespa/fastos/fastos.h>
-#include <vespa/searchsummary/docsummary/docsumstate.h>
+#include "docsumstate.h"
+#include <vespa/juniper/rpinterface.h>
+#include <vespa/searchcommon/attribute/iattributecontext.h>
 
 namespace search {
 namespace docsummary {
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h
index 391ed14bba2..a5073049287 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumstate.h
@@ -4,22 +4,28 @@
 
 #pragma once
 
-#include <vespa/juniper/rpinterface.h>
-
 #include <vespa/searchlib/util/rawbuf.h>
-#include <vespa/searchlib/attribute/attributeguard.h>
 #include <vespa/searchsummary/docsummary/getdocsumargs.h>
-#include <vespa/searchsummary/docsummary/idocsumenvironment.h>
-#include <vespa/searchsummary/docsummary/keywordextractor.h>
 #include <vespa/searchlib/common/featureset.h>
-#include <vespa/searchlib/common/location.h>
 #include <vespa/vespalib/util/jsonwriter.h>
 
+namespace juniper {
+    class Config;
+    class QueryHandle;
+    class Result;
+}
 
 namespace search {
+namespace common { class Location; }
+namespace attribute {
+    class IAttributeContext;
+    class IAttributeVector;
+}
 namespace docsummary {
 
 class GetDocsumsState;
+class IDocsumEnvironment;
+class KeywordExtractor;
 
 class GetDocsumsStateCallback
 {
@@ -40,8 +46,6 @@ protected:
 class GetDocsumsState
 {
 private:
-    GetDocsumsState(const GetDocsumsState &);
-    GetDocsumsState& operator=(const GetDocsumsState &);
 
 public:
     const search::attribute::IAttributeVector * getAttribute(size_t index) const { return _attributes[index]; }
@@ -67,9 +71,9 @@ public:
 
     search::RawBuf               _docSumFieldSpace;
     char                         _docSumFieldSpaceStore[2048];
-    search::attribute::IAttributeContext::UP _attrCtx;
+    std::unique_ptr<search::attribute::IAttributeContext> _attrCtx;
     std::vector<const search::attribute::IAttributeVector *> _attributes;
-    vespalib::JSONStringer           _jsonStringer;
+    vespalib::JSONStringer        _jsonStringer;
 
     // used by AbsDistanceDFW
     std::unique_ptr<search::common::Location> _parsedLocation;
@@ -81,6 +85,8 @@ public:
     // used by RankFeaturesDFW
     FeatureSet::SP _rankFeatures;
 
+    GetDocsumsState(const GetDocsumsState &) = delete;
+    GetDocsumsState& operator=(const GetDocsumsState &) = delete;
     GetDocsumsState(GetDocsumsStateCallback &callback);
     ~GetDocsumsState();
 };
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
index 565ea78a0d9..08f2e69a6b5 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
@@ -5,11 +5,12 @@
 #include <vespa/fastos/fastos.h>
 #include <vespa/log/log.h>
 #include <vespa/fastlib/text/normwordfolder.h>
-#include <vespa/searchsummary/docsummary/docsumwriter.h>
-#include <vespa/searchsummary/docsummary/docsumfieldwriter.h>
-#include <vespa/searchsummary/docsummary/docsumstore.h>
-#include <vespa/searchsummary/docsummary/keywordextractor.h>
-#include <vespa/searchsummary/docsummary/docsumformat.h>
+#include "docsumwriter.h"
+#include "docsumfieldwriter.h"
+#include "docsumstore.h"
+#include "keywordextractor.h"
+#include "docsumformat.h"
+#include "docsumstate.h"
 #include <vespa/searchlib/common/transport.h>
 #include <vespa/vespalib/data/slime/slime.h>
 #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h>
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h
index 0dd7204ba16..36f90048cb7 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.h
@@ -8,7 +8,6 @@
 #include <vespa/searchlib/attribute/iattributemanager.h>
 #include <vespa/searchsummary/docsummary/urlresult.h>
 #include <vespa/searchsummary/docsummary/resultconfig.h>
-#include <vespa/searchsummary/docsummary/docsumstate.h>
 #include <vespa/searchsummary/docsummary/docsumstore.h>
 #include <vespa/searchsummary/docsummary/keywordextractor.h>
 #include <vespa/searchsummary/docsummary/docsumfieldwriter.h>
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h
index 4b4a9e29f02..fca57800dfa 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/getdocsumargs.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include <vespa/searchlib/fef/properties.h>
-#include <vespa/searchlib/common/packets.h>
 #include <vespa/searchlib/engine/docsumrequest.h>
 #include <vespa/searchlib/engine/propertiesmap.h>
 
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/idocsumenvironment.h b/searchsummary/src/vespa/searchsummary/docsummary/idocsumenvironment.h
index 546acd24f3f..45c13d606c4 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/idocsumenvironment.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/idocsumenvironment.h
@@ -3,8 +3,8 @@
 #pragma once
 
 #include <vespa/searchlib/attribute/iattributemanager.h>
-#include <vespa/juniper/rpinterface.h>
 
+namespace juniper { class Juniper; }
 namespace search {
 namespace docsummary {
 
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h
index 0717ba9ed6b..44431a146bb 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/juniperdfw.h
@@ -4,10 +4,10 @@
 
 #include <vespa/searchlib/util/rawbuf.h>
 #include <vespa/searchsummary/docsummary/urlresult.h>
-#include <vespa/searchsummary/docsummary/docsumstate.h>
 #include <vespa/searchsummary/docsummary/resultconfig.h>
 #include <vespa/vespalib/data/slime/inserter.h>
 #include "docsumfieldwriter.h"
+#include <vespa/juniper/rpinterface.h>
 
 namespace search {
 namespace docsummary {
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp
index 51025ab1034..9d2c57b31d5 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.cpp
@@ -6,8 +6,8 @@
 #include <vespa/log/log.h>
 #include <vespa/searchlib/parsequery/stackdumpiterator.h>
 #include <vespa/searchlib/util/rawbuf.h>
-#include <vespa/searchsummary/docsummary/docsumstate.h>
-#include <vespa/searchsummary/docsummary/keywordextractor.h>
+#include "docsumstate.h"
+#include "keywordextractor.h"
 
 
 LOG_SETUP(".searchlib.docsummary.keywordextractor");
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h
index 35c9d387317..8297bc89ae8 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/keywordextractor.h
@@ -6,11 +6,12 @@
 
 #include <vespa/vespalib/stllike/hash_set.h>
 #include <vespa/searchlib/util/rawbuf.h>
-#include <vespa/searchsummary/docsummary/idocsumenvironment.h>
 
 namespace search {
 namespace docsummary {
 
+class IDocsumEnvironment;
+
 class KeywordExtractor
 {
 private:
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp
index f4d0889c711..5c45bffe55e 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/positionsdfw.cpp
@@ -4,6 +4,7 @@
 #include "positionsdfw.h"
 #include <vespa/log/log.h>
 #include <cmath>
+#include "docsumstate.h"
 
 LOG_SETUP(".searchlib.docsummary.positionsdfw");
 
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
index 8f5055f6d1d..0d397c97a63 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
@@ -4,9 +4,10 @@
 #include <vespa/log/log.h>
 #include <vespa/searchlib/common/featureset.h>
 #include <vespa/searchlib/common/packets.h>
-#include <vespa/searchsummary/docsummary/rankfeaturesdfw.h>
+#include "rankfeaturesdfw.h"
 #include <vespa/searchlib/common/feature.h>
 #include "docsumformat.h"
+#include "docsumstate.h"
 
 LOG_SETUP(".searchlib.docsummary.rankfeaturesdfw");
 
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
index 7fc85b4cf5d..e2e03131e91 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.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>
-LOG_SETUP(".searchlib.docsummary.summaryfeaturesdfw");
 #include <vespa/searchlib/common/featureset.h>
 #include <vespa/searchlib/common/packets.h>
-#include <vespa/searchsummary/docsummary/docsumformat.h>
+#include "docsumformat.h"
 #include "summaryfeaturesdfw.h"
+#include "docsumstate.h"
 #include <cmath>
+#include <vespa/log/log.h>
+LOG_SETUP(".searchlib.docsummary.summaryfeaturesdfw");
 
 namespace search {
 namespace docsummary {
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h
index c9a6c5d9d9a..20e2624c7b7 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h
+++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.h
@@ -10,6 +10,8 @@
 namespace search {
 namespace docsummary {
 
+class IDocsumEnvironment;
+
 class FeaturesDFW : public IDocsumFieldWriter
 {
 protected:
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp
index dfb7b863133..0be38f632db 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/textextractordfw.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 <vespa/log/log.h>
-LOG_SETUP(".searchlib.docsummary.textextractordfw");
 #include "tokenizer.h"
 #include "textextractordfw.h"
+#include "docsumstate.h"
+#include <vespa/log/log.h>
+LOG_SETUP(".searchlib.docsummary.textextractordfw");
 
 namespace search {
 namespace docsummary {