Include asciistream in implementation only.

4 files changed, 29 insertions, 20 deletions

diff --git a/config/src/vespa/config/subscription/configinstancespec.h b/config/src/vespa/config/subscription/configinstancespec.h
new file mode 100644
index 00000000000..0ba861eb90c
--- /dev/null
+++ b/config/src/vespa/config/subscription/configinstancespec.h
@@ -0,0 +1,24 @@
+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+#pragma once
+
+#include "sourcespec.h"
+#include <vespa/vespalib/stllike/asciistream.h>
+
+namespace config {
+
+/**
+ * A ConfigInstanceSpec serves a config from a config instance that does not change.
+ */
+class ConfigInstanceSpec : public SourceSpec
+{
+public:
+    ConfigInstanceSpec(const ConfigInstance & instance);
+    SourceFactory::UP createSourceFactory(const TimingValues & timingValues) const;
+private:
+    const ConfigKey _key;
+    vespalib::asciistream _buffer;
+};
+
+}
+
diff --git a/config/src/vespa/config/subscription/configuri.cpp b/config/src/vespa/config/subscription/configuri.cpp
index 3604c5902ba..0e63920bd63 100644
--- a/config/src/vespa/config/subscription/configuri.cpp
+++ b/config/src/vespa/config/subscription/configuri.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 "configuri.h"
+#include "configinstancespec.h"
 #include <vespa/config/helper/legacy.h>
-#include <vespa/config/subscription/sourcespec.h>
 
 namespace {
 bool checkEmpty(const vespalib::string & configId) {
diff --git a/config/src/vespa/config/subscription/sourcespec.cpp b/config/src/vespa/config/subscription/sourcespec.cpp
index 0b5951ddec7..2b4c71b8c21 100644
--- a/config/src/vespa/config/subscription/sourcespec.cpp
+++ b/config/src/vespa/config/subscription/sourcespec.cpp
@@ -1,8 +1,6 @@
 // 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/log/log.h>
-LOG_SETUP(".config.subscription.sourcespec");
 #include "sourcespec.h"
+#include "configinstancespec.h"
 #include <vespa/config/common/exceptions.h>
 #include <vespa/config/raw/rawsourcefactory.h>
 #include <vespa/config/file/filesourcefactory.h>
@@ -14,7 +12,9 @@ LOG_SETUP(".config.subscription.sourcespec");
 #include <vespa/config/set/configinstancesourcefactory.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
 #include <vespa/config/print/asciiconfigwriter.h>
-#include <vespa/vespalib/stllike/asciistream.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP(".config.subscription.sourcespec");
 
 namespace config {
 
diff --git a/config/src/vespa/config/subscription/sourcespec.h b/config/src/vespa/config/subscription/sourcespec.h
index 2378ee0bb06..c6cc8ed38c5 100644
--- a/config/src/vespa/config/subscription/sourcespec.h
+++ b/config/src/vespa/config/subscription/sourcespec.h
@@ -9,8 +9,6 @@
 #include <vespa/config/common/compressiontype.h>
 #include <vespa/config/set/configsetsourcefactory.h>
 #include <vespa/config/configgen/configinstance.h>
-#include <vespa/vespalib/stllike/asciistream.h>
-#include <map>
 
 namespace config {
 
@@ -234,18 +232,5 @@ private:
     BuilderMapSP _builderMap;
 };
 
-/**
- * A ConfigInstanceSpec serves a config from a config instance that does not change.
- */
-class ConfigInstanceSpec : public SourceSpec
-{
-public:
-    ConfigInstanceSpec(const ConfigInstance & instance);
-    SourceFactory::UP createSourceFactory(const TimingValues & timingValues) const;
-private:
-    const ConfigKey _key;
-    vespalib::asciistream _buffer;
-};
-
 }