Avoid pulling all of config everywhere.

9 files changed, 15 insertions, 20 deletions

diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
index 9804926e809..0e3153a6ded 100644
--- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/fileconfigmanager_test.cpp
@@ -13,6 +13,7 @@
 #include <vespa/config-attributes.h>
 #include <vespa/config-indexschema.h>
 #include <vespa/searchsummary/config/config-juniperrc.h>
+#include <vespa/config/helper/configgetter.hpp>
 
 
 using namespace config;
diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp
index f6baffb304d..aded935080d 100644
--- a/storage/src/tests/bucketdb/bucketmanagertest.cpp
+++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp
@@ -1,7 +1,4 @@
 // 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(".test.bucketdb.bucketmanager");
 
 #include <vespa/config/helper/configgetter.h>
 #include <cppunit/extensions/HelperMacros.h>
@@ -10,25 +7,21 @@ LOG_SETUP(".test.bucketdb.bucketmanager");
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/storage/bucketdb/bucketmanager.h>
-#include <vespa/storage/common/bucketmessages.h>
-#include <vespa/storageframework/defaultimplementation/clock/realclock.h>
 #include <vespa/storage/persistence/filestorage/filestormanager.h>
-#include <vespa/storageapi/message/bucket.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/storageapi/message/state.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
 #include <tests/common/teststorageapp.h>
 #include <tests/common/dummystoragelink.h>
 #include <tests/common/testhelper.h>
-#include <vespa/vdslib/state/clusterstate.h>
-#include <vespa/vdslib/state/random.h>
 #include <vespa/vespalib/io/fileutil.h>
-#include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/storageapi/message/bucket.h>
-#include <thread>
+#include <vespa/config/helper/configgetter.hpp>
 #include <future>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".test.bucketdb.bucketmanager");
+
 using config::ConfigGetter;
 using document::DocumenttypesConfig;
 using config::FileSpec;
diff --git a/storage/src/tests/distributor/getoperationtest.cpp b/storage/src/tests/distributor/getoperationtest.cpp
index 43cfb27b799..15e87e4747b 100644
--- a/storage/src/tests/distributor/getoperationtest.cpp
+++ b/storage/src/tests/distributor/getoperationtest.cpp
@@ -10,6 +10,7 @@
 #include <tests/common/dummystoragelink.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/config/helper/configgetter.hpp>
 #include <iomanip>
 #include <iostream>
 #include <memory>
diff --git a/storage/src/tests/distributor/operationtargetresolvertest.cpp b/storage/src/tests/distributor/operationtargetresolvertest.cpp
index d55c5658d2c..36dc849d964 100644
--- a/storage/src/tests/distributor/operationtargetresolvertest.cpp
+++ b/storage/src/tests/distributor/operationtargetresolvertest.cpp
@@ -12,6 +12,7 @@
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/storage/distributor/operationtargetresolverimpl.h>
 #include <vespa/storage/distributor/externaloperationhandler.h>
+#include <vespa/config/helper/configgetter.hpp>
 
 using document::BucketId;
 
diff --git a/storage/src/tests/distributor/putoperationtest.cpp b/storage/src/tests/distributor/putoperationtest.cpp
index a8a76bbbf75..5c156411e11 100644
--- a/storage/src/tests/distributor/putoperationtest.cpp
+++ b/storage/src/tests/distributor/putoperationtest.cpp
@@ -13,6 +13,7 @@
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
 #include <vespa/vespalib/testkit/test_kit.h>
+#include <vespa/config/helper/configgetter.hpp>
 #include <iomanip>
 
 using std::shared_ptr;
diff --git a/storage/src/tests/distributor/updateoperationtest.cpp b/storage/src/tests/distributor/updateoperationtest.cpp
index 07813faa03b..1c47e0a8f05 100644
--- a/storage/src/tests/distributor/updateoperationtest.cpp
+++ b/storage/src/tests/distributor/updateoperationtest.cpp
@@ -10,6 +10,7 @@
 #include <vespa/storage/distributor/operations/external/updateoperation.h>
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/storage/distributor/distributor.h>
+#include <vespa/config/helper/configgetter.hpp>
 
 using std::shared_ptr;
 using namespace document;
diff --git a/storageserver/src/apps/storaged/storage.cpp b/storageserver/src/apps/storaged/storage.cpp
index 8006c5e8471..fca37df0123 100644
--- a/storageserver/src/apps/storaged/storage.cpp
+++ b/storageserver/src/apps/storaged/storage.cpp
@@ -11,8 +11,6 @@
  * application, but as little as possible else.
  */
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
 #include <signal.h>
 #include <vespa/persistence/spi/exceptions.h>
 #include <vespa/storage/storageutil/utils.h>
@@ -23,9 +21,11 @@
 #include <vespa/storageserver/app/rpcservicelayerprocess.h>
 #include <vespa/vespalib/util/programoptions.h>
 #include <vespa/vespalib/util/shutdownguard.h>
-#include <vespa/config/config.h>
 #include <iostream>
+#include <vespa/config/helper/configgetter.hpp>
+#include <vespa/fastos/app.h>
 
+#include <vespa/log/log.h>
 LOG_SETUP("vds.application");
 
 namespace storage {
diff --git a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
index 80de17455d3..f1d58259879 100644
--- a/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
+++ b/storageserver/src/vespa/storageserver/app/distributorprocess.cpp
@@ -1,11 +1,9 @@
 // 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/storageserver/app/distributorprocess.h>
+#include <vespa/config/helper/configgetter.hpp>
 
 #include <vespa/log/log.h>
-#include <vespa/storage/storageutil/utils.h>
-
 LOG_SETUP(".process.distributor");
 
 namespace storage {
diff --git a/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.cpp b/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.cpp
index cca173ba04d..c8b40be2404 100644
--- a/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.cpp
+++ b/storageserver/src/vespa/storageserver/app/rpcservicelayerprocess.cpp
@@ -1,10 +1,9 @@
 // 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/storageserver/app/rpcservicelayerprocess.h>
+#include "rpcservicelayerprocess.h"
+#include <vespa/config/helper/configgetter.hpp>
 
 #include <vespa/log/log.h>
-
 LOG_SETUP(".process.servicelayer");
 
 namespace storage {