Forward declare XmlOutputStream and FieldValue::IteratorHandler.

2 files changed, 3 insertions, 5 deletions

diff --git a/searchlib/src/tests/aggregator/perdocexpr.cpp b/searchlib/src/tests/aggregator/perdocexpr.cpp
index 6f374f1bea4..512252fd732 100644
--- a/searchlib/src/tests/aggregator/perdocexpr.cpp
+++ b/searchlib/src/tests/aggregator/perdocexpr.cpp
@@ -5,14 +5,13 @@
 #include <vespa/searchlib/attribute/extendableattributes.h>
 #include <vespa/vespalib/objects/objectdumper.h>
 #include <vespa/vespalib/testkit/testapp.h>
-#include <stdexcept>
 #include <vespa/document/base/testdocman.h>
 #include <vespa/vespalib/util/md5.h>
-#include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/searchlib/expression/getdocidnamespacespecificfunctionnode.h>
 #include <vespa/searchlib/expression/documentfieldnode.h>
 #include <cmath>
 #include <iostream>
+#include <list>
 
 #define MU std::make_unique
 
diff --git a/searchlib/src/vespa/searchlib/expression/documentfieldnode.h b/searchlib/src/vespa/searchlib/expression/documentfieldnode.h
index a6c027beb22..2a202fe562e 100644
--- a/searchlib/src/vespa/searchlib/expression/documentfieldnode.h
+++ b/searchlib/src/vespa/searchlib/expression/documentfieldnode.h
@@ -4,6 +4,7 @@
 #include "documentaccessornode.h"
 #include "resultnode.h"
 #include "resultvector.h"
+#include <vespa/document/fieldvalue/iteratorhandler.h>
 
 namespace search {
 namespace expression {
@@ -38,11 +39,9 @@ public:
     DocumentFieldNode & operator = (const DocumentFieldNode & rhs);
     const vespalib::string & getFieldName() const override { return _fieldName; }
 private:
-    class Handler : public document::FieldValue::IteratorHandler {
+    class Handler : public document::fieldvalue::IteratorHandler {
     public:
         virtual void reset() = 0;
-    protected:
-        typedef document::FieldValue::IteratorHandler::Content Content;
     private:
         void onCollectionStart(const Content & c) override;
         void onStructStart(const Content & c) override;