Break the document include chain at the attribute vector.

3 files changed, 7 insertions, 2 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/common/cachedselect.h b/searchcore/src/vespa/searchcore/proton/common/cachedselect.h
index 780d0e31f68..37534038a04 100644
--- a/searchcore/src/vespa/searchcore/proton/common/cachedselect.h
+++ b/searchcore/src/vespa/searchcore/proton/common/cachedselect.h
@@ -7,8 +7,11 @@
 #include <vespa/searchlib/attribute/iattributemanager.h>
 #include <vespa/document/select/resultset.h>
 
-namespace proton
-{
+namespace document {
+    class DocumentTypeRepo;
+}
+
+namespace proton {
 
 class AttributeManager;
 
diff --git a/searchcore/src/vespa/searchcore/proton/matching/requestcontext.cpp b/searchcore/src/vespa/searchcore/proton/matching/requestcontext.cpp
index e2ad9d94aa1..e3d1e2df14e 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/requestcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/requestcontext.cpp
@@ -1,5 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "requestcontext.h"
+#include <vespa/searchlib/attribute/attributevector.h>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentretriever.cpp b/searchcore/src/vespa/searchcore/proton/server/documentretriever.cpp
index 2039d2c6ad6..f511750a32e 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentretriever.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentretriever.cpp
@@ -22,6 +22,7 @@ using document::DocumentType;
 using document::DocumentTypeRepo;
 using document::PositionDataType;
 using document::StructFieldValue;
+using document::FieldValue;
 using search::AttributeGuard;
 using search::DocumentIdT;
 using search::IAttributeManager;