Finished with the storage dependency mess cleanup.

2 files changed, 3 insertions, 2 deletions

diff --git a/storageserver/src/tests/storageservertest.cpp b/storageserver/src/tests/storageservertest.cpp
index 69c55248eb7..379a8c64d78 100644
--- a/storageserver/src/tests/storageservertest.cpp
+++ b/storageserver/src/tests/storageservertest.cpp
@@ -173,7 +173,7 @@ namespace {
         virtual StorageNode& getNode() { return _process.getNode(); }
         virtual StorageNodeContext& getContext()
             { return _process.getContext(); }
-        distributor::BucketDatabase& getBucketDatabase()
+        BucketDatabase& getBucketDatabase()
             { return _process.getDistributorContext().getComponentRegister().getBucketDatabase(); }
     };
 
@@ -673,7 +673,7 @@ StorageServerTest::testSplitJoinSplitThroughDistributor_Stress()
     }
     dummyLink.reset();
         // Wait until system has split to 7 buckets
-    distributor::BucketDatabase& db(distServer.getBucketDatabase());
+    BucketDatabase& db(distServer.getBucketDatabase());
     for (size_t i(0); (i < 6000) && (7ul != db.size()); i++) {
         FastOS_Thread::Sleep(10);
     }
diff --git a/storageserver/src/vespa/storageserver/app/CMakeLists.txt b/storageserver/src/vespa/storageserver/app/CMakeLists.txt
index e2918ae49d6..6c038d65bb2 100644
--- a/storageserver/src/vespa/storageserver/app/CMakeLists.txt
+++ b/storageserver/src/vespa/storageserver/app/CMakeLists.txt
@@ -8,4 +8,5 @@ vespa_add_library(storageserver_storageapp STATIC
     rpcservicelayerprocess.cpp
     memfileservicelayerprocess.cpp
     DEPENDS
+    storage_storageserver
 )