Avoid pulling in all of slobrok and config everywhere.

12 files changed, 18 insertions, 12 deletions

diff --git a/storage/src/tests/common/metricstest.cpp b/storage/src/tests/common/metricstest.cpp
index d293df6bfc1..78d820c8802 100644
--- a/storage/src/tests/common/metricstest.cpp
+++ b/storage/src/tests/common/metricstest.cpp
@@ -18,6 +18,7 @@
 #include <tests/common/dummystoragelink.h>
 #include <iostream>
 #include <chrono>
+#include <thread>
 #include <vespa/metrics/metricmanager.h>
 
 LOG_SETUP(".test.metrics");
diff --git a/storage/src/tests/common/teststorageapp.cpp b/storage/src/tests/common/teststorageapp.cpp
index c6fb4de4fb0..b8ce7d3cab5 100644
--- a/storage/src/tests/common/teststorageapp.cpp
+++ b/storage/src/tests/common/teststorageapp.cpp
@@ -11,6 +11,7 @@
 #include <vespa/config-fleetcontroller.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/vespalib/io/fileutil.h>
+#include <vespa/config/config.h>
 #include <vespa/log/log.h>
 LOG_SETUP(".test.servicelayerapp");
 
diff --git a/storage/src/vespa/storage/bucketdb/bucketmanager.h b/storage/src/vespa/storage/bucketdb/bucketmanager.h
index cec059c0a8e..c9ae4be8069 100644
--- a/storage/src/vespa/storage/bucketdb/bucketmanager.h
+++ b/storage/src/vespa/storage/bucketdb/bucketmanager.h
@@ -26,6 +26,8 @@
 #include <vespa/storageframework/storageframework.h>
 #include <vespa/storageapi/message/bucket.h>
 #include <unordered_set>
+#include <vespa/config/subscription/configuri.h>
+
 
 namespace storage {
 
diff --git a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h
index da3f6b4e352..01445529865 100644
--- a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h
+++ b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.h
@@ -48,6 +48,7 @@
 #include <vespa/vespalib/stllike/hash_map.h>
 #include <vespa/vespalib/util/sync.h>
 #include <vespa/vdslib/state/nodestate.h>
+#include <vespa/config/subscription/configuri.h>
 
 namespace storage {
 
diff --git a/storage/src/vespa/storage/bucketmover/bucketmover.cpp b/storage/src/vespa/storage/bucketmover/bucketmover.cpp
index ab6346be167..da5bde76748 100644
--- a/storage/src/vespa/storage/bucketmover/bucketmover.cpp
+++ b/storage/src/vespa/storage/bucketmover/bucketmover.cpp
@@ -1,6 +1,5 @@
 // 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 <iomanip>
 #include <vespa/storage/bucketmover/bucketmover.h>
 #include <vespa/storage/bucketmover/htmltable.h>
diff --git a/storage/src/vespa/storage/bucketmover/bucketmover.h b/storage/src/vespa/storage/bucketmover/bucketmover.h
index da0d6e889b7..f2281b68848 100644
--- a/storage/src/vespa/storage/bucketmover/bucketmover.h
+++ b/storage/src/vespa/storage/bucketmover/bucketmover.h
@@ -24,6 +24,9 @@
 #include <vespa/storageframework/storageframework.h>
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/storage/common/servicelayercomponent.h>
+#include <vespa/config/helper/ifetchercallback.h>
+#include <vespa/config/subscription/configuri.h>
+#include <vespa/config/config.h>
 
 namespace storage {
 
diff --git a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
index f0f7429f1fd..10a3c0bcf75 100644
--- a/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
+++ b/storage/src/vespa/storage/frameworkimpl/status/statuswebserver.cpp
@@ -2,15 +2,12 @@
 
 #include "statuswebserver.h"
 
-#include <vespa/document/util/stringutil.h>
-#include <vespa/log/log.h>
-#include <map>
-#include <sstream>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/fastlib/net/url.h>
 #include <vespa/vespalib/util/host_name.h>
-#include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/util/exceptions.h>
+#include <vespa/vespalib/component/vtag.h>
+#include <vespa/log/log.h>
 
 LOG_SETUP(".status");
 
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h
index c79c58d0d73..78c23f083f0 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.h
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.h
@@ -25,6 +25,9 @@
 #include <vespa/storage/persistence/providershutdownwrapper.h>
 #include <vespa/storageframework/storageframework.h>
 #include <vespa/storage/common/nodestateupdater.h>
+#include <vespa/config/subscription/configuri.h>
+#include <vespa/config/helper/ifetchercallback.h>
+#include <vespa/config/config.h>
 
 namespace storage {
 namespace api {
diff --git a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h
index 7849d06b971..3b7838bb20c 100644
--- a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h
+++ b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.h
@@ -10,6 +10,7 @@
 #include <vespa/storage/persistence/types.h>
 #include <vespa/storageframework/storageframework.h>
 #include <vespa/vespalib/util/sync.h>
+#include <vespa/config/config.h>
 
 namespace storage {
 
diff --git a/storage/src/vespa/storage/persistence/persistenceutil.cpp b/storage/src/vespa/storage/persistence/persistenceutil.cpp
index 72e68d47182..0df12bdfb01 100644
--- a/storage/src/vespa/storage/persistence/persistenceutil.cpp
+++ b/storage/src/vespa/storage/persistence/persistenceutil.cpp
@@ -1,11 +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/storage/persistence/persistenceutil.h>
-#include <vespa/storage/persistence/filestorage/filestorhandler.h>
-#include <vespa/storage/storageutil/utils.h>
+#include "persistenceutil.h"
+#include <vespa/config/config.h>
 #include <vespa/log/log.h>
-#include <vespa/storage/bucketdb/storbucketdb.h>
 
 namespace storage {
 
diff --git a/storage/src/vespa/storage/storageserver/bucketintegritychecker.h b/storage/src/vespa/storage/storageserver/bucketintegritychecker.h
index bbea3fab2a8..47173bedcda 100644
--- a/storage/src/vespa/storage/storageserver/bucketintegritychecker.h
+++ b/storage/src/vespa/storage/storageserver/bucketintegritychecker.h
@@ -15,7 +15,7 @@
 #include <vespa/storage/config/config-stor-integritychecker.h>
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/storageframework/storageframework.h>
-#include <vespa/storageframework/storageframework.h>
+#include <vespa/config/config.h>
 
 namespace storage {
 
diff --git a/storage/src/vespa/storage/visiting/visitormanager.h b/storage/src/vespa/storage/visiting/visitormanager.h
index 556a49e6227..aa9ecf37647 100644
--- a/storage/src/vespa/storage/visiting/visitormanager.h
+++ b/storage/src/vespa/storage/visiting/visitormanager.h
@@ -31,6 +31,7 @@
 #include <vespa/storage/visiting/visitorthread.h>
 #include <vespa/storageframework/storageframework.h>
 #include <vespa/storageframework/storageframework.h>
+#include <vespa/config/config.h>
 
 namespace storage {
 namespace api {