Use more forward declarations.

Eliminate namespace pollution caused by misplaced using statement.

32 files changed, 74 insertions, 42 deletions

diff --git a/searchcore/src/apps/proton/proton.cpp b/searchcore/src/apps/proton/proton.cpp
index cf22158071f..d3b4c21900e 100644
--- a/searchcore/src/apps/proton/proton.cpp
+++ b/searchcore/src/apps/proton/proton.cpp
@@ -14,6 +14,7 @@
 LOG_SETUP("proton");
 
 typedef vespalib::SignalHandler SIG;
+using vespa::config::search::core::ProtonConfig;
 
 struct Params
 {
diff --git a/searchcore/src/apps/tests/persistenceconformance_test.cpp b/searchcore/src/apps/tests/persistenceconformance_test.cpp
index 1aa85baccb7..85495da1ee0 100644
--- a/searchcore/src/apps/tests/persistenceconformance_test.cpp
+++ b/searchcore/src/apps/tests/persistenceconformance_test.cpp
@@ -5,14 +5,19 @@ LOG_SETUP("persistenceconformance_test");
 #include <vespa/vespalib/testkit/testapp.h>
 
 #include <vespa/config-imported-fields.h>
+#include <vespa/config-rank-profiles.h>
+#include <vespa/config-summarymap.h>
+#include <vespa/searchsummary/config/config-juniperrc.h>
 #include <vespa/document/base/testdocman.h>
 #include <vespa/persistence/conformancetest/conformancetest.h>
 #include <vespa/searchcommon/common/schemaconfigurer.h>
+#include <vespa/searchcore/proton/matching/querylimiter.h>
 #include <vespa/searchcore/proton/persistenceengine/ipersistenceengineowner.h>
 #include <vespa/searchcore/proton/persistenceengine/persistenceengine.h>
 #include <vespa/searchcore/proton/server/document_db_maintenance_config.h>
 #include <vespa/searchcore/proton/server/documentdb.h>
 #include <vespa/searchcore/proton/server/documentdbconfigmanager.h>
+#include <vespa/searchcore/proton/server/fileconfigmanager.h>
 #include <vespa/searchcore/proton/server/memoryconfigstore.h>
 #include <vespa/searchcore/proton/server/bootstrapconfig.h>
 #include <vespa/searchcore/proton/metrics/metricswireservice.h>
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index 05f335f374c..c9eb60973b9 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -2,12 +2,19 @@
 
 #include <vespa/searchcore/proton/attribute/attribute_writer.h>
 #include <vespa/searchcore/proton/common/bucketfactory.h>
+#include <vespa/searchcore/proton/documentmetastore/documentmetastore.h>
 #include <vespa/searchcore/proton/docsummary/docsumcontext.h>
 #include <vespa/searchcore/proton/docsummary/documentstoreadapter.h>
 #include <vespa/searchcore/proton/docsummary/summarymanager.h>
+#include <vespa/searchcore/proton/feedoperation/putoperation.h>
+#include <vespa/searchcore/proton/metrics/metricswireservice.h>
 #include <vespa/searchcore/proton/server/documentdb.h>
 #include <vespa/searchcore/proton/server/bootstrapconfig.h>
+#include <vespa/searchcore/proton/server/documentdbconfigmanager.h>
+#include <vespa/searchcore/proton/server/idocumentsubdb.h>
 #include <vespa/searchcore/proton/server/memoryconfigstore.h>
+#include <vespa/searchcore/proton/server/searchview.h>
+#include <vespa/searchcore/proton/server/summaryadapter.h>
 #include <vespa/searchlib/common/idestructorcallback.h>
 #include <vespa/searchlib/common/transport.h>
 #include <vespa/searchlib/docstore/logdocumentstore.h>
diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
index 2de057e7012..c191b7dc4b5 100644
--- a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
@@ -9,9 +9,12 @@
 #include <vespa/searchcore/proton/docsummary/summaryflushtarget.h>
 #include <vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.h>
 #include <vespa/searchcore/proton/flushengine/threadedflushtarget.h>
+#include <vespa/searchcore/proton/common/statusreport.h>
+#include <vespa/searchcore/proton/matching/querylimiter.h>
+#include <vespa/searchcore/proton/server/bootstrapconfig.h>
 #include <vespa/searchcore/proton/server/document_db_explorer.h>
 #include <vespa/searchcore/proton/server/documentdb.h>
-#include <vespa/searchcore/proton/server/bootstrapconfig.h>
+#include <vespa/searchcore/proton/server/documentdbconfigmanager.h>
 #include <vespa/searchcore/proton/server/memoryconfigstore.h>
 #include <vespa/searchcore/proton/metrics/job_tracked_flush_target.h>
 #include <vespa/searchcore/proton/metrics/metricswireservice.h>
@@ -38,6 +41,7 @@ using search::index::DummyFileHeaderContext;
 using searchcorespi::index::IndexFlushTarget;
 using vespa::config::search::core::ProtonConfig;
 using vespalib::Slime;
+using searchcorespi::IFlushTarget;
 
 namespace {
 
diff --git a/searchcore/src/tests/proton/flushengine/flushengine.cpp b/searchcore/src/tests/proton/flushengine/flushengine.cpp
index a453958ab10..d7c528a3402 100644
--- a/searchcore/src/tests/proton/flushengine/flushengine.cpp
+++ b/searchcore/src/tests/proton/flushengine/flushengine.cpp
@@ -26,6 +26,7 @@ LOG_SETUP("flushengine_test");
 
 using namespace proton;
 using namespace vespalib::slime;
+using searchcorespi::IFlushTarget;
 using searchcorespi::FlushTask;
 using vespalib::Slime;
 
diff --git a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp
index b3fd9a050a8..c91d1897984 100644
--- a/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp
+++ b/searchcore/src/tests/proton/flushengine/prepare_restart_flush_strategy/prepare_restart_flush_strategy_test.cpp
@@ -10,6 +10,7 @@
 
 using namespace proton;
 using search::SerialNum;
+using searchcorespi::IFlushTarget;
 
 using SimpleFlushHandler = test::DummyFlushHandler;
 using FlushCandidatesList = std::vector<FlushTargetCandidates>;
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.cpp
index fdbe60eb762..0c332edba6a 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.cpp
@@ -8,6 +8,8 @@ LOG_SETUP(".proton.docsummary.summarycompacttarget");
 
 using search::IDocumentStore;
 using search::SerialNum;
+using searchcorespi::FlushStats;
+using searchcorespi::IFlushTarget;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.h b/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.h
index e6e78a5f871..2d7da0df1ca 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarycompacttarget.h
@@ -6,14 +6,13 @@
 
 namespace proton {
 
-using searchcorespi::FlushStats;
-using searchcorespi::IFlushTarget;
 
 /**
  * This class implements the IFlushTarget interface to proxy a summary manager.
  */
-class SummaryCompactTarget : public IFlushTarget {
+class SummaryCompactTarget : public searchcorespi::IFlushTarget {
 private:
+    using FlushStats = searchcorespi::FlushStats;
     search::IDocumentStore & _docStore;
     FlushStats _lastStats;
 
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp
index 33bf18fea12..8082d14df1c 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.cpp
@@ -8,6 +8,8 @@ LOG_SETUP(".proton.docsummary.summaryflushtarget");
 
 using search::IDocumentStore;
 using search::SerialNum;
+using searchcorespi::FlushStats;
+using searchcorespi::IFlushTarget;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h
index 617a375d51c..64e9b2bea57 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summaryflushtarget.h
@@ -6,14 +6,13 @@
 
 namespace proton {
 
-using searchcorespi::FlushStats;
-using searchcorespi::IFlushTarget;
 
 /**
  * This class implements the IFlushTarget interface to proxy a summary manager.
  */
-class SummaryFlushTarget : public IFlushTarget {
+class SummaryFlushTarget : public searchcorespi::IFlushTarget {
 private:
+    using FlushStats = searchcorespi::FlushStats;
     search::IDocumentStore & _docStore;
     FlushStats _lastStats;
 
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
index 318ffcc040e..a3282e9e3ec 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/summarymanager.cpp
@@ -28,6 +28,7 @@ using search::WriteableFileChunk;
 
 using search::TuneFileSummary;
 using search::common::FileHeaderContext;
+using searchcorespi::IFlushTarget;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/cachedflushtarget.h b/searchcore/src/vespa/searchcore/proton/flushengine/cachedflushtarget.h
index d5302ea62ca..de7ca2cacba 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/cachedflushtarget.h
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/cachedflushtarget.h
@@ -5,16 +5,15 @@
 
 namespace proton {
 
-using searchcorespi::FlushStats;
-using searchcorespi::IFlushTarget;
-
 /**
  * Implements a flush target that caches the flushable memory and flush cost of
  * a decorated target. This is used by the flush engine to avoid recalculating
  * these during selection of flush target.
  */
-class CachedFlushTarget : public IFlushTarget {
+class CachedFlushTarget : public searchcorespi::IFlushTarget {
 private:
+    using FlushStats = searchcorespi::FlushStats;
+    using IFlushTarget = searchcorespi::IFlushTarget;
     IFlushTarget::SP  _target;
     SerialNum         _flushedSerialNum;
     Time              _lastFlushTime;
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flush_all_strategy.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flush_all_strategy.cpp
index bb237d1ff7e..ae5d11e0fa9 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flush_all_strategy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flush_all_strategy.cpp
@@ -3,6 +3,7 @@
 #include "flush_all_strategy.h"
 
 using search::SerialNum;
+using searchcorespi::IFlushTarget;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flush_engine_explorer.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flush_engine_explorer.cpp
index 3c649dd5614..8216c9b1391 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flush_engine_explorer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flush_engine_explorer.cpp
@@ -11,6 +11,7 @@ LOG_SETUP(".proton.flushengine.flush_engine_explorer");
 using vespalib::slime::Cursor;
 using vespalib::slime::Inserter;
 using vespalib::StateExplorer;
+using searchcorespi::IFlushTarget;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.h b/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.h
index ab6166a7082..e03371c4b68 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.h
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushcontext.h
@@ -6,14 +6,13 @@
 
 namespace proton {
 
-using searchcorespi::IFlushTarget;
-
 /**
  * This class is used by FlushEngine to hold the necessary context for flushing
  * a single IFlushTarget.
  */
 class FlushContext {
 private:
+    using IFlushTarget = searchcorespi::IFlushTarget;
     vespalib::string               _name;
     IFlushHandler::SP              _handler;
     IFlushTarget::SP               _target;
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp
index f3d6f1c7de2..e75b44a2235 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.cpp
@@ -14,6 +14,8 @@ LOG_SETUP(".proton.flushengine.flushengine");
 
 using vespalib::MonitorGuard;
 typedef vespalib::Executor::Task Task;
+using searchcorespi::IFlushTarget;
+using searchcorespi::FlushStats;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h
index 6eddb9c46ab..6aecec0930a 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flushengine.h
@@ -31,6 +31,7 @@ public:
     };
     typedef std::set<FlushMeta> FlushMetaSet;
 private:
+    using IFlushTarget = searchcorespi::IFlushTarget;
     struct FlushInfo : public FlushMeta
     {
         FlushInfo();
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/iflushhandler.h b/searchcore/src/vespa/searchcore/proton/flushengine/iflushhandler.h
index 41774c085c1..5a58786f8ac 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/iflushhandler.h
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/iflushhandler.h
@@ -6,8 +6,6 @@
 
 namespace proton {
 
-using searchcorespi::IFlushTarget;
-
 /**
  * This class represents a collection of IFlushTarget objects. It is implemented
  * by DocumentDB.
@@ -17,6 +15,7 @@ private:
     vespalib::string _name;
 
 public:
+    using IFlushTarget = searchcorespi::IFlushTarget;
     typedef IFlushTarget::SerialNum SerialNum;
     /**
      * Convenience typedefs.
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/prepare_restart_flush_strategy.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/prepare_restart_flush_strategy.cpp
index d989cb24e88..1bf45bd332e 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/prepare_restart_flush_strategy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/prepare_restart_flush_strategy.cpp
@@ -10,6 +10,7 @@ LOG_SETUP(".proton.flushengine.prepare_restart_flush_strategy");
 namespace proton {
 
 using search::SerialNum;
+using searchcorespi::IFlushTarget;
 
 using Config = PrepareRestartFlushStrategy::Config;
 using FlushContextsMap = std::map<vespalib::string, FlushContext::List>;
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.h b/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.h
index f26244e1264..a287de2ab75 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.h
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/threadedflushtarget.h
@@ -7,9 +7,6 @@ namespace vespalib { class Executor; }
 
 namespace proton {
 
-using searchcorespi::FlushStats;
-using searchcorespi::IFlushTarget;
-
 class IGetSerialNum;
 
 /**
@@ -20,6 +17,7 @@ class IGetSerialNum;
 class ThreadedFlushTarget : public FlushTargetProxy
 {
 private:
+    using IFlushTarget = searchcorespi::IFlushTarget;
     vespalib::Executor &_executor;
     const IGetSerialNum &_getSerialNum;
 
diff --git a/searchcore/src/vespa/searchcore/proton/index/indexmanager.h b/searchcore/src/vespa/searchcore/proton/index/indexmanager.h
index 55f16047183..d639a63f2cc 100644
--- a/searchcore/src/vespa/searchcore/proton/index/indexmanager.h
+++ b/searchcore/src/vespa/searchcore/proton/index/indexmanager.h
@@ -8,16 +8,13 @@
 
 namespace proton {
 
-using searchcorespi::IFlushTarget;
-using searchcorespi::IIndexManager;
-
 /**
  * The IndexManager provides a holistic view of a set of disk and
  * memory indexes. It allows updating the active index, enables search
  * across all indexes, and manages the set of indexes through flushing
  * of memory indexes and fusion of disk indexes.
  */
-class IndexManager : public IIndexManager
+class IndexManager : public searchcorespi::IIndexManager
 {
 public:
     class MaintainerOperations : public searchcorespi::index::IIndexMaintainerOperations {
@@ -110,7 +107,7 @@ public:
         return _maintainer.getSearchableStats();
     }
 
-    virtual IFlushTarget::List getFlushTargets() {
+    virtual searchcorespi::IFlushTarget::List getFlushTargets() {
         return _maintainer.getFlushTargets();
     }
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
index ab166cae60d..0d74b015754 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp
@@ -16,11 +16,15 @@
 #include <vespa/searchcore/proton/attribute/imported_attributes_repo.h>
 #include <vespa/searchcore/proton/common/eventlogger.h>
 #include <vespa/searchcore/proton/common/schemautil.h>
+#include <vespa/searchcore/proton/common/statusreport.h>
 #include <vespa/searchcore/proton/index/index_writer.h>
 #include <vespa/searchcore/proton/initializer/task_runner.h>
+#include <vespa/searchcore/proton/metrics/attribute_metrics_collection.h>
+#include <vespa/searchcore/proton/metrics/metricswireservice.h>
 #include <vespa/searchcore/proton/reference/i_document_db_reference_resolver.h>
 #include <vespa/searchcore/proton/reference/i_document_db_reference_registry.h>
 #include <vespa/searchcore/proton/reference/document_db_reference_resolver.h>
+#include <vespa/searchcore/proton/docsummary/isummarymanager.h>
 #include <vespa/searchlib/attribute/attributefactory.h>
 #include <vespa/searchlib/attribute/configconverter.h>
 #include <vespa/searchlib/engine/docsumreply.h>
@@ -36,7 +40,6 @@ using vespa::config::search::AttributesConfig;
 using vespa::config::search::core::ProtonConfig;
 using search::index::SchemaBuilder;
 using vespalib::JSONStringer;
-using vespalib::FileHeader;
 using vespalib::Executor;
 using vespalib::IllegalStateException;
 using vespalib::StateExplorer;
@@ -45,7 +48,6 @@ using vespalib::makeTask;
 using vespalib::makeClosure;
 using namespace proton::matching;
 using namespace search;
-using namespace search::docsummary;
 using namespace search::engine;
 using namespace search::fef;
 using namespace search::index;
@@ -57,6 +59,7 @@ using search::common::FileHeaderContext;
 using proton::initializer::InitializerTask;
 using proton::initializer::TaskRunner;
 using search::makeLambdaTask;
+using searchcorespi::IFlushTarget;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.h b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
index e238b59eb8b..b597f0a9e0b 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.h
@@ -16,20 +16,12 @@
 #include "iwipeoldremovedfieldshandler.h"
 #include "maintenancecontroller.h"
 #include "i_document_db_config_owner.h"
-#include "searchable_doc_subdb_configurer.h"
-#include "searchabledocsubdb.h"
-#include "summaryadapter.h"
+#include "executorthreadingservice.h"
 #include "visibilityhandler.h"
 #include "i_document_subdb_owner.h"
 
-#include <vespa/searchcore/proton/attribute/attributemanager.h>
-#include <vespa/searchcore/proton/attribute/i_attribute_writer.h>
 #include <vespa/searchcore/proton/common/doctypename.h>
-#include <vespa/searchcore/proton/common/statusreport.h>
 #include <vespa/searchcore/proton/common/monitored_refcount.h>
-#include <vespa/searchcore/proton/docsummary/summarymanager.h>
-#include <vespa/searchcore/proton/documentmetastore/i_document_meta_store.h>
-#include <vespa/searchcore/proton/index/i_index_writer.h>
 #include <vespa/searchcore/proton/matching/sessionmanager.h>
 #include <vespa/searchcore/proton/metrics/documentdb_job_trackers.h>
 #include <vespa/searchcore/proton/metrics/documentdb_metrics_collection.h>
@@ -44,8 +36,6 @@
 #include <mutex>
 #include <condition_variable>
 
-using vespa::config::search::core::ProtonConfig;
-
 namespace search
 {
 
@@ -60,8 +50,9 @@ namespace transactionlog { class TransLogClient; }
 }  // namespace search
 
 namespace proton {
-class MetricsWireService;
 class IDocumentDBOwner;
+class MetricsWireService;
+class StatusReport;
 
 namespace configvalidator { class Result; }
 
@@ -94,6 +85,9 @@ private:
 
 
     using InitializeThreads = std::shared_ptr<vespalib::ThreadStackExecutorBase>;
+    using IFlushTargetList = std::vector<std::shared_ptr<searchcorespi::IFlushTarget>>;
+    using StatusReportUP = std::unique_ptr<StatusReport>;
+    using ProtonConfig = vespa::config::search::core::ProtonConfig;
 
     DocTypeName                   _docTypeName;
     vespalib::string              _baseDir;
@@ -415,7 +409,7 @@ public:
     std::unique_ptr<search::engine::DocsumReply>
     getDocsums(const search::engine::DocsumRequest & request);
 
-    IFlushTarget::List getFlushTargets();
+    IFlushTargetList getFlushTargets();
     void flushDone(SerialNum flushedSerial);
 
     virtual SerialNum
@@ -427,7 +421,7 @@ public:
         return _feedHandler.getSerialNum();
     }
 
-    StatusReport::UP reportStatus() const;
+    StatusReportUP reportStatus() const;
 
     /**
      * Reference counting
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp
index d96bcbabcb2..5aa608607a3 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp
@@ -13,6 +13,7 @@ using proton::matching::SessionManager;
 using search::index::Schema;
 using search::SerialNum;
 using vespa::config::search::core::ProtonConfig;
+using searchcorespi::IFlushTarget;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp
index f7c1595240e..6ecdbf8e51d 100644
--- a/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/flushhandlerproxy.cpp
@@ -6,6 +6,8 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.flushhandlerproxy");
 
+using searchcorespi::IFlushTarget;
+
 namespace proton {
 
 FlushHandlerProxy::FlushHandlerProxy(const DocumentDB::SP &documentDB)
diff --git a/searchcore/src/vespa/searchcore/proton/server/memoryflush.cpp b/searchcore/src/vespa/searchcore/proton/server/memoryflush.cpp
index 4cf24514127..a694f9e733a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/memoryflush.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/memoryflush.cpp
@@ -10,6 +10,7 @@ LOG_SETUP(".proton.server.memoryflush");
 
 using search::SerialNum;
 using proton::flushengine::TlsStats;
+using searchcorespi::IFlushTarget;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/persistencehandlerproxy.cpp b/searchcore/src/vespa/searchcore/proton/server/persistencehandlerproxy.cpp
index 094f0f4dd6f..07a37a1b299 100644
--- a/searchcore/src/vespa/searchcore/proton/server/persistencehandlerproxy.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/persistencehandlerproxy.cpp
@@ -5,6 +5,13 @@
 #include "documentretriever.h"
 #include <vespa/persistence/spi/result.h>
 #include "documentdb.h"
+#include <vespa/searchcore/proton/feedoperation/createbucketoperation.h>
+#include <vespa/searchcore/proton/feedoperation/deletebucketoperation.h>
+#include <vespa/searchcore/proton/feedoperation/joinbucketsoperation.h>
+#include <vespa/searchcore/proton/feedoperation/putoperation.h>
+#include <vespa/searchcore/proton/feedoperation/removeoperation.h>
+#include <vespa/searchcore/proton/feedoperation/splitbucketoperation.h>
+#include <vespa/searchcore/proton/feedoperation/updateoperation.h>
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.persistencehandlerproxy");
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index cdf77609da3..6c76cbb9753 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -12,6 +12,7 @@
 #include "searchhandlerproxy.h"
 #include "simpleflush.h"
 #include "proton_config_snapshot.h"
+#include "fileconfigmanager.h"
 
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/messagebus/emptyreply.h>
@@ -30,7 +31,6 @@
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/vespalib/util/closuretask.h>
 #include <vespa/vespalib/util/random.h>
-#include <vespa/searchcore/proton/common/hw_info.h>
 #include <vespa/searchcore/proton/common/hw_info_sampler.h>
 #include <vespa/searchcore/proton/reference/document_db_reference_registry.h>
 #include <vespa/searchcore/proton/reference/i_document_db_reference.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.h b/searchcore/src/vespa/searchcore/proton/server/proton.h
index aadc0eb1287..01002443067 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.h
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.h
@@ -13,8 +13,10 @@
 #include "rpc_hooks.h"
 #include "bootstrapconfig.h"
 #include <vespa/persistence/proxy/providerstub.h>
+#include <vespa/searchcore/proton/common/hw_info.h>
 #include <vespa/searchcore/proton/flushengine/flushengine.h>
 #include <vespa/searchcore/proton/matchengine/matchengine.h>
+#include <vespa/searchcore/proton/matching/querylimiter.h>
 #include <vespa/searchcore/proton/metrics/metrics_engine.h>
 #include <vespa/searchcore/proton/persistenceengine/i_resource_write_filter.h>
 #include <vespa/searchcore/proton/persistenceengine/ipersistenceengineowner.h>
@@ -58,7 +60,6 @@ private:
     typedef search::engine::MonitorRequest                MonitorRequest;
     typedef search::engine::MonitorReply                  MonitorReply;
     typedef search::engine::MonitorClient                 MonitorClient;
-    typedef search::docsummary::JuniperProperties         JuniperProperties;
     typedef storage::spi::ProviderStub                    ProviderStub;
     typedef std::map<DocTypeName, DocumentDB::SP>         DocumentDBMap;
     typedef BootstrapConfig::ProtonConfigSP               ProtonConfigSP;
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
index 3beb7441000..f826d7cfcdc 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
+++ b/searchcore/src/vespa/searchcore/proton/server/searchabledocsubdb.h
@@ -73,6 +73,7 @@ public:
 
 private:
     typedef FastAccessDocSubDB Parent;
+    using IFlushTargetList = std::vector<std::shared_ptr<searchcorespi::IFlushTarget>>;
 
     IIndexManager::SP                           _indexMgr;
     IIndexWriter::SP                            _indexWriter;
@@ -103,7 +104,7 @@ private:
     void reconfigureIndexSearchable();
     void syncViews();
 protected:
-    IFlushTarget::List getFlushTargetsInternal();
+    IFlushTargetList getFlushTargetsInternal();
 
     using Parent::updateLidReuseDelayer;
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/simpleflush.h b/searchcore/src/vespa/searchcore/proton/server/simpleflush.h
index 82e379a345a..8281021ad80 100644
--- a/searchcore/src/vespa/searchcore/proton/server/simpleflush.h
+++ b/searchcore/src/vespa/searchcore/proton/server/simpleflush.h
@@ -9,6 +9,7 @@ namespace proton {
 class SimpleFlush : public IFlushStrategy
 {
 private:
+    using IFlushTarget = searchcorespi::IFlushTarget;
     class CompareTarget {
     public:
         bool operator () (const FlushContext::SP &lhs, const FlushContext::SP &rhs) const {
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
index d69e0cbcd8e..4fbae82fe25 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp
@@ -48,6 +48,7 @@ using vespalib::makeClosure;
 using proton::documentmetastore::LidReuseDelayer;
 using fastos::TimeStamp;
 using proton::initializer::InitializerTask;
+using searchcorespi::IFlushTarget;
 
 namespace proton {