Move state_server, metrivs and some all executors from staging_vespalib too vespalib.

179 files changed, 189 insertions, 214 deletions

diff --git a/configd/src/apps/sentinel/env.h b/configd/src/apps/sentinel/env.h
index 01531c425bf..ec3e201cf5e 100644
--- a/configd/src/apps/sentinel/env.h
+++ b/configd/src/apps/sentinel/env.h
@@ -8,7 +8,7 @@
 #include "model-owner.h"
 #include "rpcserver.h"
 #include "state-api.h"
-#include <vespa/vespalib/net/state_server.h>
+#include <vespa/vespalib/net/http/state_server.h>
 
 namespace config::sentinel {
 
diff --git a/configd/src/apps/sentinel/manager.h b/configd/src/apps/sentinel/manager.h
index 48c95fe7a3d..ac2e2a56785 100644
--- a/configd/src/apps/sentinel/manager.h
+++ b/configd/src/apps/sentinel/manager.h
@@ -8,7 +8,7 @@
 #include "service.h"
 #include "state-api.h"
 #include <vespa/config-sentinel.h>
-#include <vespa/vespalib/net/state_server.h>
+#include <vespa/vespalib/net/http/state_server.h>
 #include <sys/types.h>
 #include <sys/select.h>
 
diff --git a/configd/src/apps/sentinel/state-api.h b/configd/src/apps/sentinel/state-api.h
index 2cb2d381821..e00a0e0ba05 100644
--- a/configd/src/apps/sentinel/state-api.h
+++ b/configd/src/apps/sentinel/state-api.h
@@ -2,17 +2,15 @@
 
 #pragma once
 
-#include <vespa/vespalib/net/simple_health_producer.h>
-#include <vespa/vespalib/net/simple_component_config_producer.h>
+#include <vespa/vespalib/net/http/simple_health_producer.h>
+#include <vespa/vespalib/net/http/simple_component_config_producer.h>
 #include <vespa/vespalib/metrics/simple_metrics.h>
 
-namespace config {
-namespace sentinel {
+namespace config::sentinel {
 
 struct StateApi {
     vespalib::SimpleHealthProducer myHealth;
     vespalib::SimpleComponentConfigProducer myComponents;
 };
 
-} // namespace config::sentinel
-} // namespace config
+}
diff --git a/logd/src/logd/state_reporter.h b/logd/src/logd/state_reporter.h
index 1b00a2fe662..eef5df3fce9 100644
--- a/logd/src/logd/state_reporter.h
+++ b/logd/src/logd/state_reporter.h
@@ -1,10 +1,10 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/vespalib/net/state_server.h>
-#include <vespa/vespalib/net/simple_health_producer.h>
-#include <vespa/vespalib/net/simple_component_config_producer.h>
-#include <vespa/vespalib/net/generic_state_handler.h>
+#include <vespa/vespalib/net/http/state_server.h>
+#include <vespa/vespalib/net/http/simple_health_producer.h>
+#include <vespa/vespalib/net/http/simple_component_config_producer.h>
+#include <vespa/vespalib/net/http/generic_state_handler.h>
 #include <vespa/vespalib/metrics/metrics_manager.h>
 #include <vespa/vespalib/metrics/producer.h>
 
diff --git a/metrics/src/vespa/metrics/state_api_adapter.h b/metrics/src/vespa/metrics/state_api_adapter.h
index b097727e974..c78d302a820 100644
--- a/metrics/src/vespa/metrics/state_api_adapter.h
+++ b/metrics/src/vespa/metrics/state_api_adapter.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <vespa/vespalib/net/metrics_producer.h>
+#include <vespa/vespalib/net/http/metrics_producer.h>
 
 namespace metrics {
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_explorer.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_explorer.h
index 3d9dbda0cbc..3de4779c77a 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_explorer.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "i_attribute_manager.h"
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace proton {
 
@@ -19,10 +19,9 @@ public:
     AttributeManagerExplorer(const proton::IAttributeManager::SP &mgr);
     ~AttributeManagerExplorer();
 
-    // Implements vespalib::StateExplorer
-    virtual void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
-    virtual std::vector<vespalib::string> get_children_names() const override;
-    virtual std::unique_ptr<StateExplorer> get_child(vespalib::stringref name) const override;
+    void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
+    std::vector<vespalib::string> get_children_names() const override;
+    std::unique_ptr<StateExplorer> get_child(vespalib::stringref name) const override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_vector_explorer.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_vector_explorer.h
index f0ad134d2f4..204a81ed629 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_vector_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_vector_explorer.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "exclusive_attribute_read_accessor.h"
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace proton {
 
@@ -19,7 +19,7 @@ public:
     AttributeVectorExplorer(ExclusiveAttributeReadAccessor::UP attribute);
 
     // Implements vespalib::StateExplorer
-    virtual void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
+    void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/bucket_db_explorer.h b/searchcore/src/vespa/searchcore/proton/bucketdb/bucket_db_explorer.h
index 898a8579255..71448e6fad1 100644
--- a/searchcore/src/vespa/searchcore/proton/bucketdb/bucket_db_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/bucketdb/bucket_db_explorer.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "bucket_db_owner.h"
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/document_store_explorer.h b/searchcore/src/vespa/searchcore/proton/docsummary/document_store_explorer.h
index d3530532c36..9675911d111 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/document_store_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/document_store_explorer.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "isummarymanager.h"
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace proton {
 
@@ -18,8 +18,7 @@ private:
 public:
     DocumentStoreExplorer(ISummaryManager::SP mgr);
 
-    // Implements vespalib::StateExplorer
-    virtual void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
+    void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_explorer.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_explorer.h
index e4aa7aec44b..978fd0b4a14 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_explorer.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "i_document_meta_store_context.h"
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace proton {
 
@@ -18,8 +18,7 @@ private:
 public:
     DocumentMetaStoreExplorer(IDocumentMetaStoreContext::IReadGuard::UP metaStore);
 
-    // Implements vespalib::StateExplorer
-    virtual void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
+    void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/flush_engine_explorer.h b/searchcore/src/vespa/searchcore/proton/flushengine/flush_engine_explorer.h
index 27c3f705dcb..0658ba450e3 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/flush_engine_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/flush_engine_explorer.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace proton {
 
@@ -19,8 +19,7 @@ private:
 public:
     FlushEngineExplorer(const FlushEngine &engine);
 
-    // Implements vespalib::StateExplorer
-    virtual void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
+    void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.h b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.h
index 0cce9be0f85..1fe3a7092ef 100644
--- a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.h
+++ b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.h
@@ -6,7 +6,7 @@
 #include <vespa/searchcore/proton/common/handlermap.hpp>
 #include <vespa/searchcore/proton/common/statusreport.h>
 #include <vespa/searchlib/engine/searchapi.h>
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 #include <vespa/vespalib/util/simple_thread_bundle.h>
 #include <mutex>
diff --git a/searchcore/src/vespa/searchcore/proton/matching/session_manager_explorer.h b/searchcore/src/vespa/searchcore/proton/matching/session_manager_explorer.h
index 19034472ea3..b9c30de6db8 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/session_manager_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/session_manager_explorer.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace proton::matching {
 
@@ -18,9 +18,9 @@ private:
 
 public:
     SessionManagerExplorer(const SessionManager &manager) : _manager(manager) {}
-    virtual void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
-    virtual std::vector<vespalib::string> get_children_names() const override;
-    virtual std::unique_ptr<vespalib::StateExplorer> get_child(vespalib::stringref name) const override;
+    void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
+    std::vector<vespalib::string> get_children_names() const override;
+    std::unique_ptr<vespalib::StateExplorer> get_child(vespalib::stringref name) const override;
 };
 
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_db_explorer.h b/searchcore/src/vespa/searchcore/proton/server/document_db_explorer.h
index b514a5169e7..763a541ecaa 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_db_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/document_db_explorer.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_subdb_collection_explorer.h b/searchcore/src/vespa/searchcore/proton/server/document_subdb_collection_explorer.h
index 47ea6be1711..6aec86e5378 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_subdb_collection_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/document_subdb_collection_explorer.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "documentsubdbcollection.h"
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace proton {
 
@@ -18,10 +18,9 @@ private:
 public:
     DocumentSubDBCollectionExplorer(const DocumentSubDBCollection &subDbs);
 
-    // Implements vespalib::StateExplorer
-    virtual void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
-    virtual std::vector<vespalib::string> get_children_names() const override;
-    virtual std::unique_ptr<StateExplorer> get_child(vespalib::stringref name) const override;
+    void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
+    std::vector<vespalib::string> get_children_names() const override;
+    std::unique_ptr<StateExplorer> get_child(vespalib::stringref name) const override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_subdb_explorer.h b/searchcore/src/vespa/searchcore/proton/server/document_subdb_explorer.h
index f23b6b12c6c..61d0d00d69e 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_subdb_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/document_subdb_explorer.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "idocumentsubdb.h"
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace proton {
 
@@ -18,10 +18,9 @@ private:
 public:
     DocumentSubDBExplorer(const IDocumentSubDB &subDb);
 
-    // Implements vespalib::StateExplorer
-    virtual void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
-    virtual std::vector<vespalib::string> get_children_names() const override;
-    virtual std::unique_ptr<StateExplorer> get_child(vespalib::stringref name) const override;
+    void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
+    std::vector<vespalib::string> get_children_names() const override;
+    std::unique_ptr<StateExplorer> get_child(vespalib::stringref name) const override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/executor_threading_service_explorer.h b/searchcore/src/vespa/searchcore/proton/server/executor_threading_service_explorer.h
index f0bb20ab64e..46071027855 100644
--- a/searchcore/src/vespa/searchcore/proton/server/executor_threading_service_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/executor_threading_service_explorer.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace searchcorespi::index { struct IThreadingService; }
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/health_adapter.h b/searchcore/src/vespa/searchcore/proton/server/health_adapter.h
index 59819400027..98abefe3860 100644
--- a/searchcore/src/vespa/searchcore/proton/server/health_adapter.h
+++ b/searchcore/src/vespa/searchcore/proton/server/health_adapter.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <vespa/searchcore/proton/common/statusreport.h>
-#include <vespa/vespalib/net/health_producer.h>
+#include <vespa/vespalib/net/http/health_producer.h>
 
 namespace proton {
 
@@ -14,7 +14,7 @@ private:
 
 public:
     HealthAdapter(const StatusProducer &sp);
-    virtual Health getHealth() const override;
+    Health getHealth() const override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/hw_info_explorer.h b/searchcore/src/vespa/searchcore/proton/server/hw_info_explorer.h
index 22c7163e662..f374bc0d678 100644
--- a/searchcore/src/vespa/searchcore/proton/server/hw_info_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/hw_info_explorer.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include <vespa/searchcore/proton/common/hw_info.h>
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace proton {
 
@@ -18,7 +18,7 @@ private:
 public:
     HwInfoExplorer(const HwInfo& info);
 
-    virtual void get_state(const vespalib::slime::Inserter& inserter, bool full) const override;
+    void get_state(const vespalib::slime::Inserter& inserter, bool full) const override;
 };
 
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenance_controller_explorer.h b/searchcore/src/vespa/searchcore/proton/server/maintenance_controller_explorer.h
index e7b28232df5..76aef09e58c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenance_controller_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenance_controller_explorer.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "maintenancejobrunner.h"
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index b5e70a540ec..c6e352e6df7 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -37,7 +37,7 @@
 #include <vespa/searchlib/transactionlog/translogserverapp.h>
 #include <vespa/searchlib/util/fileheadertk.h>
 #include <vespa/vespalib/io/fileutil.h>
-#include <vespa/vespalib/net/state_server.h>
+#include <vespa/vespalib/net/http/state_server.h>
 #include <vespa/vespalib/util/blockingthreadstackexecutor.h>
 #include <vespa/vespalib/util/cpu_usage.h>
 #include <vespa/vespalib/util/host_name.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.h b/searchcore/src/vespa/searchcore/proton/server/proton.h
index 2407f8335da..6e154159ecc 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.h
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.h
@@ -19,11 +19,11 @@
 #include <vespa/searchcore/proton/persistenceengine/ipersistenceengineowner.h>
 #include <vespa/searchlib/common/fileheadercontext.h>
 #include <vespa/searchlib/engine/monitorapi.h>
-#include <vespa/vespalib/net/component_config_producer.h>
-#include <vespa/vespalib/net/generic_state_handler.h>
-#include <vespa/vespalib/net/json_get_handler.h>
-#include <vespa/vespalib/net/json_handler_repo.h>
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/component_config_producer.h>
+#include <vespa/vespalib/net/http/generic_state_handler.h>
+#include <vespa/vespalib/net/http/json_get_handler.h>
+#include <vespa/vespalib/net/http/json_handler_repo.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 #include <vespa/vespalib/util/varholder.h>
 #include <vespa/vespalib/util/cpu_usage.h>
 #include <mutex>
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.h b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.h
index ddb9c1bed92..0ccf1b1a348 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.h
@@ -6,7 +6,7 @@
 #include "i_proton_configurer.h"
 #include <vespa/document/bucket/bucketspace.h>
 #include <vespa/searchcore/proton/common/doctypename.h>
-#include <vespa/vespalib/net/simple_component_config_producer.h>
+#include <vespa/vespalib/net/http/simple_component_config_producer.h>
 #include <vespa/vespalib/util/monitored_refcount.h>
 #include <map>
 #include <mutex>
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_thread_pools_explorer.h b/searchcore/src/vespa/searchcore/proton/server/proton_thread_pools_explorer.h
index 2cacdd2c336..2891309fb89 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton_thread_pools_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/proton_thread_pools_explorer.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace vespalib {
 class ISequencedTaskExecutor;
diff --git a/searchcore/src/vespa/searchcore/proton/server/resource_usage_explorer.h b/searchcore/src/vespa/searchcore/proton/server/resource_usage_explorer.h
index 0c36b19b7ad..64da36807a1 100644
--- a/searchcore/src/vespa/searchcore/proton/server/resource_usage_explorer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/resource_usage_explorer.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace proton {
 
@@ -22,7 +22,7 @@ public:
     ResourceUsageExplorer(const DiskMemUsageFilter& usage_filter,
                           const ResourceUsageTracker& usage_tracker);
 
-    virtual void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
+    void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcorespi/index/index_manager_explorer.h b/searchcore/src/vespa/searchcorespi/index/index_manager_explorer.h
index 3e52199eeda..90b0bd55615 100644
--- a/searchcore/src/vespa/searchcorespi/index/index_manager_explorer.h
+++ b/searchcore/src/vespa/searchcorespi/index/index_manager_explorer.h
@@ -3,7 +3,7 @@
 #pragma once
 
 #include "iindexmanager.h"
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace searchcorespi {
 
@@ -18,8 +18,7 @@ private:
 public:
     IndexManagerExplorer(IIndexManager::SP mgr);
 
-    // Implements vespalib::StateExplorer
-    virtual void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
+    void get_state(const vespalib::slime::Inserter &inserter, bool full) const override;
 };
 
 } // namespace searchcorespi
diff --git a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.h b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.h
index 6b5fd935b40..191a9670d91 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <vespa/vespalib/net/state_explorer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
 
 namespace search::transactionlog {
 
diff --git a/slobrok/src/vespa/slobrok/server/metrics_producer.h b/slobrok/src/vespa/slobrok/server/metrics_producer.h
index aade6f25c76..c25f3653dc3 100644
--- a/slobrok/src/vespa/slobrok/server/metrics_producer.h
+++ b/slobrok/src/vespa/slobrok/server/metrics_producer.h
@@ -2,8 +2,8 @@
 #pragma once
 
 #include "rpchooks.h"
-#include <vespa/vespalib/net/metrics_producer.h>
-#include <vespa/vespalib/net/simple_metrics_producer.h>
+#include <vespa/vespalib/net/http/metrics_producer.h>
+#include <vespa/vespalib/net/http/simple_metrics_producer.h>
 
 class FNET_Transport;
 
diff --git a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp
index 1bf6596744d..2c64c7fa2df 100644
--- a/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp
+++ b/slobrok/src/vespa/slobrok/server/reconfigurable_stateserver.cpp
@@ -2,7 +2,7 @@
 
 #include "reconfigurable_stateserver.h"
 #include <vespa/vespalib/util/exceptions.h>
-#include <vespa/vespalib/net/state_server.h>
+#include <vespa/vespalib/net/http/state_server.h>
 #include <vespa/config/helper/configfetcher.hpp>
 #include <thread>
 
diff --git a/slobrok/src/vespa/slobrok/server/sbenv.h b/slobrok/src/vespa/slobrok/server/sbenv.h
index aac2d3a0d92..653d4b75818 100644
--- a/slobrok/src/vespa/slobrok/server/sbenv.h
+++ b/slobrok/src/vespa/slobrok/server/sbenv.h
@@ -12,8 +12,8 @@
 #include "union_service_map.h"
 #include <vespa/config-slobroks.h>
 #include <vespa/slobrok/cfg.h>
-#include <vespa/vespalib/net/simple_health_producer.h>
-#include <vespa/vespalib/net/simple_component_config_producer.h>
+#include <vespa/vespalib/net/http/simple_health_producer.h>
+#include <vespa/vespalib/net/http/simple_component_config_producer.h>
 
 class FastOS_ThreadPool;
 class FNET_Transport;
diff --git a/staging_vespalib/CMakeLists.txt b/staging_vespalib/CMakeLists.txt
index 04ad5f85b74..6d65c5046df 100644
--- a/staging_vespalib/CMakeLists.txt
+++ b/staging_vespalib/CMakeLists.txt
@@ -17,13 +17,10 @@ vespa_define_module(
     src/tests/clock
     src/tests/crc
     ${STAGING_VESPALIB_DIRECTIO_TESTDIR}
-    src/tests/encoding/base64
-    src/tests/fileheader
     src/tests/floatingpointtype
     src/tests/growablebytebuffer
     src/tests/json
     src/tests/memorydatastore
-    src/tests/metrics
     src/tests/objectdump
     src/tests/objects
     src/tests/objectselection
@@ -31,19 +28,12 @@ vespa_define_module(
     src/tests/programoptions
     src/tests/rusage
     src/tests/shutdownguard
-    src/tests/state_server
     src/tests/stllike
-    src/tests/sequencedtaskexecutor
-    src/tests/singleexecutor
     ${STAGING_VESPALIB_PROCESS_MEMORY_STATS_TESTDIR}
     src/tests/xmlserializable
 
     LIBS
     src/vespa/vespalib
-    src/vespa/vespalib/data
-    src/vespa/vespalib/encoding
-    src/vespa/vespalib/metrics
-    src/vespa/vespalib/net
     src/vespa/vespalib/objects
     src/vespa/vespalib/stllike
     src/vespa/vespalib/util
diff --git a/staging_vespalib/src/tests/encoding/base64/.gitignore b/staging_vespalib/src/tests/encoding/base64/.gitignore
deleted file mode 100644
index 04f2994a28f..00000000000
--- a/staging_vespalib/src/tests/encoding/base64/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-staging_vespalib_base64_test_app
diff --git a/staging_vespalib/src/tests/encoding/base64/CMakeLists.txt b/staging_vespalib/src/tests/encoding/base64/CMakeLists.txt
deleted file mode 100644
index 2c88ab1dc43..00000000000
--- a/staging_vespalib/src/tests/encoding/base64/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(staging_vespalib_base64_test_app TEST
-    SOURCES
-    base64_test.cpp
-    DEPENDS
-    staging_vespalib
-)
-vespa_add_test(NAME staging_vespalib_base64_test_app COMMAND staging_vespalib_base64_test_app)
diff --git a/staging_vespalib/src/tests/fileheader/CMakeLists.txt b/staging_vespalib/src/tests/fileheader/CMakeLists.txt
deleted file mode 100644
index 0312dddb06a..00000000000
--- a/staging_vespalib/src/tests/fileheader/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(staging_vespalib_fileheader_test_app TEST
-    SOURCES
-    fileheader_test.cpp
-    DEPENDS
-    staging_vespalib
-)
-vespa_add_test(NAME staging_vespalib_fileheader_test_app COMMAND staging_vespalib_fileheader_test_app)
diff --git a/staging_vespalib/src/tests/health_server/.gitignore b/staging_vespalib/src/tests/health_server/.gitignore
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/staging_vespalib/src/tests/health_server/.gitignore
+++ /dev/null
diff --git a/staging_vespalib/src/tests/metrics/CMakeLists.txt b/staging_vespalib/src/tests/metrics/CMakeLists.txt
deleted file mode 100644
index ae5462c28ea..00000000000
--- a/staging_vespalib/src/tests/metrics/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(staging_vespalib_metrics_test_app TEST
-    SOURCES
-    simple_metrics_test.cpp
-    mock_tick.cpp
-    DEPENDS
-    staging_vespalib
-)
-vespa_add_test(NAME staging_vespalib_metrics_test_app COMMAND staging_vespalib_metrics_test_app)
-
-vespa_add_executable(staging_vespalib_stablestore_test_app TEST
-    SOURCES
-    stable_store_test.cpp
-    DEPENDS
-    staging_vespalib
-)
-vespa_add_test(NAME staging_vespalib_stablestore_test_app COMMAND staging_vespalib_stablestore_test_app)
diff --git a/staging_vespalib/src/tests/sequencedtaskexecutor/.gitignore b/staging_vespalib/src/tests/sequencedtaskexecutor/.gitignore
deleted file mode 100644
index 523cfe5e3e1..00000000000
--- a/staging_vespalib/src/tests/sequencedtaskexecutor/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-staging_vespalib_sequencedtaskexecutor_test_app
-staging_vespalib_sequencedtaskexecutor_benchmark_app
-staging_vespalib_adaptive_sequenced_executor_test_app
-staging_vespalib_foregroundtaskexecutor_test_app
diff --git a/staging_vespalib/src/tests/sequencedtaskexecutor/CMakeLists.txt b/staging_vespalib/src/tests/sequencedtaskexecutor/CMakeLists.txt
deleted file mode 100644
index cc851f668da..00000000000
--- a/staging_vespalib/src/tests/sequencedtaskexecutor/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(staging_vespalib_sequencedtaskexecutor_benchmark_app TEST
-    SOURCES
-    sequencedtaskexecutor_benchmark.cpp
-    DEPENDS
-    staging_vespalib
-)
-
-vespa_add_executable(staging_vespalib_sequencedtaskexecutor_test_app TEST
-    SOURCES
-    sequencedtaskexecutor_test.cpp
-    DEPENDS
-    staging_vespalib
-)
-vespa_add_test(NAME staging_vespalib_sequencedtaskexecutor_test_app COMMAND staging_vespalib_sequencedtaskexecutor_test_app)
-
-vespa_add_executable(staging_vespalib_adaptive_sequenced_executor_test_app TEST
-    SOURCES
-    adaptive_sequenced_executor_test.cpp
-    DEPENDS
-    staging_vespalib
-)
-vespa_add_test(NAME staging_vespalib_adaptive_sequenced_executor_test_app COMMAND staging_vespalib_adaptive_sequenced_executor_test_app)
-
-vespa_add_executable(staging_vespalib_foregroundtaskexecutor_test_app TEST
-    SOURCES
-    foregroundtaskexecutor_test.cpp
-    DEPENDS
-    staging_vespalib
-)
-vespa_add_test(NAME staging_vespalib_foregroundtaskexecutor_test_app COMMAND staging_vespalib_foregroundtaskexecutor_test_app)
diff --git a/staging_vespalib/src/tests/singleexecutor/CMakeLists.txt b/staging_vespalib/src/tests/singleexecutor/CMakeLists.txt
deleted file mode 100644
index 8ff0ff1989a..00000000000
--- a/staging_vespalib/src/tests/singleexecutor/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(staging_vespalib_singleexecutor_test_app TEST
-    SOURCES
-    singleexecutor_test.cpp
-    DEPENDS
-    staging_vespalib
-)
-vespa_add_test(NAME staging_vespalib_singleexecutor_test_app COMMAND staging_vespalib_singleexecutor_test_app)
diff --git a/staging_vespalib/src/tests/state_server/.gitignore b/staging_vespalib/src/tests/state_server/.gitignore
deleted file mode 100644
index b1884d4e060..00000000000
--- a/staging_vespalib/src/tests/state_server/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-staging_vespalib_state_server_test_app
diff --git a/staging_vespalib/src/tests/state_server/CMakeLists.txt b/staging_vespalib/src/tests/state_server/CMakeLists.txt
deleted file mode 100644
index fc22d8b9178..00000000000
--- a/staging_vespalib/src/tests/state_server/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(staging_vespalib_state_server_test_app TEST
-    SOURCES
-    state_server_test.cpp
-    DEPENDS
-    staging_vespalib
-)
-vespa_add_test(NAME staging_vespalib_state_server_test_app NO_VALGRIND NO_VALGRIND COMMAND staging_vespalib_state_server_test_app ENVIRONMENT "VESPA_HOME=.")
diff --git a/staging_vespalib/src/vespa/vespalib/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/CMakeLists.txt
index 43492d06689..053c04064ca 100644
--- a/staging_vespalib/src/vespa/vespalib/CMakeLists.txt
+++ b/staging_vespalib/src/vespa/vespalib/CMakeLists.txt
@@ -1,13 +1,9 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(staging_vespalib
     SOURCES
-    $<TARGET_OBJECTS:staging_vespalib_vespalib_encoding>
     $<TARGET_OBJECTS:staging_vespalib_vespalib_util>
-    $<TARGET_OBJECTS:staging_vespalib_vespalib_data>
-    $<TARGET_OBJECTS:staging_vespalib_vespalib_metrics>
     $<TARGET_OBJECTS:staging_vespalib_vespalib_objects>
     $<TARGET_OBJECTS:staging_vespalib_vespalib_stllike>
-    $<TARGET_OBJECTS:staging_vespalib_vespalib_net>
     INSTALL lib64
     DEPENDS
 )
diff --git a/staging_vespalib/src/vespa/vespalib/data/.gitignore b/staging_vespalib/src/vespa/vespalib/data/.gitignore
deleted file mode 100644
index 0b3af54ee50..00000000000
--- a/staging_vespalib/src/vespa/vespalib/data/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.So
-.depend*
-Makefile
diff --git a/staging_vespalib/src/vespa/vespalib/data/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/data/CMakeLists.txt
deleted file mode 100644
index d5adeadfb3b..00000000000
--- a/staging_vespalib/src/vespa/vespalib/data/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(staging_vespalib_vespalib_data OBJECT
-    SOURCES
-    fileheader.cpp
-    DEPENDS
-)
diff --git a/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt
index 0bdfed505d3..dec951f9ef2 100644
--- a/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt
+++ b/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt
@@ -1,27 +1,20 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(staging_vespalib_vespalib_util OBJECT
     SOURCES
-    adaptive_sequenced_executor.cpp
     bits.cpp
     clock.cpp
     crc.cpp
     document_runnable.cpp
     doom.cpp
-    foregroundtaskexecutor.cpp
     growablebytebuffer.cpp
-    isequencedtaskexecutor.cpp
     jsonexception.cpp
     jsonstream.cpp
-    jsonwriter.cpp
     malloc_mmap_guard.cpp
     process_memory_stats.cpp
     programoptions.cpp
     programoptions_testutils.cpp
     rusage.cpp
-    sequencedtaskexecutor.cpp
-    sequencedtaskexecutorobserver.cpp
     shutdownguard.cpp
-    singleexecutor.cpp
     testclock.cpp
     xmlserializable.cpp
     xmlstream.cpp
diff --git a/storage/src/vespa/storage/storageserver/statereporter.h b/storage/src/vespa/storage/storageserver/statereporter.h
index 71ac1f3fdfd..25ad6814dad 100644
--- a/storage/src/vespa/storage/storageserver/statereporter.h
+++ b/storage/src/vespa/storage/storageserver/statereporter.h
@@ -14,8 +14,8 @@
 #include <vespa/storage/common/storagecomponent.h>
 #include <vespa/storageframework/generic/status/statusreporter.h>
 #include <vespa/metrics/state_api_adapter.h>
-#include <vespa/vespalib/net/metrics_producer.h>
-#include <vespa/vespalib/net/state_api.h>
+#include <vespa/vespalib/net/http/metrics_producer.h>
+#include <vespa/vespalib/net/http/state_api.h>
 
 namespace vespalib {
     class StringTokenizer;
diff --git a/vespalib/CMakeLists.txt b/vespalib/CMakeLists.txt
index 0ac193ea694..79cc32d2a60 100644
--- a/vespalib/CMakeLists.txt
+++ b/vespalib/CMakeLists.txt
@@ -57,11 +57,13 @@ vespa_define_module(
     src/tests/dotproduct
     src/tests/drop-file-from-cache
     src/tests/dual_merge_director
+    src/tests/encoding/base64
     src/tests/eventbarrier
     src/tests/exception_classes
     src/tests/executor
     src/tests/executor_idle_tracking
     src/tests/explore_modern_cpp
+    src/tests/fileheader
     src/tests/false
     src/tests/fiddle
     src/tests/fuzzy
@@ -76,6 +78,7 @@ vespa_define_module(
     src/tests/left_right_heap
     src/tests/make_fixture_macros
     src/tests/memory
+    src/tests/metrics
     src/tests/net/async_resolver
     src/tests/net/crypto_socket
     src/tests/net/selector
@@ -106,6 +109,8 @@ vespa_define_module(
     src/tests/rendezvous
     src/tests/require
     src/tests/runnable_pair
+    src/tests/sequencedtaskexecutor
+    src/tests/singleexecutor
     src/tests/sha1
     src/tests/shared_operation_throttler
     src/tests/shared_string_repo
@@ -118,6 +123,7 @@ vespa_define_module(
     src/tests/small_vector
     src/tests/spin_lock
     src/tests/stash
+    src/tests/state_server
     src/tests/stllike
     src/tests/stringfmt
     src/tests/sync
@@ -173,12 +179,15 @@ vespa_define_module(
     src/vespa/vespalib/data
     src/vespa/vespalib/data/slime
     src/vespa/vespalib/datastore
+    src/vespa/vespalib/encoding
     src/vespa/vespalib/fuzzy
     src/vespa/vespalib/geo
     src/vespa/vespalib/hwaccelrated
     src/vespa/vespalib/io
     src/vespa/vespalib/locale
+    src/vespa/vespalib/metrics
     src/vespa/vespalib/net
+    src/vespa/vespalib/net/http
     src/vespa/vespalib/net/tls
     src/vespa/vespalib/net/tls/impl
     src/vespa/vespalib/objects
diff --git a/staging_vespalib/src/tests/encoding/.gitignore b/vespalib/src/tests/encoding/.gitignore
index a3e9c375723..a3e9c375723 100644
--- a/staging_vespalib/src/tests/encoding/.gitignore
+++ b/vespalib/src/tests/encoding/.gitignore
diff --git a/vespalib/src/tests/encoding/base64/.gitignore b/vespalib/src/tests/encoding/base64/.gitignore
new file mode 100644
index 00000000000..bd63ed7e5cb
--- /dev/null
+++ b/vespalib/src/tests/encoding/base64/.gitignore
@@ -0,0 +1 @@
+vespalib_base64_test_app
diff --git a/vespalib/src/tests/encoding/base64/CMakeLists.txt b/vespalib/src/tests/encoding/base64/CMakeLists.txt
new file mode 100644
index 00000000000..e2bb5d83fbe
--- /dev/null
+++ b/vespalib/src/tests/encoding/base64/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(vespalib_base64_test_app TEST
+    SOURCES
+    base64_test.cpp
+    DEPENDS
+    vespalib
+)
+vespa_add_test(NAME vespalib_base64_test_app COMMAND vespalib_base64_test_app)
diff --git a/staging_vespalib/src/tests/encoding/base64/base64_test.cpp b/vespalib/src/tests/encoding/base64/base64_test.cpp
index 295aad7ffdd..295aad7ffdd 100644
--- a/staging_vespalib/src/tests/encoding/base64/base64_test.cpp
+++ b/vespalib/src/tests/encoding/base64/base64_test.cpp
diff --git a/staging_vespalib/src/tests/fileheader/.gitignore b/vespalib/src/tests/fileheader/.gitignore
index 909655ba711..f41a6844d34 100644
--- a/staging_vespalib/src/tests/fileheader/.gitignore
+++ b/vespalib/src/tests/fileheader/.gitignore
@@ -3,4 +3,4 @@
 Makefile
 fileheader.tmp
 fileheader_test
-staging_vespalib_fileheader_test_app
+vespalib_fileheader_test_app
diff --git a/vespalib/src/tests/fileheader/CMakeLists.txt b/vespalib/src/tests/fileheader/CMakeLists.txt
new file mode 100644
index 00000000000..a58507e818e
--- /dev/null
+++ b/vespalib/src/tests/fileheader/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(vespalib_fileheader_test_app TEST
+    SOURCES
+    fileheader_test.cpp
+    DEPENDS
+    vespalib
+)
+vespa_add_test(NAME vespalib_fileheader_test_app COMMAND vespalib_fileheader_test_app)
diff --git a/staging_vespalib/src/tests/fileheader/fileheader.dat b/vespalib/src/tests/fileheader/fileheader.dat
index 90660f64b98..90660f64b98 100644
--- a/staging_vespalib/src/tests/fileheader/fileheader.dat
+++ b/vespalib/src/tests/fileheader/fileheader.dat
diff --git a/staging_vespalib/src/tests/fileheader/fileheader_test.cpp b/vespalib/src/tests/fileheader/fileheader_test.cpp
index 21e374e4f62..21e374e4f62 100644
--- a/staging_vespalib/src/tests/fileheader/fileheader_test.cpp
+++ b/vespalib/src/tests/fileheader/fileheader_test.cpp
diff --git a/vespalib/src/tests/metrics/CMakeLists.txt b/vespalib/src/tests/metrics/CMakeLists.txt
new file mode 100644
index 00000000000..6019a6c2d4c
--- /dev/null
+++ b/vespalib/src/tests/metrics/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(vespalib_metrics_test_app TEST
+    SOURCES
+    simple_metrics_test.cpp
+    mock_tick.cpp
+    DEPENDS
+    vespalib
+)
+vespa_add_test(NAME vespalib_metrics_test_app COMMAND vespalib_metrics_test_app)
+
+vespa_add_executable(vespalib_stablestore_test_app TEST
+    SOURCES
+    stable_store_test.cpp
+    DEPENDS
+    vespalib
+)
+vespa_add_test(NAME vespalib_stablestore_test_app COMMAND vespalib_stablestore_test_app)
diff --git a/staging_vespalib/src/tests/metrics/mock_tick.cpp b/vespalib/src/tests/metrics/mock_tick.cpp
index c16ef25cfe6..c16ef25cfe6 100644
--- a/staging_vespalib/src/tests/metrics/mock_tick.cpp
+++ b/vespalib/src/tests/metrics/mock_tick.cpp
diff --git a/staging_vespalib/src/tests/metrics/mock_tick.h b/vespalib/src/tests/metrics/mock_tick.h
index 4d9f6758537..4d9f6758537 100644
--- a/staging_vespalib/src/tests/metrics/mock_tick.h
+++ b/vespalib/src/tests/metrics/mock_tick.h
diff --git a/staging_vespalib/src/tests/metrics/simple_metrics_test.cpp b/vespalib/src/tests/metrics/simple_metrics_test.cpp
index 3006022a43d..3006022a43d 100644
--- a/staging_vespalib/src/tests/metrics/simple_metrics_test.cpp
+++ b/vespalib/src/tests/metrics/simple_metrics_test.cpp
diff --git a/staging_vespalib/src/tests/metrics/stable_store_test.cpp b/vespalib/src/tests/metrics/stable_store_test.cpp
index cead112069f..cead112069f 100644
--- a/staging_vespalib/src/tests/metrics/stable_store_test.cpp
+++ b/vespalib/src/tests/metrics/stable_store_test.cpp
diff --git a/vespalib/src/tests/sequencedtaskexecutor/.gitignore b/vespalib/src/tests/sequencedtaskexecutor/.gitignore
new file mode 100644
index 00000000000..3b6f7c74a67
--- /dev/null
+++ b/vespalib/src/tests/sequencedtaskexecutor/.gitignore
@@ -0,0 +1,4 @@
+vespalib_sequencedtaskexecutor_test_app
+vespalib_sequencedtaskexecutor_benchmark_app
+vespalib_adaptive_sequenced_executor_test_app
+vespalib_foregroundtaskexecutor_test_app
diff --git a/vespalib/src/tests/sequencedtaskexecutor/CMakeLists.txt b/vespalib/src/tests/sequencedtaskexecutor/CMakeLists.txt
new file mode 100644
index 00000000000..6a488b3c716
--- /dev/null
+++ b/vespalib/src/tests/sequencedtaskexecutor/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(vespalib_sequencedtaskexecutor_benchmark_app TEST
+    SOURCES
+    sequencedtaskexecutor_benchmark.cpp
+    DEPENDS
+    vespalib
+)
+
+vespa_add_executable(vespalib_sequencedtaskexecutor_test_app TEST
+    SOURCES
+    sequencedtaskexecutor_test.cpp
+    DEPENDS
+    vespalib
+)
+vespa_add_test(NAME vespalib_sequencedtaskexecutor_test_app COMMAND vespalib_sequencedtaskexecutor_test_app)
+
+vespa_add_executable(vespalib_adaptive_sequenced_executor_test_app TEST
+    SOURCES
+    adaptive_sequenced_executor_test.cpp
+    DEPENDS
+    vespalib
+)
+vespa_add_test(NAME vespalib_adaptive_sequenced_executor_test_app COMMAND vespalib_adaptive_sequenced_executor_test_app)
+
+vespa_add_executable(vespalib_foregroundtaskexecutor_test_app TEST
+    SOURCES
+    foregroundtaskexecutor_test.cpp
+    DEPENDS
+    vespalib
+)
+vespa_add_test(NAME vespalib_foregroundtaskexecutor_test_app COMMAND vespalib_foregroundtaskexecutor_test_app)
diff --git a/staging_vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp b/vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp
index 1a458f86232..1a458f86232 100644
--- a/staging_vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp
+++ b/vespalib/src/tests/sequencedtaskexecutor/adaptive_sequenced_executor_test.cpp
diff --git a/staging_vespalib/src/tests/sequencedtaskexecutor/foregroundtaskexecutor_test.cpp b/vespalib/src/tests/sequencedtaskexecutor/foregroundtaskexecutor_test.cpp
index 56fb570209c..56fb570209c 100644
--- a/staging_vespalib/src/tests/sequencedtaskexecutor/foregroundtaskexecutor_test.cpp
+++ b/vespalib/src/tests/sequencedtaskexecutor/foregroundtaskexecutor_test.cpp
diff --git a/staging_vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_benchmark.cpp b/vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_benchmark.cpp
index 0f7c82ef988..0f7c82ef988 100644
--- a/staging_vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_benchmark.cpp
+++ b/vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_benchmark.cpp
diff --git a/staging_vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp b/vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp
index 705d6346e8c..705d6346e8c 100644
--- a/staging_vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp
+++ b/vespalib/src/tests/sequencedtaskexecutor/sequencedtaskexecutor_test.cpp
diff --git a/vespalib/src/tests/singleexecutor/CMakeLists.txt b/vespalib/src/tests/singleexecutor/CMakeLists.txt
new file mode 100644
index 00000000000..3580a91d114
--- /dev/null
+++ b/vespalib/src/tests/singleexecutor/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(vespalib_singleexecutor_test_app TEST
+    SOURCES
+    singleexecutor_test.cpp
+    DEPENDS
+    vespalib
+)
+vespa_add_test(NAME vespalib_singleexecutor_test_app COMMAND vespalib_singleexecutor_test_app)
diff --git a/staging_vespalib/src/tests/singleexecutor/singleexecutor_test.cpp b/vespalib/src/tests/singleexecutor/singleexecutor_test.cpp
index 56352ff3c0d..56352ff3c0d 100644
--- a/staging_vespalib/src/tests/singleexecutor/singleexecutor_test.cpp
+++ b/vespalib/src/tests/singleexecutor/singleexecutor_test.cpp
diff --git a/vespalib/src/tests/state_server/.gitignore b/vespalib/src/tests/state_server/.gitignore
new file mode 100644
index 00000000000..2d36d34e2ec
--- /dev/null
+++ b/vespalib/src/tests/state_server/.gitignore
@@ -0,0 +1 @@
+vespalib_state_server_test_app
diff --git a/vespalib/src/tests/state_server/CMakeLists.txt b/vespalib/src/tests/state_server/CMakeLists.txt
new file mode 100644
index 00000000000..6d3d762a42b
--- /dev/null
+++ b/vespalib/src/tests/state_server/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(vespalib_state_server_test_app TEST
+    SOURCES
+    state_server_test.cpp
+    DEPENDS
+    vespalib
+)
+vespa_add_test(NAME vespalib_state_server_test_app NO_VALGRIND NO_VALGRIND COMMAND vespalib_state_server_test_app ENVIRONMENT "VESPA_HOME=.")
diff --git a/staging_vespalib/src/tests/state_server/state_server_test.cpp b/vespalib/src/tests/state_server/state_server_test.cpp
index cb80a44a675..f6e614f213a 100644
--- a/staging_vespalib/src/tests/state_server/state_server_test.cpp
+++ b/vespalib/src/tests/state_server/state_server_test.cpp
@@ -1,21 +1,17 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <fcntl.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include <vespa/vespalib/testkit/test_kit.h>
-#include <vespa/vespalib/util/host_name.h>
-#include <vespa/vespalib/net/state_server.h>
-#include <vespa/vespalib/net/simple_health_producer.h>
-#include <vespa/vespalib/net/simple_metrics_producer.h>
-#include <vespa/vespalib/net/simple_component_config_producer.h>
+#include <vespa/vespalib/net/http/state_server.h>
+#include <vespa/vespalib/net/http/simple_health_producer.h>
+#include <vespa/vespalib/net/http/simple_metrics_producer.h>
+#include <vespa/vespalib/net/http/simple_component_config_producer.h>
+#include <vespa/vespalib/net/http/state_explorer.h>
+#include <vespa/vespalib/net/http/slime_explorer.h>
+#include <vespa/vespalib/net/http/generic_state_handler.h>
 #include <vespa/vespalib/util/stringfmt.h>
+#include <vespa/vespalib/util/host_name.h>
 #include <vespa/vespalib/process/process.h>
-#include <vespa/vespalib/net/state_explorer.h>
-#include <vespa/vespalib/net/slime_explorer.h>
-#include <vespa/vespalib/net/generic_state_handler.h>
+#include <sys/stat.h>
 
 using namespace vespalib;
 
diff --git a/vespalib/src/tests/trace/CMakeLists.txt b/vespalib/src/tests/trace/CMakeLists.txt
index a632d419b4b..76cb266f230 100644
--- a/vespalib/src/tests/trace/CMakeLists.txt
+++ b/vespalib/src/tests/trace/CMakeLists.txt
@@ -7,10 +7,10 @@ vespa_add_executable(vespalib_trace_test_app TEST
 )
 vespa_add_test(NAME vespalib_trace_test_app COMMAND vespalib_trace_test_app)
 
-vespa_add_executable(staging_vespalib_trace_serialization_test_app TEST
+vespa_add_executable(vespalib_trace_serialization_test_app TEST
     SOURCES
     trace_serialization.cpp
     DEPENDS
     vespalib
 )
-vespa_add_test(NAME staging_vespalib_trace_serialization_test_app COMMAND staging_vespalib_trace_serialization_test_app)
+vespa_add_test(NAME vespalib_trace_serialization_test_app COMMAND vespalib_trace_serialization_test_app)
diff --git a/vespalib/src/vespa/vespalib/CMakeLists.txt b/vespalib/src/vespa/vespalib/CMakeLists.txt
index 1fffddf2f2f..5e7a4bb1fd3 100644
--- a/vespalib/src/vespa/vespalib/CMakeLists.txt
+++ b/vespalib/src/vespa/vespalib/CMakeLists.txt
@@ -7,12 +7,15 @@ vespa_add_library(vespalib
     $<TARGET_OBJECTS:vespalib_vespalib_data>
     $<TARGET_OBJECTS:vespalib_vespalib_data_slime>
     $<TARGET_OBJECTS:vespalib_vespalib_datastore>
+    $<TARGET_OBJECTS:vespalib_vespalib_encoding>
     $<TARGET_OBJECTS:vespalib_vespalib_fuzzy>
     $<TARGET_OBJECTS:vespalib_vespalib_geo>
     $<TARGET_OBJECTS:vespalib_vespalib_hwaccelrated>
     $<TARGET_OBJECTS:vespalib_vespalib_io>
     $<TARGET_OBJECTS:vespalib_vespalib_locale>
+    $<TARGET_OBJECTS:vespalib_vespalib_metrics>
     $<TARGET_OBJECTS:vespalib_vespalib_net>
+    $<TARGET_OBJECTS:vespalib_vespalib_net_http>
     $<TARGET_OBJECTS:vespalib_vespalib_net_tls>
     $<TARGET_OBJECTS:vespalib_vespalib_net_tls_impl>
     $<TARGET_OBJECTS:vespalib_vespalib_objects>
diff --git a/vespalib/src/vespa/vespalib/data/CMakeLists.txt b/vespalib/src/vespa/vespalib/data/CMakeLists.txt
index 39ff0661c1f..ff7cdacb04f 100644
--- a/vespalib/src/vespa/vespalib/data/CMakeLists.txt
+++ b/vespalib/src/vespa/vespalib/data/CMakeLists.txt
@@ -2,6 +2,7 @@
 vespa_add_library(vespalib_vespalib_data OBJECT
     SOURCES
     databuffer.cpp
+    fileheader.cpp
     input.cpp
     input_reader.cpp
     lz4_input_decoder.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/data/fileheader.cpp b/vespalib/src/vespa/vespalib/data/fileheader.cpp
index 0cb5fa14ff4..0cb5fa14ff4 100644
--- a/staging_vespalib/src/vespa/vespalib/data/fileheader.cpp
+++ b/vespalib/src/vespa/vespalib/data/fileheader.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/data/fileheader.h b/vespalib/src/vespa/vespalib/data/fileheader.h
index ca475971932..ca475971932 100644
--- a/staging_vespalib/src/vespa/vespalib/data/fileheader.h
+++ b/vespalib/src/vespa/vespalib/data/fileheader.h
diff --git a/staging_vespalib/src/vespa/vespalib/encoding/.gitignore b/vespalib/src/vespa/vespalib/encoding/.gitignore
index ee8938b6bf4..ee8938b6bf4 100644
--- a/staging_vespalib/src/vespa/vespalib/encoding/.gitignore
+++ b/vespalib/src/vespa/vespalib/encoding/.gitignore
diff --git a/staging_vespalib/src/vespa/vespalib/encoding/CMakeLists.txt b/vespalib/src/vespa/vespalib/encoding/CMakeLists.txt
index 48fed5ae1cc..604930d330e 100644
--- a/staging_vespalib/src/vespa/vespalib/encoding/CMakeLists.txt
+++ b/vespalib/src/vespa/vespalib/encoding/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(staging_vespalib_vespalib_encoding OBJECT
+vespa_add_library(vespalib_vespalib_encoding OBJECT
     SOURCES
     base64.cpp
     DEPENDS
diff --git a/staging_vespalib/src/vespa/vespalib/encoding/base64.cpp b/vespalib/src/vespa/vespalib/encoding/base64.cpp
index bad3c168b15..bad3c168b15 100644
--- a/staging_vespalib/src/vespa/vespalib/encoding/base64.cpp
+++ b/vespalib/src/vespa/vespalib/encoding/base64.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/encoding/base64.h b/vespalib/src/vespa/vespalib/encoding/base64.h
index e54ae5765d9..e54ae5765d9 100644
--- a/staging_vespalib/src/vespa/vespalib/encoding/base64.h
+++ b/vespalib/src/vespa/vespalib/encoding/base64.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/CMakeLists.txt b/vespalib/src/vespa/vespalib/metrics/CMakeLists.txt
index efe9e848136..b29f5d0bbe9 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/CMakeLists.txt
+++ b/vespalib/src/vespa/vespalib/metrics/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(staging_vespalib_vespalib_metrics OBJECT
+vespa_add_library(vespalib_vespalib_metrics OBJECT
     SOURCES
     bucket.cpp
     clock.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/bucket.cpp b/vespalib/src/vespa/vespalib/metrics/bucket.cpp
index 8d4d5558c3d..8d4d5558c3d 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/bucket.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/bucket.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/bucket.h b/vespalib/src/vespa/vespalib/metrics/bucket.h
index 75387aad1b3..75387aad1b3 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/bucket.h
+++ b/vespalib/src/vespa/vespalib/metrics/bucket.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/clock.cpp b/vespalib/src/vespa/vespalib/metrics/clock.cpp
index 8593e07998e..8593e07998e 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/clock.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/clock.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/clock.h b/vespalib/src/vespa/vespalib/metrics/clock.h
index e1b0a7da003..e1b0a7da003 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/clock.h
+++ b/vespalib/src/vespa/vespalib/metrics/clock.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/counter.cpp b/vespalib/src/vespa/vespalib/metrics/counter.cpp
index 2b94ffce842..2b94ffce842 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/counter.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/counter.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/counter.h b/vespalib/src/vespa/vespalib/metrics/counter.h
index 751c2cc3806..751c2cc3806 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/counter.h
+++ b/vespalib/src/vespa/vespalib/metrics/counter.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/counter_aggregator.cpp b/vespalib/src/vespa/vespalib/metrics/counter_aggregator.cpp
index 583bb6e9a1c..583bb6e9a1c 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/counter_aggregator.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/counter_aggregator.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/counter_aggregator.h b/vespalib/src/vespa/vespalib/metrics/counter_aggregator.h
index c650b67dad3..c650b67dad3 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/counter_aggregator.h
+++ b/vespalib/src/vespa/vespalib/metrics/counter_aggregator.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/current_samples.cpp b/vespalib/src/vespa/vespalib/metrics/current_samples.cpp
index 67d56d6f748..67d56d6f748 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/current_samples.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/current_samples.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/current_samples.h b/vespalib/src/vespa/vespalib/metrics/current_samples.h
index 4056a4bb6aa..4056a4bb6aa 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/current_samples.h
+++ b/vespalib/src/vespa/vespalib/metrics/current_samples.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/dimension.cpp b/vespalib/src/vespa/vespalib/metrics/dimension.cpp
index bea751a6680..bea751a6680 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/dimension.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/dimension.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/dimension.h b/vespalib/src/vespa/vespalib/metrics/dimension.h
index 7a3942b705c..7a3942b705c 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/dimension.h
+++ b/vespalib/src/vespa/vespalib/metrics/dimension.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.cpp b/vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.cpp
index 13cab477b2e..13cab477b2e 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.h b/vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.h
index a707c3a5305..a707c3a5305 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.h
+++ b/vespalib/src/vespa/vespalib/metrics/dummy_metrics_manager.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/gauge.cpp b/vespalib/src/vespa/vespalib/metrics/gauge.cpp
index ca6b11697b4..ca6b11697b4 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/gauge.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/gauge.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/gauge.h b/vespalib/src/vespa/vespalib/metrics/gauge.h
index 59de4a6fe4d..59de4a6fe4d 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/gauge.h
+++ b/vespalib/src/vespa/vespalib/metrics/gauge.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/gauge_aggregator.cpp b/vespalib/src/vespa/vespalib/metrics/gauge_aggregator.cpp
index a6c4559931f..a6c4559931f 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/gauge_aggregator.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/gauge_aggregator.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/gauge_aggregator.h b/vespalib/src/vespa/vespalib/metrics/gauge_aggregator.h
index f4fd4760cf1..f4fd4760cf1 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/gauge_aggregator.h
+++ b/vespalib/src/vespa/vespalib/metrics/gauge_aggregator.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/handle.cpp b/vespalib/src/vespa/vespalib/metrics/handle.cpp
index 50143adedd2..50143adedd2 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/handle.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/handle.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/handle.h b/vespalib/src/vespa/vespalib/metrics/handle.h
index b901f56af7e..b901f56af7e 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/handle.h
+++ b/vespalib/src/vespa/vespalib/metrics/handle.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/json_formatter.cpp b/vespalib/src/vespa/vespalib/metrics/json_formatter.cpp
index dddc5781458..dddc5781458 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/json_formatter.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/json_formatter.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/json_formatter.h b/vespalib/src/vespa/vespalib/metrics/json_formatter.h
index f9d3664e5db..f9d3664e5db 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/json_formatter.h
+++ b/vespalib/src/vespa/vespalib/metrics/json_formatter.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/label.cpp b/vespalib/src/vespa/vespalib/metrics/label.cpp
index fe287e16d46..fe287e16d46 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/label.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/label.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/label.h b/vespalib/src/vespa/vespalib/metrics/label.h
index 755b3e83bef..755b3e83bef 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/label.h
+++ b/vespalib/src/vespa/vespalib/metrics/label.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/metric_id.cpp b/vespalib/src/vespa/vespalib/metrics/metric_id.cpp
index 7ce012ad5fd..7ce012ad5fd 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/metric_id.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/metric_id.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/metric_id.h b/vespalib/src/vespa/vespalib/metrics/metric_id.h
index 5aa9d1b868e..5aa9d1b868e 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/metric_id.h
+++ b/vespalib/src/vespa/vespalib/metrics/metric_id.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/metric_types.cpp b/vespalib/src/vespa/vespalib/metrics/metric_types.cpp
index 196dfaed16a..196dfaed16a 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/metric_types.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/metric_types.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/metric_types.h b/vespalib/src/vespa/vespalib/metrics/metric_types.h
index e8118b6bd63..e8118b6bd63 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/metric_types.h
+++ b/vespalib/src/vespa/vespalib/metrics/metric_types.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/metrics_manager.cpp b/vespalib/src/vespa/vespalib/metrics/metrics_manager.cpp
index 3d598528777..3d598528777 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/metrics_manager.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/metrics_manager.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/metrics_manager.h b/vespalib/src/vespa/vespalib/metrics/metrics_manager.h
index 6b80527b22e..6b80527b22e 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/metrics_manager.h
+++ b/vespalib/src/vespa/vespalib/metrics/metrics_manager.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/name_collection.cpp b/vespalib/src/vespa/vespalib/metrics/name_collection.cpp
index 964fd9c59a8..964fd9c59a8 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/name_collection.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/name_collection.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/name_collection.h b/vespalib/src/vespa/vespalib/metrics/name_collection.h
index bef614b5a68..bef614b5a68 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/name_collection.h
+++ b/vespalib/src/vespa/vespalib/metrics/name_collection.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/name_repo.cpp b/vespalib/src/vespa/vespalib/metrics/name_repo.cpp
index 2f31c90da29..2f31c90da29 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/name_repo.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/name_repo.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/name_repo.h b/vespalib/src/vespa/vespalib/metrics/name_repo.h
index e2230cf59d9..e2230cf59d9 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/name_repo.h
+++ b/vespalib/src/vespa/vespalib/metrics/name_repo.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/point.cpp b/vespalib/src/vespa/vespalib/metrics/point.cpp
index b4d3d6e2738..b4d3d6e2738 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/point.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/point.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/point.h b/vespalib/src/vespa/vespalib/metrics/point.h
index a8f483c4404..a8f483c4404 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/point.h
+++ b/vespalib/src/vespa/vespalib/metrics/point.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/point_builder.cpp b/vespalib/src/vespa/vespalib/metrics/point_builder.cpp
index d085228c1a8..d085228c1a8 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/point_builder.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/point_builder.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/point_builder.h b/vespalib/src/vespa/vespalib/metrics/point_builder.h
index d9c4b5a114f..d9c4b5a114f 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/point_builder.h
+++ b/vespalib/src/vespa/vespalib/metrics/point_builder.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/point_map.cpp b/vespalib/src/vespa/vespalib/metrics/point_map.cpp
index cd5909707e3..cd5909707e3 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/point_map.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/point_map.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/point_map.h b/vespalib/src/vespa/vespalib/metrics/point_map.h
index 7a435389566..7a435389566 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/point_map.h
+++ b/vespalib/src/vespa/vespalib/metrics/point_map.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/point_map_collection.cpp b/vespalib/src/vespa/vespalib/metrics/point_map_collection.cpp
index d9b7362521b..d9b7362521b 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/point_map_collection.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/point_map_collection.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/point_map_collection.h b/vespalib/src/vespa/vespalib/metrics/point_map_collection.h
index ee556ea2107..ee556ea2107 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/point_map_collection.h
+++ b/vespalib/src/vespa/vespalib/metrics/point_map_collection.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/producer.cpp b/vespalib/src/vespa/vespalib/metrics/producer.cpp
index de3ed5d368f..de3ed5d368f 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/producer.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/producer.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/producer.h b/vespalib/src/vespa/vespalib/metrics/producer.h
index ac741b4e82d..397b0979b25 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/producer.h
+++ b/vespalib/src/vespa/vespalib/metrics/producer.h
@@ -1,11 +1,10 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
+#include <vespa/vespalib/net/http/metrics_producer.h>
 #include <memory>
-#include <vespa/vespalib/net/metrics_producer.h>
 
-namespace vespalib {
-namespace metrics {
+namespace vespalib::metrics {
 
 class MetricsManager;
 
@@ -21,5 +20,4 @@ public:
     vespalib::string getTotalMetrics(const vespalib::string &consumer) override;
 };
 
-} // namespace vespalib::metrics
-} // namespace vespalib
+}
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/simple_metrics.cpp b/vespalib/src/vespa/vespalib/metrics/simple_metrics.cpp
index d438426518c..d438426518c 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/simple_metrics.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/simple_metrics.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/simple_metrics.h b/vespalib/src/vespa/vespalib/metrics/simple_metrics.h
index e558e93a638..e558e93a638 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/simple_metrics.h
+++ b/vespalib/src/vespa/vespalib/metrics/simple_metrics.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/simple_metrics_manager.cpp b/vespalib/src/vespa/vespalib/metrics/simple_metrics_manager.cpp
index 4b6b82697f7..4b6b82697f7 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/simple_metrics_manager.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/simple_metrics_manager.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/simple_metrics_manager.h b/vespalib/src/vespa/vespalib/metrics/simple_metrics_manager.h
index fe3023ae020..fe3023ae020 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/simple_metrics_manager.h
+++ b/vespalib/src/vespa/vespalib/metrics/simple_metrics_manager.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/simple_tick.cpp b/vespalib/src/vespa/vespalib/metrics/simple_tick.cpp
index 0eed2ed3400..0eed2ed3400 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/simple_tick.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/simple_tick.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/simple_tick.h b/vespalib/src/vespa/vespalib/metrics/simple_tick.h
index 8ab18e74c83..8ab18e74c83 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/simple_tick.h
+++ b/vespalib/src/vespa/vespalib/metrics/simple_tick.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/snapshots.cpp b/vespalib/src/vespa/vespalib/metrics/snapshots.cpp
index 6ef9dca1e26..6ef9dca1e26 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/snapshots.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/snapshots.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/snapshots.h b/vespalib/src/vespa/vespalib/metrics/snapshots.h
index 2d2f29e7c23..2d2f29e7c23 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/snapshots.h
+++ b/vespalib/src/vespa/vespalib/metrics/snapshots.h
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/stable_store.cpp b/vespalib/src/vespa/vespalib/metrics/stable_store.cpp
index dcb18d0cc82..dcb18d0cc82 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/stable_store.cpp
+++ b/vespalib/src/vespa/vespalib/metrics/stable_store.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/metrics/stable_store.h b/vespalib/src/vespa/vespalib/metrics/stable_store.h
index 289d8f84d23..289d8f84d23 100644
--- a/staging_vespalib/src/vespa/vespalib/metrics/stable_store.h
+++ b/vespalib/src/vespa/vespalib/metrics/stable_store.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/CMakeLists.txt b/vespalib/src/vespa/vespalib/net/http/CMakeLists.txt
index f4d0ffdbc4a..b3e8d8c7a14 100644
--- a/staging_vespalib/src/vespa/vespalib/net/CMakeLists.txt
+++ b/vespalib/src/vespa/vespalib/net/http/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(staging_vespalib_vespalib_net OBJECT
+vespa_add_library(vespalib_vespalib_net_http OBJECT
     SOURCES
     component_config_producer.cpp
     generic_state_handler.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/net/component_config_producer.cpp b/vespalib/src/vespa/vespalib/net/http/component_config_producer.cpp
index 9011ff9abc9..9011ff9abc9 100644
--- a/staging_vespalib/src/vespa/vespalib/net/component_config_producer.cpp
+++ b/vespalib/src/vespa/vespalib/net/http/component_config_producer.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/net/component_config_producer.h b/vespalib/src/vespa/vespalib/net/http/component_config_producer.h
index 81ba8f8b03d..81ba8f8b03d 100644
--- a/staging_vespalib/src/vespa/vespalib/net/component_config_producer.h
+++ b/vespalib/src/vespa/vespalib/net/http/component_config_producer.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/generic_state_handler.cpp b/vespalib/src/vespa/vespalib/net/http/generic_state_handler.cpp
index 91fc6d7e617..91fc6d7e617 100644
--- a/staging_vespalib/src/vespa/vespalib/net/generic_state_handler.cpp
+++ b/vespalib/src/vespa/vespalib/net/http/generic_state_handler.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/net/generic_state_handler.h b/vespalib/src/vespa/vespalib/net/http/generic_state_handler.h
index 6065aa165ec..6065aa165ec 100644
--- a/staging_vespalib/src/vespa/vespalib/net/generic_state_handler.h
+++ b/vespalib/src/vespa/vespalib/net/http/generic_state_handler.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/health_producer.h b/vespalib/src/vespa/vespalib/net/http/health_producer.h
index a16ffbd225f..a16ffbd225f 100644
--- a/staging_vespalib/src/vespa/vespalib/net/health_producer.h
+++ b/vespalib/src/vespa/vespalib/net/http/health_producer.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/http_server.cpp b/vespalib/src/vespa/vespalib/net/http/http_server.cpp
index f2c041cb648..f2c041cb648 100644
--- a/staging_vespalib/src/vespa/vespalib/net/http_server.cpp
+++ b/vespalib/src/vespa/vespalib/net/http/http_server.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/net/http_server.h b/vespalib/src/vespa/vespalib/net/http/http_server.h
index 3d4cd557b58..3d4cd557b58 100644
--- a/staging_vespalib/src/vespa/vespalib/net/http_server.h
+++ b/vespalib/src/vespa/vespalib/net/http/http_server.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/json_get_handler.h b/vespalib/src/vespa/vespalib/net/http/json_get_handler.h
index d257bd0285f..d257bd0285f 100644
--- a/staging_vespalib/src/vespa/vespalib/net/json_get_handler.h
+++ b/vespalib/src/vespa/vespalib/net/http/json_get_handler.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/json_handler_repo.cpp b/vespalib/src/vespa/vespalib/net/http/json_handler_repo.cpp
index 07b9306b5dc..07b9306b5dc 100644
--- a/staging_vespalib/src/vespa/vespalib/net/json_handler_repo.cpp
+++ b/vespalib/src/vespa/vespalib/net/http/json_handler_repo.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/net/json_handler_repo.h b/vespalib/src/vespa/vespalib/net/http/json_handler_repo.h
index adbe3010f43..adbe3010f43 100644
--- a/staging_vespalib/src/vespa/vespalib/net/json_handler_repo.h
+++ b/vespalib/src/vespa/vespalib/net/http/json_handler_repo.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/metrics_producer.h b/vespalib/src/vespa/vespalib/net/http/metrics_producer.h
index d57797d75f6..f8b7b21022f 100644
--- a/staging_vespalib/src/vespa/vespalib/net/metrics_producer.h
+++ b/vespalib/src/vespa/vespalib/net/http/metrics_producer.h
@@ -9,7 +9,7 @@ namespace vespalib {
 struct MetricsProducer {
     virtual vespalib::string getMetrics(const vespalib::string &consumer) = 0;
     virtual vespalib::string getTotalMetrics(const vespalib::string &consumer) = 0;
-    virtual ~MetricsProducer() {}
+    virtual ~MetricsProducer() = default;
 };
 
 } // namespace vespalib
diff --git a/staging_vespalib/src/vespa/vespalib/net/simple_component_config_producer.cpp b/vespalib/src/vespa/vespalib/net/http/simple_component_config_producer.cpp
index 3fa5f09033f..3fa5f09033f 100644
--- a/staging_vespalib/src/vespa/vespalib/net/simple_component_config_producer.cpp
+++ b/vespalib/src/vespa/vespalib/net/http/simple_component_config_producer.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/net/simple_component_config_producer.h b/vespalib/src/vespa/vespalib/net/http/simple_component_config_producer.h
index 2f0cc0cf1fa..2f0cc0cf1fa 100644
--- a/staging_vespalib/src/vespa/vespalib/net/simple_component_config_producer.h
+++ b/vespalib/src/vespa/vespalib/net/http/simple_component_config_producer.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/simple_health_producer.cpp b/vespalib/src/vespa/vespalib/net/http/simple_health_producer.cpp
index 3c1959608e9..3c1959608e9 100644
--- a/staging_vespalib/src/vespa/vespalib/net/simple_health_producer.cpp
+++ b/vespalib/src/vespa/vespalib/net/http/simple_health_producer.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/net/simple_health_producer.h b/vespalib/src/vespa/vespalib/net/http/simple_health_producer.h
index b2a7725b89e..b2a7725b89e 100644
--- a/staging_vespalib/src/vespa/vespalib/net/simple_health_producer.h
+++ b/vespalib/src/vespa/vespalib/net/http/simple_health_producer.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/simple_metric_snapshot.cpp b/vespalib/src/vespa/vespalib/net/http/simple_metric_snapshot.cpp
index cad2a3567aa..cad2a3567aa 100644
--- a/staging_vespalib/src/vespa/vespalib/net/simple_metric_snapshot.cpp
+++ b/vespalib/src/vespa/vespalib/net/http/simple_metric_snapshot.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/net/simple_metric_snapshot.h b/vespalib/src/vespa/vespalib/net/http/simple_metric_snapshot.h
index e19f26bd5d0..e19f26bd5d0 100644
--- a/staging_vespalib/src/vespa/vespalib/net/simple_metric_snapshot.h
+++ b/vespalib/src/vespa/vespalib/net/http/simple_metric_snapshot.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/simple_metrics_producer.cpp b/vespalib/src/vespa/vespalib/net/http/simple_metrics_producer.cpp
index 1c4539d70ee..1c4539d70ee 100644
--- a/staging_vespalib/src/vespa/vespalib/net/simple_metrics_producer.cpp
+++ b/vespalib/src/vespa/vespalib/net/http/simple_metrics_producer.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/net/simple_metrics_producer.h b/vespalib/src/vespa/vespalib/net/http/simple_metrics_producer.h
index ad463c63d57..ad463c63d57 100644
--- a/staging_vespalib/src/vespa/vespalib/net/simple_metrics_producer.h
+++ b/vespalib/src/vespa/vespalib/net/http/simple_metrics_producer.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/slime_explorer.cpp b/vespalib/src/vespa/vespalib/net/http/slime_explorer.cpp
index dc61f673233..dc61f673233 100644
--- a/staging_vespalib/src/vespa/vespalib/net/slime_explorer.cpp
+++ b/vespalib/src/vespa/vespalib/net/http/slime_explorer.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/net/slime_explorer.h b/vespalib/src/vespa/vespalib/net/http/slime_explorer.h
index cbb0a89e36d..cbb0a89e36d 100644
--- a/staging_vespalib/src/vespa/vespalib/net/slime_explorer.h
+++ b/vespalib/src/vespa/vespalib/net/http/slime_explorer.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/state_api.cpp b/vespalib/src/vespa/vespalib/net/http/state_api.cpp
index ca00713352f..ca00713352f 100644
--- a/staging_vespalib/src/vespa/vespalib/net/state_api.cpp
+++ b/vespalib/src/vespa/vespalib/net/http/state_api.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/net/state_api.h b/vespalib/src/vespa/vespalib/net/http/state_api.h
index 2bdf320d091..2bdf320d091 100644
--- a/staging_vespalib/src/vespa/vespalib/net/state_api.h
+++ b/vespalib/src/vespa/vespalib/net/http/state_api.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/state_explorer.cpp b/vespalib/src/vespa/vespalib/net/http/state_explorer.cpp
index 627b70a92fc..627b70a92fc 100644
--- a/staging_vespalib/src/vespa/vespalib/net/state_explorer.cpp
+++ b/vespalib/src/vespa/vespalib/net/http/state_explorer.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/net/state_explorer.h b/vespalib/src/vespa/vespalib/net/http/state_explorer.h
index 01cb94663b3..01cb94663b3 100644
--- a/staging_vespalib/src/vespa/vespalib/net/state_explorer.h
+++ b/vespalib/src/vespa/vespalib/net/http/state_explorer.h
diff --git a/staging_vespalib/src/vespa/vespalib/net/state_server.cpp b/vespalib/src/vespa/vespalib/net/http/state_server.cpp
index 8d927387727..8d927387727 100644
--- a/staging_vespalib/src/vespa/vespalib/net/state_server.cpp
+++ b/vespalib/src/vespa/vespalib/net/http/state_server.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/net/state_server.h b/vespalib/src/vespa/vespalib/net/http/state_server.h
index 22152fe1a1f..22152fe1a1f 100644
--- a/staging_vespalib/src/vespa/vespalib/net/state_server.h
+++ b/vespalib/src/vespa/vespalib/net/http/state_server.h
diff --git a/vespalib/src/vespa/vespalib/util/CMakeLists.txt b/vespalib/src/vespa/vespalib/util/CMakeLists.txt
index 70b8347acc2..c61de250f53 100644
--- a/vespalib/src/vespa/vespalib/util/CMakeLists.txt
+++ b/vespalib/src/vespa/vespalib/util/CMakeLists.txt
@@ -2,6 +2,7 @@
 vespa_add_library(vespalib_vespalib_util OBJECT
     SOURCES
     active.cpp
+    adaptive_sequenced_executor.cpp
     address_space.cpp
     alloc.cpp
     approx.cpp
@@ -27,13 +28,16 @@ vespa_add_library(vespalib_vespalib_util OBJECT
     exceptions.cpp
     executor_idle_tracking.cpp
     file_area_freelist.cpp
+    foregroundtaskexecutor.cpp
     gate.cpp
     gencnt.cpp
     generationhandler.cpp
     generationholder.cpp
     hdr_abort.cpp
     host_name.cpp
+    jsonwriter.cpp
     invokeserviceimpl.cpp
+    isequencedtaskexecutor.cpp
     issue.cpp
     joinable.cpp
     latch.cpp
@@ -59,12 +63,15 @@ vespa_add_library(vespalib_vespalib_util OBJECT
     runnable.cpp
     runnable_pair.cpp
     sequence.cpp
+    sequencedtaskexecutor.cpp
+    sequencedtaskexecutorobserver.cpp
     sha1.cpp
     shared_operation_throttler.cpp
     shared_string_repo.cpp
     sig_catch.cpp
     signalhandler.cpp
     simple_thread_bundle.cpp
+    singleexecutor.cpp
     small_vector.cpp
     stash.cpp
     string_hash.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.cpp b/vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.cpp
index 6db97ff0761..6db97ff0761 100644
--- a/staging_vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.cpp
+++ b/vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.h b/vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.h
index fbebf8b4e4c..fbebf8b4e4c 100644
--- a/staging_vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.h
+++ b/vespalib/src/vespa/vespalib/util/adaptive_sequenced_executor.h
diff --git a/staging_vespalib/src/vespa/vespalib/util/foreground_thread_executor.h b/vespalib/src/vespa/vespalib/util/foreground_thread_executor.h
index c1e56572614..c1e56572614 100644
--- a/staging_vespalib/src/vespa/vespalib/util/foreground_thread_executor.h
+++ b/vespalib/src/vespa/vespalib/util/foreground_thread_executor.h
diff --git a/staging_vespalib/src/vespa/vespalib/util/foregroundtaskexecutor.cpp b/vespalib/src/vespa/vespalib/util/foregroundtaskexecutor.cpp
index ce5237f41c9..ce5237f41c9 100644
--- a/staging_vespalib/src/vespa/vespalib/util/foregroundtaskexecutor.cpp
+++ b/vespalib/src/vespa/vespalib/util/foregroundtaskexecutor.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/util/foregroundtaskexecutor.h b/vespalib/src/vespa/vespalib/util/foregroundtaskexecutor.h
index 615bf62afe5..615bf62afe5 100644
--- a/staging_vespalib/src/vespa/vespalib/util/foregroundtaskexecutor.h
+++ b/vespalib/src/vespa/vespalib/util/foregroundtaskexecutor.h
diff --git a/staging_vespalib/src/vespa/vespalib/util/isequencedtaskexecutor.cpp b/vespalib/src/vespa/vespalib/util/isequencedtaskexecutor.cpp
index b31d72da3b1..b31d72da3b1 100644
--- a/staging_vespalib/src/vespa/vespalib/util/isequencedtaskexecutor.cpp
+++ b/vespalib/src/vespa/vespalib/util/isequencedtaskexecutor.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/util/isequencedtaskexecutor.h b/vespalib/src/vespa/vespalib/util/isequencedtaskexecutor.h
index ff90556e3e4..ff90556e3e4 100644
--- a/staging_vespalib/src/vespa/vespalib/util/isequencedtaskexecutor.h
+++ b/vespalib/src/vespa/vespalib/util/isequencedtaskexecutor.h
diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp b/vespalib/src/vespa/vespalib/util/jsonwriter.cpp
index eb56d8b367a..eb56d8b367a 100644
--- a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp
+++ b/vespalib/src/vespa/vespalib/util/jsonwriter.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h b/vespalib/src/vespa/vespalib/util/jsonwriter.h
index 57380b46e5c..57380b46e5c 100644
--- a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h
+++ b/vespalib/src/vespa/vespalib/util/jsonwriter.h
diff --git a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp b/vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp
index e12d2065d9f..e12d2065d9f 100644
--- a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp
+++ b/vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.h b/vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.h
index a4b1b82aacf..a4b1b82aacf 100644
--- a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.h
+++ b/vespalib/src/vespa/vespalib/util/sequencedtaskexecutor.h
diff --git a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutorobserver.cpp b/vespalib/src/vespa/vespalib/util/sequencedtaskexecutorobserver.cpp
index d81b8ec1db6..d81b8ec1db6 100644
--- a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutorobserver.cpp
+++ b/vespalib/src/vespa/vespalib/util/sequencedtaskexecutorobserver.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutorobserver.h b/vespalib/src/vespa/vespalib/util/sequencedtaskexecutorobserver.h
index 1d54283c393..1d54283c393 100644
--- a/staging_vespalib/src/vespa/vespalib/util/sequencedtaskexecutorobserver.h
+++ b/vespalib/src/vespa/vespalib/util/sequencedtaskexecutorobserver.h
diff --git a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp b/vespalib/src/vespa/vespalib/util/singleexecutor.cpp
index 21ed90c3d22..21ed90c3d22 100644
--- a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp
+++ b/vespalib/src/vespa/vespalib/util/singleexecutor.cpp
diff --git a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.h b/vespalib/src/vespa/vespalib/util/singleexecutor.h
index dd755a76302..dd755a76302 100644
--- a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.h
+++ b/vespalib/src/vespa/vespalib/util/singleexecutor.h