Avoid requiring identifiable for FieldValue

2 files changed, 4 insertions, 5 deletions

diff --git a/vdslib/src/vespa/vdslib/container/parameters.cpp b/vdslib/src/vespa/vdslib/container/parameters.cpp
index 85ba6318f7c..60527a00547 100644
--- a/vdslib/src/vespa/vdslib/container/parameters.cpp
+++ b/vdslib/src/vespa/vdslib/container/parameters.cpp
@@ -2,7 +2,6 @@
 
 #include "parameters.hpp"
 #include <vespa/document/util/bytebuffer.h>
-#include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/vespalib/objects/hexdump.h>
 #include <vespa/vespalib/stllike/hash_map.hpp>
 #include <vespa/vespalib/util/xmlstream.h>
@@ -60,7 +59,7 @@ void Parameters::deserialize(document::ByteBuffer& buffer)
 }
 
 void
-Parameters::printXml(document::XmlOutputStream& xos) const
+Parameters::printXml(vespalib::xml::XmlOutputStream& xos) const
 {
     using namespace vespalib::xml;
     xos << XmlTag("parameters");
diff --git a/vdslib/src/vespa/vdslib/container/parameters.h b/vdslib/src/vespa/vdslib/container/parameters.h
index 34568cc85cb..41c95d14da4 100644
--- a/vdslib/src/vespa/vdslib/container/parameters.h
+++ b/vdslib/src/vespa/vdslib/container/parameters.h
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <vespa/document/util/xmlserializable.h>
+#include <vespa/vespalib/util/xmlserializable.h>
 #include <vespa/vespalib/stllike/hash_map.h>
 
 namespace vespalib { class GrowableByteBuffer; }
@@ -22,7 +22,7 @@ namespace document { class ByteBuffer; }
 
 namespace vdslib {
 
-class Parameters : public document::XmlSerializable {
+class Parameters : public vespalib::xml::XmlSerializable {
 public:
     typedef vespalib::stringref KeyT;
     class Value : public vespalib::string
@@ -39,7 +39,7 @@ public:
 private:
     ParametersMap _parameters;
 
-    void printXml(document::XmlOutputStream& xos) const override;
+    void printXml(vespalib::xml::XmlOutputStream& xos) const override;
 
 public:
     Parameters();