Move sequenced task executors to staging vespalib

36 files changed, 135 insertions, 133 deletions

diff --git a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
index 44ff8cb925e..407b14c5f7d 100644
--- a/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_manager/attribute_manager_test.cpp
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/config-attributes.h>
 #include <vespa/fastos/file.h>
-#include <vespa/searchcommon/attribute/attributecontent.h>
 #include <vespa/searchcommon/attribute/iattributevector.h>
 #include <vespa/searchcore/proton/attribute/attribute_collection_spec_factory.h>
 #include <vespa/searchcore/proton/attribute/attribute_manager_initializer.h>
@@ -24,18 +23,16 @@
 #include <vespa/searchlib/attribute/attribute_read_guard.h>
 #include <vespa/searchlib/attribute/imported_attribute_vector.h>
 #include <vespa/searchlib/attribute/imported_attribute_vector_factory.h>
-#include <vespa/searchlib/attribute/integerbase.h>
 #include <vespa/searchlib/attribute/predicate_attribute.h>
 #include <vespa/searchlib/attribute/reference_attribute.h>
 #include <vespa/searchlib/attribute/singlenumericattribute.hpp>
-#include <vespa/searchlib/common/foregroundtaskexecutor.h>
+#include <vespa/vespalib/util/foregroundtaskexecutor.h>
 #include <vespa/searchlib/common/indexmetainfo.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/predicate/predicate_index.h>
 #include <vespa/searchlib/predicate/predicate_tree_annotator.h>
 #include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/searchlib/test/mock_gid_to_lid_mapping.h>
-#include <vespa/searchlib/util/filekit.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 
@@ -55,7 +52,7 @@ using proton::initializer::InitializerTask;
 using proton::test::AttributeUtils;
 using proton::test::createInt32Attribute;
 using proton::test::Int32Attribute;
-using search::ForegroundTaskExecutor;
+using vespalib::ForegroundTaskExecutor;
 using search::TuneFileAttributes;
 using search::attribute::BasicType;
 using search::attribute::IAttributeContext;
diff --git a/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp b/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp
index 01dc2306ef6..788aa4fb1ee 100644
--- a/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_populator/attribute_populator_test.cpp
@@ -9,13 +9,14 @@ LOG_SETUP("attribute_populator_test");
 #include <vespa/searchcore/proton/attribute/attributemanager.h>
 #include <vespa/searchcore/proton/common/hw_info.h>
 #include <vespa/searchcore/proton/test/test.h>
-#include <vespa/searchlib/common/foregroundtaskexecutor.h>
+#include <vespa/vespalib/util/foregroundtaskexecutor.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/vespalib/util/stringfmt.h>
 
 using document::config_builder::DocumenttypesConfigBuilderHelper;
 using document::config_builder::Struct;
+using vespalib::ForegroundTaskExecutor;
 using namespace document;
 using namespace proton;
 using namespace search;
diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp
index edb5a07b059..839ef14fcb0 100644
--- a/searchcore/src/tests/proton/attribute/attribute_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp
@@ -26,9 +26,9 @@
 #include <vespa/searchlib/attribute/imported_attribute_vector_factory.h>
 #include <vespa/searchlib/attribute/integerbase.h>
 #include <vespa/searchlib/attribute/predicate_attribute.h>
-#include <vespa/searchlib/common/foregroundtaskexecutor.h>
+#include <vespa/vespalib/util/foregroundtaskexecutor.h>
 #include <vespa/searchlib/common/idestructorcallback.h>
-#include <vespa/searchlib/common/sequencedtaskexecutorobserver.h>
+#include <vespa/vespalib/util/sequencedtaskexecutorobserver.h>
 #include <vespa/searchlib/index/docbuilder.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/predicate/predicate_hash.h>
@@ -43,8 +43,6 @@
 #include <vespa/vespalib/btree/btreeroot.hpp>
 #include <vespa/searchlib/attribute/singlenumericattribute.hpp>
 
-
-
 #include <vespa/log/log.h>
 LOG_SETUP("attribute_test");
 
@@ -76,6 +74,8 @@ using vespalib::eval::ValueType;
 using vespalib::eval::TensorSpec;
 using vespalib::tensor::Tensor;
 using vespalib::tensor::DefaultTensorEngine;
+using vespalib::ForegroundTaskExecutor;
+using vespalib::SequencedTaskExecutorObserver;
 
 using AVConfig = search::attribute::Config;
 using AVBasicType = search::attribute::BasicType;
diff --git a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
index 99d4651d13f..4604129248b 100644
--- a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
@@ -8,7 +8,7 @@
 #include <vespa/searchcore/proton/flushengine/shrink_lid_space_flush_target.h>
 #include <vespa/searchlib/attribute/attributefactory.h>
 #include <vespa/searchlib/attribute/integerbase.h>
-#include <vespa/searchlib/common/foregroundtaskexecutor.h>
+#include <vespa/vespalib/util/foregroundtaskexecutor.h>
 #include <vespa/searchlib/common/indexmetainfo.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/test/directory_handler.h>
diff --git a/searchcore/src/tests/proton/attribute/attributes_state_explorer/attributes_state_explorer_test.cpp b/searchcore/src/tests/proton/attribute/attributes_state_explorer/attributes_state_explorer_test.cpp
index 76dcf53c51d..01452f1361e 100644
--- a/searchcore/src/tests/proton/attribute/attributes_state_explorer/attributes_state_explorer_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attributes_state_explorer/attributes_state_explorer_test.cpp
@@ -6,7 +6,7 @@
 #include <vespa/searchcore/proton/common/hw_info.h>
 #include <vespa/searchcore/proton/test/attribute_vectors.h>
 #include <vespa/searchcore/proton/test/attribute_utils.h>
-#include <vespa/searchlib/common/foregroundtaskexecutor.h>
+#include <vespa/vespalib/util/foregroundtaskexecutor.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/vespalib/test/insertion_operators.h>
@@ -18,7 +18,7 @@ LOG_SETUP("attributes_state_explorer_test");
 using namespace proton;
 using namespace proton::test;
 using search::AttributeVector;
-using search::ForegroundTaskExecutor;
+using vespalib::ForegroundTaskExecutor;
 using search::TuneFileAttributes;
 using search::index::DummyFileHeaderContext;
 using search::test::DirectoryHandler;
diff --git a/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/exclusive_attribute_read_accessor_test.cpp b/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/exclusive_attribute_read_accessor_test.cpp
index d2eba28bc9b..6f91b1a6f6f 100644
--- a/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/exclusive_attribute_read_accessor_test.cpp
+++ b/searchcore/src/tests/proton/attribute/exclusive_attribute_read_accessor/exclusive_attribute_read_accessor_test.cpp
@@ -5,7 +5,7 @@
 #include <vespa/searchcommon/attribute/config.h>
 #include <vespa/searchlib/attribute/attributefactory.h>
 #include <vespa/searchlib/attribute/attributevector.h>
-#include <vespa/searchlib/common/sequencedtaskexecutor.h>
+#include <vespa/vespalib/util/sequencedtaskexecutor.h>
 #include <vespa/vespalib/util/gate.h>
 
 using namespace proton;
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index 3d1fa25983a..55d524519b8 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -787,7 +787,7 @@ Test::requireThatAttributesAreUsed()
     TEST_DO(assertTensor(Tensor::UP(), "bj", *rep, 1, rclass));
 
     proton::IAttributeManager::SP attributeManager = dc._ddb->getReadySubDB()->getAttributeManager();
-    search::ISequencedTaskExecutor &attributeFieldWriter = attributeManager->getAttributeFieldWriter();
+    vespalib::ISequencedTaskExecutor &attributeFieldWriter = attributeManager->getAttributeFieldWriter();
     search::AttributeVector *bjAttr = attributeManager->getWritableAttribute("bj");
     auto bjTensorAttr = dynamic_cast<search::tensor::TensorAttribute *>(bjAttr);
 
diff --git a/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp b/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp
index 991cb2e519d..7af9d8d816c 100644
--- a/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp
+++ b/searchcore/src/tests/proton/feed_and_search/feed_and_search.cpp
@@ -4,7 +4,7 @@
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/fieldvalue/fieldvalue.h>
 #include <vespa/searchlib/common/documentsummary.h>
-#include <vespa/searchlib/common/sequencedtaskexecutor.h>
+#include <vespa/vespalib/util/sequencedtaskexecutor.h>
 #include <vespa/searchlib/diskindex/diskindex.h>
 #include <vespa/searchlib/diskindex/fusion.h>
 #include <vespa/searchlib/diskindex/indexbuilder.h>
@@ -149,8 +149,8 @@ void Test::testSearch(Searchable &source,
 void Test::requireThatMemoryIndexCanBeDumpedAndSearched() {
     Schema schema = getSchema();
     vespalib::ThreadStackExecutor sharedExecutor(2, 0x10000);
-    auto indexFieldInverter = search::SequencedTaskExecutor::create(2);
-    auto indexFieldWriter = search::SequencedTaskExecutor::create(2);
+    auto indexFieldInverter = vespalib::SequencedTaskExecutor::create(2);
+    auto indexFieldWriter = vespalib::SequencedTaskExecutor::create(2);
     MemoryIndex memory_index(schema, MockFieldLengthInspector(), *indexFieldInverter, *indexFieldWriter);
     DocBuilder doc_builder(schema);
 
diff --git a/searchcore/src/tests/proton/index/fusionrunner_test.cpp b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
index 975061f9d88..6831dd60bd5 100644
--- a/searchcore/src/tests/proton/index/fusionrunner_test.cpp
+++ b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
@@ -4,7 +4,7 @@
 #include <vespa/searchcore/proton/index/indexmanager.h>
 #include <vespa/searchcore/proton/server/executorthreadingservice.h>
 #include <vespa/searchcorespi/index/fusionrunner.h>
-#include <vespa/searchlib/common/isequencedtaskexecutor.h>
+#include <vespa/vespalib/util/isequencedtaskexecutor.h>
 #include <vespa/searchlib/diskindex/diskindex.h>
 #include <vespa/searchlib/diskindex/indexbuilder.h>
 #include <vespa/searchlib/fef/matchdatalayout.h>
diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp
index 8cc075773f7..5b6f7ca9a30 100644
--- a/searchcore/src/tests/proton/index/indexmanager_test.cpp
+++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp
@@ -7,7 +7,7 @@
 #include <vespa/searchcorespi/index/indexcollection.h>
 #include <vespa/searchcorespi/index/indexflushtarget.h>
 #include <vespa/searchcorespi/index/indexfusiontarget.h>
-#include <vespa/searchlib/common/sequencedtaskexecutor.h>
+#include <vespa/vespalib/util/sequencedtaskexecutor.h>
 #include <vespa/searchlib/common/serialnum.h>
 #include <vespa/searchlib/index/docbuilder.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
@@ -31,7 +31,7 @@ using document::Document;
 using document::FieldValue;
 using proton::index::IndexConfig;
 using proton::index::IndexManager;
-using search::SequencedTaskExecutor;
+using vespalib::SequencedTaskExecutor;
 using search::SerialNum;
 using search::TuneFileAttributes;
 using search::TuneFileIndexManager;
diff --git a/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp b/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp
index 02e9f3e8687..c0098c878b4 100644
--- a/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp
+++ b/searchcore/src/tests/proton/reference/document_db_reference_resolver/document_db_reference_resolver_test.cpp
@@ -19,7 +19,7 @@
 #include <vespa/searchlib/attribute/reference_attribute.h>
 #include <vespa/searchlib/common/i_gid_to_lid_mapper.h>
 #include <vespa/searchlib/common/i_gid_to_lid_mapper_factory.h>
-#include <vespa/searchlib/common/sequencedtaskexecutor.h>
+#include <vespa/vespalib/util/sequencedtaskexecutor.h>
 #include <vespa/searchlib/test/mock_attribute_manager.h>
 #include <vespa/vespalib/test/insertion_operators.h>
 
@@ -33,6 +33,8 @@ using proton::test::MockDocumentDBReference;
 using search::attribute::test::MockAttributeManager;
 using vespa::config::search::ImportedFieldsConfig;
 using vespa::config::search::ImportedFieldsConfigBuilder;
+using vespalib::SequencedTaskExecutor;
+using vespalib::ISequencedTaskExecutor;
 
 const ReferenceAttribute *getReferenceAttribute(const IGidToLidChangeListener &listener) {
     auto mylistener = dynamic_cast<const GidToLidChangeListener *>(&listener);
diff --git a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp b/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp
index a023ff175d6..2fb439ea530 100644
--- a/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp
+++ b/searchcore/src/tests/proton/reference/gid_to_lid_change_listener/gid_to_lid_change_listener_test.cpp
@@ -2,7 +2,7 @@
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/document/base/documentid.h>
-#include <vespa/searchlib/common/sequencedtaskexecutor.h>
+#include <vespa/vespalib/util/sequencedtaskexecutor.h>
 #include <vespa/searchcore/proton/common/monitored_refcount.h>
 #include <vespa/searchcore/proton/reference/gid_to_lid_change_listener.h>
 #include <vespa/searchlib/common/i_gid_to_lid_mapper_factory.h>
@@ -49,13 +49,13 @@ struct MyGidToLidMapperFactory : public MockGidToLidMapperFactory
 struct Fixture
 {
     std::shared_ptr<ReferenceAttribute> _attr;
-    std::unique_ptr<search::ISequencedTaskExecutor> _writer;
+    std::unique_ptr<vespalib::ISequencedTaskExecutor> _writer;
     MonitoredRefCount _refCount;
     std::unique_ptr<GidToLidChangeListener>  _listener;
 
     Fixture()
         : _attr(std::make_shared<ReferenceAttribute>("test", Config(BasicType::REFERENCE))),
-          _writer(search::SequencedTaskExecutor::create(1)),
+          _writer(vespalib::SequencedTaskExecutor::create(1)),
           _refCount(),
           _listener()
     {
diff --git a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp
index 95cbdafb8e4..898825016b3 100644
--- a/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp
+++ b/searchcore/src/tests/proton/reprocessing/attribute_reprocessing_initializer/attribute_reprocessing_initializer_test.cpp
@@ -11,7 +11,7 @@
 #include <vespa/searchcore/proton/reprocessing/i_reprocessing_handler.h>
 #include <vespa/searchcore/proton/test/attribute_utils.h>
 #include <vespa/searchlib/attribute/attributefactory.h>
-#include <vespa/searchlib/common/foregroundtaskexecutor.h>
+#include <vespa/vespalib/util/foregroundtaskexecutor.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/vespalib/gtest/gtest.h>
@@ -29,6 +29,7 @@ using search::attribute::BasicType;
 using search::attribute::Config;
 using search::index::schema::DataType;
 using search::test::DirectoryHandler;
+using vespalib::ForegroundTaskExecutor;
 
 const vespalib::string TEST_DIR = "test_output";
 const SerialNum INIT_SERIAL_NUM = 10;
@@ -41,10 +42,10 @@ struct MyReprocessingHandler : public IReprocessingHandler
     IReprocessingReader::SP _reader;
     std::vector<IReprocessingRewriter::SP> _rewriters;
     MyReprocessingHandler() : _reader(), _rewriters() {}
-    virtual void addReader(const IReprocessingReader::SP &reader) override {
+    void addReader(const IReprocessingReader::SP &reader) override {
         _reader = reader;
     }
-    virtual void addRewriter(const IReprocessingRewriter::SP &rewriter) override {
+    void addRewriter(const IReprocessingRewriter::SP &rewriter) override {
         _rewriters.push_back(rewriter);
     }
 };
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
index f1035776a8f..33b9d162163 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
@@ -13,7 +13,6 @@
 #include <vespa/searchlib/attribute/attributevector.hpp>
 #include <vespa/searchlib/attribute/imported_attribute_vector.h>
 #include <vespa/searchlib/common/idestructorcallback.h>
-#include <vespa/searchlib/common/isequencedtaskexecutor.h>
 #include <vespa/vespalib/stllike/hash_map.hpp>
 
 #include <vespa/log/log.h>
@@ -22,7 +21,8 @@ LOG_SETUP(".proton.attribute.attribute_writer");
 using namespace document;
 using namespace search;
 using search::attribute::ImportedAttributeVector;
-using ExecutorId = search::ISequencedTaskExecutor::ExecutorId;
+using vespalib::ISequencedTaskExecutor;
+using ExecutorId = vespalib::ISequencedTaskExecutor::ExecutorId;
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.h
index 8c9b756cd89..4a9726dd113 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.h
@@ -5,7 +5,7 @@
 #include "i_attribute_writer.h"
 #include <vespa/searchcore/proton/common/commit_time_tracker.h>
 #include <vespa/document/base/fieldpath.h>
-#include <vespa/searchlib/common/isequencedtaskexecutor.h>
+#include <vespa/vespalib/util/isequencedtaskexecutor.h>
 #include <vespa/vespalib/stllike/hash_map.h>
 
 namespace document { class DocumentType; }
@@ -25,8 +25,8 @@ private:
     typedef document::DocumentType DocumentType;
     typedef document::FieldValue FieldValue;
     const IAttributeManager::SP _mgr;
-    search::ISequencedTaskExecutor &_attributeFieldWriter;
-    using ExecutorId = search::ISequencedTaskExecutor::ExecutorId;
+    vespalib::ISequencedTaskExecutor &_attributeFieldWriter;
+    using ExecutorId = vespalib::ISequencedTaskExecutor::ExecutorId;
 public:
     class WriteField
     {
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp
index 02bf4f4d7cc..5ff40fa5360 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp
@@ -14,7 +14,7 @@
 #include <vespa/searchlib/attribute/imported_attribute_vector.h>
 #include <vespa/searchcommon/attribute/i_attribute_functor.h>
 #include <vespa/searchlib/attribute/interlock.h>
-#include <vespa/searchlib/common/isequencedtaskexecutor.h>
+#include <vespa/vespalib/util/isequencedtaskexecutor.h>
 #include <vespa/searchlib/common/threaded_compactable_lid_space.h>
 #include <vespa/searchlib/attribute/attributevector.h>
 #include <vespa/vespalib/io/fileutil.h>
@@ -74,7 +74,7 @@ search::SerialNum estimateShrinkSerialNum(const AttributeVector &attr)
     return std::max(attr.getStatus().getLastSyncToken(), serialNum);
 }
 
-std::shared_ptr<ShrinkLidSpaceFlushTarget> allocShrinker(const AttributeVector::SP &attr, search::ISequencedTaskExecutor &attributeFieldWriter, AttributeDiskLayout &diskLayout)
+std::shared_ptr<ShrinkLidSpaceFlushTarget> allocShrinker(const AttributeVector::SP &attr, vespalib::ISequencedTaskExecutor &attributeFieldWriter, AttributeDiskLayout &diskLayout)
 {
     using Type = IFlushTarget::Type;
     using Component = IFlushTarget::Component;
@@ -238,8 +238,7 @@ AttributeManager::AttributeManager(const vespalib::string &baseDir,
                                    const vespalib::string &documentSubDbName,
                                    const TuneFileAttributes &tuneFileAttributes,
                                    const FileHeaderContext &fileHeaderContext,
-                                   search::ISequencedTaskExecutor &
-                                   attributeFieldWriter,
+                                   vespalib::ISequencedTaskExecutor &attributeFieldWriter,
                                    const HwInfo &hwInfo)
     : proton::IAttributeManager(),
       _attributes(),
@@ -262,8 +261,7 @@ AttributeManager::AttributeManager(const vespalib::string &baseDir,
                                    const vespalib::string &documentSubDbName,
                                    const search::TuneFileAttributes &tuneFileAttributes,
                                    const search::common::FileHeaderContext &fileHeaderContext,
-                                   search::ISequencedTaskExecutor &
-                                   attributeFieldWriter,
+                                   vespalib::ISequencedTaskExecutor &attributeFieldWriter,
                                    const IAttributeFactory::SP &factory,
                                    const HwInfo &hwInfo)
     : proton::IAttributeManager(),
@@ -548,7 +546,7 @@ AttributeManager::pruneRemovedFields(search::SerialNum serialNum)
     }
 }
 
-search::ISequencedTaskExecutor &
+vespalib::ISequencedTaskExecutor &
 AttributeManager::getAttributeFieldWriter() const
 {
     return _attributeFieldWriter;
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.h b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.h
index 881452c6b3d..350b986add4 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.h
@@ -77,7 +77,7 @@ private:
     const search::common::FileHeaderContext &_fileHeaderContext;
     IAttributeFactory::SP _factory;
     std::shared_ptr<search::attribute::Interlock> _interlock;
-    search::ISequencedTaskExecutor &_attributeFieldWriter;
+    vespalib::ISequencedTaskExecutor &_attributeFieldWriter;
     HwInfo _hwInfo;
     std::unique_ptr<ImportedAttributesRepo> _importedAttributes;
 
@@ -103,14 +103,14 @@ public:
                      const vespalib::string &documentSubDbName,
                      const search::TuneFileAttributes &tuneFileAttributes,
                      const search::common::FileHeaderContext & fileHeaderContext,
-                     search::ISequencedTaskExecutor &attributeFieldWriter,
+                     vespalib::ISequencedTaskExecutor &attributeFieldWriter,
                      const HwInfo &hwInfo);
 
     AttributeManager(const vespalib::string &baseDir,
                      const vespalib::string &documentSubDbName,
                      const search::TuneFileAttributes &tuneFileAttributes,
                      const search::common::FileHeaderContext & fileHeaderContext,
-                     search::ISequencedTaskExecutor &attributeFieldWriter,
+                     vespalib::ISequencedTaskExecutor &attributeFieldWriter,
                      const IAttributeFactory::SP &factory,
                      const HwInfo &hwInfo);
 
@@ -164,7 +164,7 @@ public:
 
     const IAttributeFactory::SP &getFactory() const override { return _factory; }
 
-    search::ISequencedTaskExecutor &getAttributeFieldWriter() const override;
+    vespalib::ISequencedTaskExecutor &getAttributeFieldWriter() const override;
 
     search::AttributeVector *getWritableAttribute(const vespalib::string &name) const override;
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/exclusive_attribute_read_accessor.cpp b/searchcore/src/vespa/searchcore/proton/attribute/exclusive_attribute_read_accessor.cpp
index 7a31580fb16..9543897407d 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/exclusive_attribute_read_accessor.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/exclusive_attribute_read_accessor.cpp
@@ -3,12 +3,12 @@
 #include "exclusive_attribute_read_accessor.h"
 #include <vespa/vespalib/util/gate.h>
 #include <vespa/searchlib/attribute/attributevector.h>
-#include <vespa/searchlib/common/isequencedtaskexecutor.h>
+#include <vespa/vespalib/util/isequencedtaskexecutor.h>
 
 namespace proton {
 
 using search::AttributeVector;
-using search::ISequencedTaskExecutor;
+using vespalib::ISequencedTaskExecutor;
 using vespalib::Executor;
 using vespalib::Gate;
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/exclusive_attribute_read_accessor.h b/searchcore/src/vespa/searchcore/proton/attribute/exclusive_attribute_read_accessor.h
index 00f3ad3e8ac..233d42b2194 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/exclusive_attribute_read_accessor.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/exclusive_attribute_read_accessor.h
@@ -6,9 +6,11 @@
 
 namespace search {
     class AttributeVector;
+}
+namespace vespalib {
+    class Gate;
     class ISequencedTaskExecutor;
 }
-namespace vespalib { class Gate; }
 
 namespace proton {
 
@@ -38,13 +40,13 @@ public:
 private:
     using AttributeVectorSP = std::shared_ptr<search::AttributeVector>;
     AttributeVectorSP _attribute;
-    search::ISequencedTaskExecutor &_attributeFieldWriter;
+    vespalib::ISequencedTaskExecutor &_attributeFieldWriter;
 
 public:
     using UP = std::unique_ptr<ExclusiveAttributeReadAccessor>;
 
     ExclusiveAttributeReadAccessor(const AttributeVectorSP &attribute,
-                                   search::ISequencedTaskExecutor &attributeFieldWriter);
+                                   vespalib::ISequencedTaskExecutor &attributeFieldWriter);
     Guard::UP takeGuard();
 };
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.cpp b/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.cpp
index aee68457b62..0fd9849443a 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.cpp
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "filter_attribute_manager.h"
-#include <vespa/searchlib/common/isequencedtaskexecutor.h>
+#include <vespa/vespalib/util/isequencedtaskexecutor.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/searchlib/attribute/attributevector.h>
 #include <vespa/searchcommon/attribute/i_attribute_functor.h>
@@ -161,7 +161,7 @@ FilterAttributeManager::getFlushedSerialNum(const vespalib::string &name) const
 }
 
 
-search::ISequencedTaskExecutor &
+vespalib::ISequencedTaskExecutor &
 FilterAttributeManager::getAttributeFieldWriter() const
 {
     return _mgr->getAttributeFieldWriter();
@@ -190,7 +190,7 @@ FilterAttributeManager::asyncForEachAttribute(std::shared_ptr<IConstAttributeFun
     // Run by document db master thread
     std::vector<AttributeGuard> completeList;
     _mgr->getAttributeList(completeList);
-    search::ISequencedTaskExecutor &attributeFieldWriter = getAttributeFieldWriter();
+    vespalib::ISequencedTaskExecutor &attributeFieldWriter = getAttributeFieldWriter();
     for (auto &guard : completeList) {
         search::AttributeVector::SP attrsp = guard.getSP();
         // Name must be extracted in document db master thread or attribute
@@ -204,7 +204,7 @@ void
 FilterAttributeManager::asyncForAttribute(const vespalib::string &name, std::unique_ptr<IAttributeFunctor> func) const {
     AttributeGuard::UP attr = _mgr->getAttribute(name);
     if (!attr) { return; }
-    search::ISequencedTaskExecutor &attributeFieldWriter = getAttributeFieldWriter();
+    vespalib::ISequencedTaskExecutor &attributeFieldWriter = getAttributeFieldWriter();
     vespalib::string attrName = (*attr)->getNamePrefix();
     attributeFieldWriter.execute(attributeFieldWriter.getExecutorId(attrName),
                                   [attr=std::move(attr), func=std::move(func)]() mutable {
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.h b/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.h
index 0bd04b8f0a5..3755946037d 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.h
@@ -46,7 +46,7 @@ public:
     void getAttributeListAll(std::vector<search::AttributeGuard> &) const override;
     void pruneRemovedFields(search::SerialNum serialNum) override;
     const IAttributeFactory::SP &getFactory() const override;
-    search::ISequencedTaskExecutor & getAttributeFieldWriter() const override;
+    vespalib::ISequencedTaskExecutor & getAttributeFieldWriter() const override;
 
     search::AttributeVector * getWritableAttribute(const vespalib::string &name) const override;
     const std::vector<search::AttributeVector *> & getWritableAttributes() const override;
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp
index ee1c06ef7c1..0a61ec8d882 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp
@@ -10,9 +10,9 @@
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/vespalib/util/closuretask.h>
 #include <vespa/searchlib/common/serialnumfileheadercontext.h>
-#include <vespa/searchlib/common/isequencedtaskexecutor.h>
 #include <vespa/searchlib/attribute/attributememorysavetarget.h>
 #include <vespa/searchlib/attribute/attributevector.h>
+#include <vespa/vespalib/util/isequencedtaskexecutor.h>
 #include <vespa/vespalib/util/stringfmt.h>
 #include <fstream>
 #include <future>
@@ -154,7 +154,7 @@ FlushableAttribute::FlushableAttribute(const AttributeVectorSP attr,
                                        tuneFileAttributes,
                                        const FileHeaderContext &
                                        fileHeaderContext,
-                                       search::ISequencedTaskExecutor &
+                                       vespalib::ISequencedTaskExecutor &
                                        attributeFieldWriter,
                                        const HwInfo &hwInfo)
     : IFlushTarget(make_string("attribute.flush.%s", attr->getName().c_str()), Type::SYNC, Component::ATTRIBUTE),
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.h b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.h
index 01178dbe86c..8d807c153c0 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.h
@@ -7,14 +7,10 @@
 #include <vespa/searchcore/proton/common/hw_info.h>
 
 
-namespace search {
+namespace search { class AttributeVector; }
 
-class ISequencedTaskExecutor;
-class AttributeVector;
-
-namespace common { class FileHeaderContext; }
-
-}
+namespace search::common { class FileHeaderContext; }
+namespace vespalib { class ISequencedTaskExecutor; }
 
 namespace proton {
 
@@ -39,7 +35,7 @@ private:
     FlushStats                  _lastStats;
     const search::TuneFileAttributes _tuneFileAttributes;
     const search::common::FileHeaderContext &_fileHeaderContext;
-    search::ISequencedTaskExecutor &_attributeFieldWriter;
+    vespalib::ISequencedTaskExecutor &_attributeFieldWriter;
     HwInfo                       _hwInfo;
     std::shared_ptr<AttributeDirectory> _attrDir;
 
@@ -59,7 +55,7 @@ public:
                        const search::TuneFileAttributes &tuneFileAttributes,
                        const search::common::FileHeaderContext &
                        fileHeaderContext,
-                       search::ISequencedTaskExecutor &attributeFieldWriter,
+                       vespalib::ISequencedTaskExecutor &attributeFieldWriter,
                        const HwInfo &hwInfo);
 
     virtual
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_manager.h b/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_manager.h
index 4e50c52c58b..25d0a508438 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_manager.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/i_attribute_manager.h
@@ -10,12 +10,12 @@
 #include <vespa/searchlib/attribute/iattributemanager.h>
 #include <vespa/searchlib/common/serialnum.h>
 
-namespace search {
-    class IDestructorCallback;
-    class ISequencedTaskExecutor;
-}
+namespace search { class IDestructorCallback;}
+
 namespace search::attribute { class IAttributeFunctor; }
 
+namespace vespalib { class ISequencedTaskExecutor; }
+
 namespace proton {
 
 class ImportedAttributesRepo;
@@ -72,7 +72,7 @@ struct IAttributeManager : public search::IAttributeManager
      */
     virtual const IAttributeFactory::SP &getFactory() const = 0;
 
-    virtual search::ISequencedTaskExecutor &getAttributeFieldWriter() const = 0;
+    virtual vespalib::ISequencedTaskExecutor &getAttributeFieldWriter() const = 0;
 
     /*
      * Get pointer to named writable attribute.  If attribute isn't
diff --git a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.cpp b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.cpp
index 7f2ac5db768..fa531385d52 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.cpp
@@ -28,7 +28,7 @@ using search::AttributeGuard;
 using search::AttributeVector;
 using search::IAttributeManager;
 using search::NotImplementedAttribute;
-using search::ISequencedTaskExecutor;
+using vespalib::ISequencedTaskExecutor;
 using vespa::config::search::ImportedFieldsConfig;
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.h b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.h
index 6ac804f538a..03d6a64345c 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/document_db_reference_resolver.h
@@ -6,11 +6,23 @@
 #include <vespa/searchlib/attribute/not_implemented_attribute.h>
 #include <map>
 
-namespace document { class DocumentType; class DocumentTypeRepo; }
-namespace search { class ISequencedTaskExecutor; class IAttributeManager; struct IDocumentMetaStoreContext;
-    namespace attribute { class IAttributeVector; class ReferenceAttribute; } }
-namespace vespa { namespace config { namespace search { namespace internal { class InternalImportedFieldsType; } } } }
+namespace document {
+    class DocumentType;
+    class DocumentTypeRepo;
+}
+namespace search {
+    class IAttributeManager;
+    struct IDocumentMetaStoreContext;
+}
+namespace search::attribute {
+    class IAttributeVector;
+    class ReferenceAttribute;
+}
+namespace vespa::config::search::internal { class InternalImportedFieldsType; }
 
+namespace vespalib {
+    class ISequencedTaskExecutor;
+}
 namespace proton {
 
 class IDocumentDBReference;
@@ -27,12 +39,12 @@ class DocumentDBReferenceResolver : public IDocumentDBReferenceResolver {
 private:
     using ImportedFieldsConfig = const vespa::config::search::internal::InternalImportedFieldsType;
     const IDocumentDBReferenceRegistry &_registry;
-    const document::DocumentType &_thisDocType;
-    const ImportedFieldsConfig &_importedFieldsCfg;
-    const document::DocumentType &_prevThisDocType;
-    MonitoredRefCount              &_refCount;
-    search::ISequencedTaskExecutor &_attributeFieldWriter;
-    bool                            _useReferences;
+    const document::DocumentType       &_thisDocType;
+    const ImportedFieldsConfig         &_importedFieldsCfg;
+    const document::DocumentType       &_prevThisDocType;
+    MonitoredRefCount                  &_refCount;
+    vespalib::ISequencedTaskExecutor     &_attributeFieldWriter;
+    bool                                _useReferences;
     std::map<vespalib::string, std::unique_ptr<GidToLidChangeRegistrator>> _registrators;
 
     GidToLidChangeRegistrator &getRegistrator(const vespalib::string &docTypeName);
@@ -50,7 +62,7 @@ public:
                                 const ImportedFieldsConfig &importedFieldsCfg,
                                 const document::DocumentType &prevThisDocType,
                                 MonitoredRefCount &refCount,
-                                search::ISequencedTaskExecutor &attributeFieldWriter,
+                                vespalib::ISequencedTaskExecutor &attributeFieldWriter,
                                 bool useReferences);
     ~DocumentDBReferenceResolver() override;
 
diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_listener.cpp b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_listener.cpp
index 46096fead05..7d5eabe7de8 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_listener.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_listener.cpp
@@ -3,10 +3,9 @@
 #include "gid_to_lid_change_listener.h"
 #include <future>
 
-
 namespace proton {
 
-GidToLidChangeListener::GidToLidChangeListener(search::ISequencedTaskExecutor &attributeFieldWriter,
+GidToLidChangeListener::GidToLidChangeListener(vespalib::ISequencedTaskExecutor &attributeFieldWriter,
                                                std::shared_ptr<search::attribute::ReferenceAttribute> attr,
                                                MonitoredRefCount &refCount,
                                                const vespalib::string &name,
diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_listener.h b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_listener.h
index d4c349bd1d7..7b033b9899f 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_listener.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_change_listener.h
@@ -4,7 +4,7 @@
 
 #include "i_gid_to_lid_change_listener.h"
 #include <vespa/searchlib/attribute/reference_attribute.h>
-#include <vespa/searchlib/common/sequencedtaskexecutor.h>
+#include <vespa/vespalib/util/sequencedtaskexecutor.h>
 #include <vespa/searchcore/proton/common/monitored_refcount.h>
 
 namespace proton {
@@ -15,25 +15,25 @@ namespace proton {
  */
 class GidToLidChangeListener : public IGidToLidChangeListener
 {
-    search::ISequencedTaskExecutor                        &_attributeFieldWriter;
-    search::ISequencedTaskExecutor::ExecutorId             _executorId;
+    vespalib::ISequencedTaskExecutor                      &_attributeFieldWriter;
+    vespalib::ISequencedTaskExecutor::ExecutorId           _executorId;
     std::shared_ptr<search::attribute::ReferenceAttribute> _attr;
     MonitoredRefCount                                     &_refCount;
     vespalib::string                                       _name;
     vespalib::string                                       _docTypeName;
 
 public:
-    GidToLidChangeListener(search::ISequencedTaskExecutor &attributeFieldWriter,
+    GidToLidChangeListener(vespalib::ISequencedTaskExecutor &attributeFieldWriter,
                            std::shared_ptr<search::attribute::ReferenceAttribute> attr,
                            MonitoredRefCount &refCount,
                            const vespalib::string &name,
                            const vespalib::string &docTypeName);
-    virtual ~GidToLidChangeListener();
-    virtual void notifyPutDone(document::GlobalId gid, uint32_t lid) override;
-    virtual void notifyRemove(document::GlobalId gid) override;
-    virtual void notifyRegistered() override;
-    virtual const vespalib::string &getName() const override;
-    virtual const vespalib::string &getDocTypeName() const override;
+    ~GidToLidChangeListener() override;
+    void notifyPutDone(document::GlobalId gid, uint32_t lid) override;
+    void notifyRemove(document::GlobalId gid) override;
+    void notifyRegistered() override;
+    const vespalib::string &getName() const override;
+    const vespalib::string &getDocTypeName() const override;
     const std::shared_ptr<search::attribute::ReferenceAttribute> &getReferenceAttribute() const { return _attr; }
 };
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
index a725b00d485..e3657eefdc8 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.cpp
@@ -2,7 +2,7 @@
 
 #include "executorthreadingservice.h"
 #include <vespa/searchcore/proton/metrics/executor_threading_service_stats.h>
-#include <vespa/searchlib/common/sequencedtaskexecutor.h>
+#include <vespa/vespalib/util/sequencedtaskexecutor.h>
 #include <vespa/vespalib/util/singleexecutor.h>
 #include <vespa/vespalib/util/blockingthreadstackexecutor.h>
 
@@ -10,7 +10,7 @@
 using vespalib::SyncableThreadExecutor;
 using vespalib::BlockingThreadStackExecutor;
 using vespalib::SingleExecutor;
-using search::SequencedTaskExecutor;
+using vespalib::SequencedTaskExecutor;
 using OptimizeFor = vespalib::Executor::OptimizeFor;
 
 namespace proton {
@@ -101,17 +101,17 @@ ExecutorThreadingService::getStats()
                                          _attributeFieldWriter->getStats());
 }
 
-search::ISequencedTaskExecutor &
+vespalib::ISequencedTaskExecutor &
 ExecutorThreadingService::indexFieldInverter() {
     return *_indexFieldInverter;
 }
 
-search::ISequencedTaskExecutor &
+vespalib::ISequencedTaskExecutor &
 ExecutorThreadingService::indexFieldWriter() {
     return *_indexFieldWriter;
 }
 
-search::ISequencedTaskExecutor &
+vespalib::ISequencedTaskExecutor &
 ExecutorThreadingService::attributeFieldWriter() {
     return *_attributeFieldWriter;
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h
index 4d018e2b6f3..dc446a202ec 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h
+++ b/searchcore/src/vespa/searchcore/proton/server/executorthreadingservice.h
@@ -16,16 +16,16 @@ class ExecutorThreadingServiceStats;
 class ExecutorThreadingService : public searchcorespi::index::IThreadingService
 {
 private:
-    vespalib::SyncableThreadExecutor                 & _sharedExecutor;
-    vespalib::ThreadStackExecutor                      _masterExecutor;
-    std::unique_ptr<vespalib::SyncableThreadExecutor>  _indexExecutor;
-    std::unique_ptr<vespalib::SyncableThreadExecutor>  _summaryExecutor;
-    ExecutorThreadService                              _masterService;
-    ExecutorThreadService                              _indexService;
-    ExecutorThreadService                              _summaryService;
-    std::unique_ptr<search::ISequencedTaskExecutor>    _indexFieldInverter;
-    std::unique_ptr<search::ISequencedTaskExecutor>    _indexFieldWriter;
-    std::unique_ptr<search::ISequencedTaskExecutor>    _attributeFieldWriter;
+    vespalib::SyncableThreadExecutor                   & _sharedExecutor;
+    vespalib::ThreadStackExecutor                        _masterExecutor;
+    std::unique_ptr<vespalib::SyncableThreadExecutor>    _indexExecutor;
+    std::unique_ptr<vespalib::SyncableThreadExecutor>    _summaryExecutor;
+    ExecutorThreadService                                _masterService;
+    ExecutorThreadService                                _indexService;
+    ExecutorThreadService                                _summaryService;
+    std::unique_ptr<vespalib::ISequencedTaskExecutor>    _indexFieldInverter;
+    std::unique_ptr<vespalib::ISequencedTaskExecutor>    _indexFieldWriter;
+    std::unique_ptr<vespalib::ISequencedTaskExecutor>    _attributeFieldWriter;
 
 public:
     using OptimizeFor = vespalib::Executor::OptimizeFor;
@@ -79,9 +79,9 @@ public:
         return _sharedExecutor;
     }
 
-    search::ISequencedTaskExecutor &indexFieldInverter() override;
-    search::ISequencedTaskExecutor &indexFieldWriter() override;
-    search::ISequencedTaskExecutor &attributeFieldWriter() override;
+    vespalib::ISequencedTaskExecutor &indexFieldInverter() override;
+    vespalib::ISequencedTaskExecutor &indexFieldWriter() override;
+    vespalib::ISequencedTaskExecutor &attributeFieldWriter() override;
     ExecutorThreadingServiceStats getStats();
 };
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp
index dfe98b44adc..c24790a61f4 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp
@@ -6,7 +6,7 @@
 #include "removedonecontext.h"
 #include "putdonecontext.h"
 #include <vespa/searchcore/proton/feedoperation/operations.h>
-#include <vespa/searchlib/common/isequencedtaskexecutor.h>
+#include <vespa/vespalib/util/isequencedtaskexecutor.h>
 
 using document::Document;
 using document::DocumentUpdate;
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
index eab118c1188..e0d873152cd 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp
@@ -4,13 +4,9 @@
 #include "forcecommitcontext.h"
 #include "operationdonecontext.h"
 #include "removedonecontext.h"
-#include <vespa/searchcore/proton/common/feedtoken.h>
 #include <vespa/searchcore/proton/documentmetastore/ilidreusedelayer.h>
 #include <vespa/searchcore/proton/feedoperation/compact_lid_space_operation.h>
-#include <vespa/searchlib/common/isequencedtaskexecutor.h>
-#include <vespa/vespalib/text/stringtokenizer.h>
-#include <vespa/vespalib/util/closuretask.h>
-#include <vespa/vespalib/util/exceptions.h>
+#include <vespa/vespalib/util/isequencedtaskexecutor.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.searchable_feed_view");
@@ -23,8 +19,6 @@ using document::DocumentUpdate;
 using search::index::Schema;
 using storage::spi::BucketInfoResult;
 using storage::spi::Timestamp;
-using vespalib::IllegalStateException;
-using vespalib::make_string;
 using vespalib::makeLambdaTask;
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
index 6397195da93..a6695f6318d 100644
--- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp
@@ -18,7 +18,7 @@
 #include <vespa/searchcore/proton/documentmetastore/ilidreusedelayer.h>
 #include <vespa/searchcore/proton/feedoperation/operations.h>
 #include <vespa/searchcore/proton/reference/i_gid_to_lid_change_handler.h>
-#include <vespa/searchlib/common/isequencedtaskexecutor.h>
+#include <vespa/vespalib/util/isequencedtaskexecutor.h>
 #include <vespa/vespalib/util/exceptions.h>
 
 #include <vespa/log/log.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/visibilityhandler.cpp b/searchcore/src/vespa/searchcore/proton/server/visibilityhandler.cpp
index 58000348ecf..1281785e898 100644
--- a/searchcore/src/vespa/searchcore/proton/server/visibilityhandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/visibilityhandler.cpp
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "visibilityhandler.h"
-#include <vespa/searchlib/common/isequencedtaskexecutor.h>
+#include <vespa/vespalib/util/isequencedtaskexecutor.h>
 #include <vespa/vespalib/util/closuretask.h>
 
 using vespalib::makeTask;
diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h b/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h
index 57c86855217..3e49bb449ff 100644
--- a/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h
+++ b/searchcore/src/vespa/searchcore/proton/test/mock_attribute_manager.h
@@ -55,7 +55,7 @@ public:
     const IAttributeFactory::SP &getFactory() const override {
         HDR_ABORT("should not be reached");
     }
-    search::ISequencedTaskExecutor &getAttributeFieldWriter() const override {
+    vespalib::ISequencedTaskExecutor &getAttributeFieldWriter() const override {
         HDR_ABORT("should not be reached");
     }
     search::AttributeVector *getWritableAttribute(const vespalib::string &) const override {
diff --git a/searchcore/src/vespa/searchcore/proton/test/threading_service_observer.h b/searchcore/src/vespa/searchcore/proton/test/threading_service_observer.h
index 23c62d179b1..7f6e7b40635 100644
--- a/searchcore/src/vespa/searchcore/proton/test/threading_service_observer.h
+++ b/searchcore/src/vespa/searchcore/proton/test/threading_service_observer.h
@@ -4,7 +4,7 @@
 #include "executor_observer.h"
 #include "thread_service_observer.h"
 #include <vespa/searchcorespi/index/ithreadingservice.h>
-#include <vespa/searchlib/common/sequencedtaskexecutorobserver.h>
+#include <vespa/vespalib/util/sequencedtaskexecutorobserver.h>
 
 namespace proton:: test {
 
@@ -16,9 +16,9 @@ private:
     ThreadServiceObserver _index;
     ThreadServiceObserver _summary;
     vespalib::ThreadExecutor & _shared;
-    search::SequencedTaskExecutorObserver _indexFieldInverter;
-    search::SequencedTaskExecutorObserver _indexFieldWriter;
-    search::SequencedTaskExecutorObserver _attributeFieldWriter;
+    vespalib::SequencedTaskExecutorObserver _indexFieldInverter;
+    vespalib::SequencedTaskExecutorObserver _indexFieldWriter;
+    vespalib::SequencedTaskExecutorObserver _attributeFieldWriter;
 
 public:
     ThreadingServiceObserver(searchcorespi::index::IThreadingService &service);
@@ -32,14 +32,14 @@ public:
     const ThreadServiceObserver &summaryObserver() const {
         return _summary;
     }
-    const search::SequencedTaskExecutorObserver &indexFieldInverterObserver() const {
+    const vespalib::SequencedTaskExecutorObserver &indexFieldInverterObserver() const {
         return _indexFieldInverter;
     }
-    const search::SequencedTaskExecutorObserver &indexFieldWriterObserver() const {
+    const vespalib::SequencedTaskExecutorObserver &indexFieldWriterObserver() const {
         return _indexFieldWriter;
     }
 
-    const search::SequencedTaskExecutorObserver &attributeFieldWriterObserver() const {
+    const vespalib::SequencedTaskExecutorObserver &attributeFieldWriterObserver() const {
         return _attributeFieldWriter;
     }
 
@@ -59,14 +59,14 @@ public:
     vespalib::ThreadExecutor &shared() override {
         return _shared;
     }
-    search::ISequencedTaskExecutor &indexFieldInverter() override {
+    vespalib::ISequencedTaskExecutor &indexFieldInverter() override {
         return _indexFieldInverter;
     }
-    search::ISequencedTaskExecutor &indexFieldWriter() override {
+    vespalib::ISequencedTaskExecutor &indexFieldWriter() override {
         return _indexFieldWriter;
     }
 
-    search::ISequencedTaskExecutor &attributeFieldWriter() override {
+    vespalib::ISequencedTaskExecutor &attributeFieldWriter() override {
         return _attributeFieldWriter;
     }