Include asciistream in implementation only.

7 files changed, 17 insertions, 24 deletions

diff --git a/vdslib/src/vespa/vdslib/distribution/group.cpp b/vdslib/src/vespa/vdslib/distribution/group.cpp
index 695b68bf7f9..7a988d58121 100644
--- a/vdslib/src/vespa/vdslib/distribution/group.cpp
+++ b/vdslib/src/vespa/vdslib/distribution/group.cpp
@@ -4,8 +4,7 @@
 
 #include <vespa/vdslib/state/random.h>
 #include <vespa/vespalib/util/exceptions.h>
-#include <algorithm>
-#include <vespa/util/stllike/asciistream.h>
+#include <vespa/vespalib/stllike/asciistream.h>
 
 namespace storage {
 namespace lib {
@@ -200,7 +199,7 @@ Group::getDistributionConfigHash() const {
     vespalib::asciistream ost;
     getConfigHash(ost);
     return ost.str();
- 
+}
 
-} // lib
-} // storage
+}
+}
\ No newline at end of file
diff --git a/vdslib/src/vespa/vdslib/distribution/group.h b/vdslib/src/vespa/vdslib/distribution/group.h
index a18e4e9a5d7..38249999352 100644
--- a/vdslib/src/vespa/vdslib/distribution/group.h
+++ b/vdslib/src/vespa/vdslib/distribution/group.h
@@ -104,12 +104,7 @@ public:
      * that is critical for distribution. Use to match up two different group
      * instances in order to verify if they would generate the same distribution
      */
-    vespalib::string getDistributionConfigHash() const {
-        vespalib::asciistream ost;
-        getConfigHash(ost);
-        return ost.str();
-    }
-
+    vespalib::string getDistributionConfigHash() const;
 };
 
 } // lib
diff --git a/vdslib/src/vespa/vdslib/state/clusterstate.cpp b/vdslib/src/vespa/vdslib/state/clusterstate.cpp
index 97ce96fc5e3..7ca91788200 100644
--- a/vdslib/src/vespa/vdslib/state/clusterstate.cpp
+++ b/vdslib/src/vespa/vdslib/state/clusterstate.cpp
@@ -1,11 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/vdslib/state/clusterstate.h>
+#include "clusterstate.h"
 
 #include <vespa/vespalib/text/stringtokenizer.h>
 #include <vespa/document/util/stringutil.h>
 #include <sstream>
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/vespalib/util/exceptions.h>
+#include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/log/log.h>
 
 LOG_SETUP(".vdslib.state.cluster");
diff --git a/vdslib/src/vespa/vdslib/state/diskstate.cpp b/vdslib/src/vespa/vdslib/state/diskstate.cpp
index 2ce6db9e563..1e3ce20b52a 100644
--- a/vdslib/src/vespa/vdslib/state/diskstate.cpp
+++ b/vdslib/src/vespa/vdslib/state/diskstate.cpp
@@ -1,13 +1,12 @@
 // 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/state/diskstate.h>
-
+#include "diskstate.h"
 #include <boost/lexical_cast.hpp>
 #include <vespa/vespalib/text/stringtokenizer.h>
 #include <vespa/document/util/stringutil.h>
-#include <vespa/log/log.h>
 #include <vespa/vespalib/util/exceptions.h>
+#include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/log/log.h>
 
 LOG_SETUP(".vdslib.diskstate");
 
diff --git a/vdslib/src/vespa/vdslib/state/node.cpp b/vdslib/src/vespa/vdslib/state/node.cpp
index bcaf3f5231e..e6942aa33e6 100644
--- a/vdslib/src/vespa/vdslib/state/node.cpp
+++ b/vdslib/src/vespa/vdslib/state/node.cpp
@@ -1,7 +1,7 @@
 // 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/state/node.h>
+#include "node.h"
+#include <vespa/vespalib/stllike/asciistream.h>
 
 namespace storage {
 namespace lib {
diff --git a/vdslib/src/vespa/vdslib/state/nodestate.cpp b/vdslib/src/vespa/vdslib/state/nodestate.cpp
index 812da98a710..53be2a8da1d 100644
--- a/vdslib/src/vespa/vdslib/state/nodestate.cpp
+++ b/vdslib/src/vespa/vdslib/state/nodestate.cpp
@@ -1,16 +1,16 @@
 // 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/state/nodestate.h>
+#include "nodestate.h"
 
 #include <boost/lexical_cast.hpp>
 #include <vespa/vespalib/text/stringtokenizer.h>
 #include <vespa/document/util/stringutil.h>
-#include <vespa/log/log.h>
 #include <vespa/vespalib/util/exceptions.h>
+#include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vdslib/state/random.h>
 #include <sstream>
 #include <cmath>
+#include <vespa/log/log.h>
 
 LOG_SETUP(".vdslib.nodestate");
 
diff --git a/vdslib/src/vespa/vdslib/state/nodetype.cpp b/vdslib/src/vespa/vdslib/state/nodetype.cpp
index 4a09fea8213..00bb968c989 100644
--- a/vdslib/src/vespa/vdslib/state/nodetype.cpp
+++ b/vdslib/src/vespa/vdslib/state/nodetype.cpp
@@ -1,9 +1,8 @@
 // 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/state/nodetype.h>
-
+#include "nodetype.h"
 #include <vespa/vespalib/util/exceptions.h>
+#include <vespa/vespalib/stllike/asciistream.h>
 
 namespace storage {
 namespace lib {