Do not include asciistream everywhere.

3 files changed, 20 insertions, 5 deletions

diff --git a/vdslib/src/vespa/vdslib/distribution/group.cpp b/vdslib/src/vespa/vdslib/distribution/group.cpp
index 0ffe937a949..695b68bf7f9 100644
--- a/vdslib/src/vespa/vdslib/distribution/group.cpp
+++ b/vdslib/src/vespa/vdslib/distribution/group.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.
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/vdslib/distribution/group.h>
+#include "group.h"
 
 #include <vespa/vdslib/state/random.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <algorithm>
+#include <vespa/util/stllike/asciistream.h>
 
 namespace storage {
 namespace lib {
@@ -195,5 +195,12 @@ Group::getConfigHash(vespalib::asciistream& out) const
     out << ')';
 }
 
+vespalib::string
+Group::getDistributionConfigHash() const {
+    vespalib::asciistream ost;
+    getConfigHash(ost);
+    return ost.str();
+ 
+
 } // lib
 } // storage
diff --git a/vdslib/src/vespa/vdslib/distribution/group.h b/vdslib/src/vespa/vdslib/distribution/group.h
index d4952941dbd..a18e4e9a5d7 100644
--- a/vdslib/src/vespa/vdslib/distribution/group.h
+++ b/vdslib/src/vespa/vdslib/distribution/group.h
@@ -17,7 +17,12 @@
 #include <vespa/config-stor-distribution.h>
 #include <vespa/vdslib/distribution/redundancygroupdistribution.h>
 #include <vespa/vespalib/util/crc.h>
-#include <vespa/vespalib/stllike/asciistream.h>
+
+namespace vespalib {
+
+class asciistream;
+
+}
 
 namespace storage {
 namespace lib {
diff --git a/vdslib/src/vespa/vdslib/state/nodetype.h b/vdslib/src/vespa/vdslib/state/nodetype.h
index 8bb96f47743..c594dc57aec 100644
--- a/vdslib/src/vespa/vdslib/state/nodetype.h
+++ b/vdslib/src/vespa/vdslib/state/nodetype.h
@@ -9,9 +9,12 @@
  */
 #pragma once
 
-#include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/vespalib/stllike/string.h>
 #include <stdint.h>
-#include <ostream>
+
+namespace vespalib {
+    class asciistream;
+}
 
 namespace storage {
 namespace lib {