Export moved config definitions.

42 files changed, 10 insertions, 614 deletions

diff --git a/searchcore/src/apps/proton/CMakeLists.txt b/searchcore/src/apps/proton/CMakeLists.txt
index 400eb0eacc3..012269345eb 100644
--- a/searchcore/src/apps/proton/CMakeLists.txt
+++ b/searchcore/src/apps/proton/CMakeLists.txt
@@ -22,6 +22,5 @@ vespa_add_executable(searchcore_proton_app
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
     storageserver_storageapp
 )
diff --git a/searchcore/src/apps/tests/CMakeLists.txt b/searchcore/src/apps/tests/CMakeLists.txt
index 933be1a6f89..de8b9e6333b 100644
--- a/searchcore/src/apps/tests/CMakeLists.txt
+++ b/searchcore/src/apps/tests/CMakeLists.txt
@@ -19,7 +19,6 @@ vespa_add_executable(searchcore_persistenceconformance_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
     vdstestlib
     persistence_persistence_conformancetest
 )
diff --git a/searchcore/src/apps/verify_ranksetup/CMakeLists.txt b/searchcore/src/apps/verify_ranksetup/CMakeLists.txt
index 536392739d9..889bbd22ac4 100644
--- a/searchcore/src/apps/verify_ranksetup/CMakeLists.txt
+++ b/searchcore/src/apps/verify_ranksetup/CMakeLists.txt
@@ -4,7 +4,6 @@ vespa_add_library(searchcore_verify_ranksetup
     verify_ranksetup.cpp
     INSTALL lib64
     DEPENDS
-    searchcore_fconfig
     searchcore_matching
     searchcore_documentmetastore
 )
diff --git a/searchcore/src/main/java/com/yahoo/vespa/config/search/core/package-info.java b/searchcore/src/main/java/com/yahoo/vespa/config/search/core/package-info.java
deleted file mode 100644
index 5b0f18203ec..00000000000
--- a/searchcore/src/main/java/com/yahoo/vespa/config/search/core/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-@ExportPackage
-package com.yahoo.vespa.config.search.core;
-
-import com.yahoo.osgi.annotation.ExportPackage;
-
diff --git a/searchcore/src/tests/proton/common/hw_info_sampler/CMakeLists.txt b/searchcore/src/tests/proton/common/hw_info_sampler/CMakeLists.txt
index 7173431dae2..67139479974 100644
--- a/searchcore/src/tests/proton/common/hw_info_sampler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/common/hw_info_sampler/CMakeLists.txt
@@ -4,6 +4,5 @@ vespa_add_executable(searchcore_hw_info_sampler_test_app TEST
     hw_info_sampler_test.cpp
     DEPENDS
     searchcore_pcommon
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_hw_info_sampler_test_app COMMAND searchcore_hw_info_sampler_test_app)
diff --git a/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp b/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp
index 585a8b38fe1..a60c7e7516a 100644
--- a/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp
+++ b/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#include <vespa/config-hwinfo.h>
 #include <vespa/config/print/fileconfigwriter.h>
-#include <vespa/searchcore/config/config-hwinfo.h>
 #include <vespa/searchcore/proton/common/hw_info_sampler.h>
 #include <vespa/searchlib/test/directory_handler.h>
 #include <vespa/vespalib/util/size_literals.h>
diff --git a/searchcore/src/tests/proton/docsummary/CMakeLists.txt b/searchcore/src/tests/proton/docsummary/CMakeLists.txt
index 1636c347ea6..f2e29a8b5b5 100644
--- a/searchcore/src/tests/proton/docsummary/CMakeLists.txt
+++ b/searchcore/src/tests/proton/docsummary/CMakeLists.txt
@@ -21,7 +21,6 @@ vespa_add_executable(searchcore_docsummary_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_docsummary_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/docsummary_test.sh
                DEPENDS searchcore_docsummary_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/CMakeLists.txt
index 0cb678992b9..1ac3945e068 100644
--- a/searchcore/src/tests/proton/documentdb/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/CMakeLists.txt
@@ -19,7 +19,6 @@ vespa_add_executable(searchcore_documentdb_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_documentdb_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/documentdb_test.sh
                DEPENDS searchcore_documentdb_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt
index 272b239dd2e..70a358e2b6b 100644
--- a/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/buckethandler/CMakeLists.txt
@@ -12,6 +12,5 @@ vespa_add_executable(searchcore_buckethandler_test_app TEST
     searchcore_bucketdb
     searchcore_pcommon
     searchcore_grouping
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_buckethandler_test_app COMMAND searchcore_buckethandler_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt
index 1ea6f5cc729..cfab118e8d5 100644
--- a/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/clusterstatehandler/CMakeLists.txt
@@ -10,6 +10,5 @@ vespa_add_executable(searchcore_clusterstatehandler_test_app TEST
     searchcore_attribute
     searchcore_pcommon
     searchcore_grouping
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_clusterstatehandler_test_app COMMAND searchcore_clusterstatehandler_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt
index 038a1ce0d27..e233701d704 100644
--- a/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/combiningfeedview/CMakeLists.txt
@@ -13,6 +13,5 @@ vespa_add_executable(searchcore_combiningfeedview_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_combiningfeedview_test_app COMMAND searchcore_combiningfeedview_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt
index f217c4da740..cd611051efa 100644
--- a/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/configurer/CMakeLists.txt
@@ -17,6 +17,5 @@ vespa_add_executable(searchcore_configurer_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_configurer_test_app COMMAND searchcore_configurer_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt
index bc783c2eb3d..0d142a3041b 100644
--- a/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/document_subdbs/CMakeLists.txt
@@ -19,6 +19,5 @@ vespa_add_executable(searchcore_document_subdbs_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_document_subdbs_test_app COMMAND searchcore_document_subdbs_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt
index e3d2afe7734..a03b9a662c3 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/CMakeLists.txt
@@ -13,7 +13,6 @@ vespa_add_executable(searchcore_feedhandler_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_feedhandler_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/feedhandler_test.sh
                DEPENDS searchcore_feedhandler_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt
index 04d9800653b..a37674c8963 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/feedview/CMakeLists.txt
@@ -14,6 +14,5 @@ vespa_add_executable(searchcore_feedview_test_app TEST
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_feedview_test_app COMMAND searchcore_feedview_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt
index e3a97676d7a..f20201ffa73 100644
--- a/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/fileconfigmanager/CMakeLists.txt
@@ -6,7 +6,6 @@ vespa_add_executable(searchcore_fileconfigmanager_test_app TEST
     searchcore_test
     searchcore_server
     searchcore_pcommon
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_fileconfigmanager_test_app COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fileconfigmanager_test.sh
                DEPENDS searchcore_fileconfigmanager_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt
index 8febaf0bb26..2872ff57990 100644
--- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/CMakeLists.txt
@@ -14,7 +14,6 @@ vespa_add_executable(searchcore_maintenancecontroller_test_app TEST
     searchcore_persistenceengine
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
     searchlib_test
 )
 vespa_add_test(NAME searchcore_maintenancecontroller_test_app COMMAND searchcore_maintenancecontroller_test_app)
diff --git a/searchcore/src/tests/proton/documentdb/threading_service_config/threading_service_config_test.cpp b/searchcore/src/tests/proton/documentdb/threading_service_config/threading_service_config_test.cpp
index 1cee63ecfcc..b3d4f4ce31d 100644
--- a/searchcore/src/tests/proton/documentdb/threading_service_config/threading_service_config_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/threading_service_config/threading_service_config_test.cpp
@@ -1,6 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/searchcore/config/config-proton.h>
+#include <vespa/config-proton.h>
 #include <vespa/searchcore/proton/common/hw_info.h>
 #include <vespa/searchcore/proton/server/threading_service_config.h>
 #include <vespa/vespalib/testkit/testapp.h>
diff --git a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt b/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt
index c3d70bd7410..a9b8b0aee4f 100644
--- a/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt
+++ b/searchcore/src/tests/proton/documentmetastore/CMakeLists.txt
@@ -8,7 +8,6 @@ vespa_add_executable(searchcore_documentmetastore_test_app TEST
     searchcore_bucketdb
     searchcore_attribute
     searchcore_feedoperation
-    searchcore_fconfig
     GTest::GTest
 )
 vespa_add_test(NAME searchcore_documentmetastore_test_app COMMAND searchcore_documentmetastore_test_app)
diff --git a/searchcore/src/tests/proton/matching/CMakeLists.txt b/searchcore/src/tests/proton/matching/CMakeLists.txt
index b4737be7819..8ec7bf7c442 100644
--- a/searchcore/src/tests/proton/matching/CMakeLists.txt
+++ b/searchcore/src/tests/proton/matching/CMakeLists.txt
@@ -5,7 +5,6 @@ vespa_add_executable(searchcore_matching_test_app TEST
     DEPENDS
     searchcore_test
     searchcore_server
-    searchcore_fconfig
     searchcore_matching
     searchcore_feedoperation
     searchcore_documentmetastore
diff --git a/searchcore/src/tests/proton/proton_config_fetcher/CMakeLists.txt b/searchcore/src/tests/proton/proton_config_fetcher/CMakeLists.txt
index 20629733f09..22fec09c154 100644
--- a/searchcore/src/tests/proton/proton_config_fetcher/CMakeLists.txt
+++ b/searchcore/src/tests/proton/proton_config_fetcher/CMakeLists.txt
@@ -5,6 +5,5 @@ vespa_add_executable(searchcore_proton_config_fetcher_test_app TEST
     DEPENDS
     searchcore_test
     searchcore_server
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_proton_config_fetcher_test_app COMMAND searchcore_proton_config_fetcher_test_app)
diff --git a/searchcore/src/tests/proton/proton_configurer/CMakeLists.txt b/searchcore/src/tests/proton/proton_configurer/CMakeLists.txt
index c7d6187e90c..df969c33af3 100644
--- a/searchcore/src/tests/proton/proton_configurer/CMakeLists.txt
+++ b/searchcore/src/tests/proton/proton_configurer/CMakeLists.txt
@@ -4,7 +4,6 @@ vespa_add_executable(searchcore_proton_configurer_test_app TEST
     proton_configurer_test.cpp
     DEPENDS
     searchcore_server
-    searchcore_fconfig
     GTest::GTest
 )
 vespa_add_test(NAME searchcore_proton_configurer_test_app COMMAND searchcore_proton_configurer_test_app)
diff --git a/searchcore/src/tests/proton/proton_disk_layout/CMakeLists.txt b/searchcore/src/tests/proton/proton_disk_layout/CMakeLists.txt
index 5b6c84393f7..7c3b5d56d5c 100644
--- a/searchcore/src/tests/proton/proton_disk_layout/CMakeLists.txt
+++ b/searchcore/src/tests/proton/proton_disk_layout/CMakeLists.txt
@@ -5,6 +5,5 @@ vespa_add_executable(searchcore_proton_disk_layout_test_app TEST
     DEPENDS
     searchcore_test
     searchcore_server
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_proton_disk_layout_test_app COMMAND searchcore_proton_disk_layout_test_app)
diff --git a/searchcore/src/tests/proton/server/CMakeLists.txt b/searchcore/src/tests/proton/server/CMakeLists.txt
index fc211d460ab..94ffbfc1fc1 100644
--- a/searchcore/src/tests/proton/server/CMakeLists.txt
+++ b/searchcore/src/tests/proton/server/CMakeLists.txt
@@ -4,7 +4,6 @@ vespa_add_executable(searchcore_documentretriever_test_app TEST
     documentretriever_test.cpp
     DEPENDS
     searchcore_server
-    searchcore_fconfig
     searchcore_attribute
     searchcore_feedoperation
     searchcore_documentmetastore
@@ -32,7 +31,6 @@ vespa_add_executable(searchcore_feedstates_test_app TEST
     searchcore_feedoperation
     searchcore_pcommon
     searchcore_proton_metrics
-    searchcore_fconfig
 )
 vespa_add_test(NAME searchcore_feedstates_test_app COMMAND searchcore_feedstates_test_app)
 vespa_add_executable(searchcore_memoryconfigstore_test_app TEST
diff --git a/searchcore/src/tests/proton/server/shared_threading_service/shared_threading_service_test.cpp b/searchcore/src/tests/proton/server/shared_threading_service/shared_threading_service_test.cpp
index fe7303692ba..1b6fa49df72 100644
--- a/searchcore/src/tests/proton/server/shared_threading_service/shared_threading_service_test.cpp
+++ b/searchcore/src/tests/proton/server/shared_threading_service/shared_threading_service_test.cpp
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
+#include <vespa/config-proton.h>
 #include <vespa/persistence/dummyimpl/dummy_bucket_executor.h>
-#include <vespa/searchcore/config/config-proton.h>
 #include <vespa/searchcore/proton/server/shared_threading_service.h>
 #include <vespa/searchcore/proton/server/shared_threading_service_config.h>
 #include <vespa/searchcore/proton/test/transport_helper.h>
diff --git a/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt b/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt
index 0489690c7c4..86f827e9be7 100644
--- a/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt
@@ -48,7 +48,6 @@ vespa_add_library(searchcore_bmcluster STATIC
     searchcore_pcommon
     searchcore_grouping
     searchcore_proton_metrics
-    searchcore_fconfig
     searchcorespi
     storageserver_storageapp
     messagebus_messagebus-test
diff --git a/searchcore/src/vespa/searchcore/config/.gitignore b/searchcore/src/vespa/searchcore/config/.gitignore
deleted file mode 100644
index d58390943e2..00000000000
--- a/searchcore/src/vespa/searchcore/config/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.depend
-Makefile
-config-*.cpp
-config-*.h
diff --git a/searchcore/src/vespa/searchcore/config/CMakeLists.txt b/searchcore/src/vespa/searchcore/config/CMakeLists.txt
deleted file mode 100644
index 978969bbf27..00000000000
--- a/searchcore/src/vespa/searchcore/config/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_library(searchcore_fconfig STATIC
-    SOURCES
-    DEPENDS
-)
-vespa_generate_config(searchcore_fconfig proton.def)
-install_config_definition(proton.def vespa.config.search.core.proton.def)
-vespa_generate_config(searchcore_fconfig hwinfo.def)
diff --git a/searchcore/src/vespa/searchcore/config/OWNERS b/searchcore/src/vespa/searchcore/config/OWNERS
deleted file mode 100644
index 7ae1acb1be9..00000000000
--- a/searchcore/src/vespa/searchcore/config/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-geirst
diff --git a/searchcore/src/vespa/searchcore/config/hwinfo.def b/searchcore/src/vespa/searchcore/config/hwinfo.def
deleted file mode 100644
index 60dff099fa2..00000000000
--- a/searchcore/src/vespa/searchcore/config/hwinfo.def
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-namespace=vespa.config.search.core
-
-## Write speed, MiB/s, typically measured by writing 1 GiB data to disk.
-disk.writespeed double default = 0.0
-
-## Sample time, in seconds since epoch
-disk.sampletime long default = 0
diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def
deleted file mode 100644
index e85e6c58e11..00000000000
--- a/searchcore/src/vespa/searchcore/config/proton.def
+++ /dev/null
@@ -1,548 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-namespace=vespa.config.search.core
-
-## Base directory. The default is ignored as it is assigned by the model
-basedir       string default="." restart
-
-## Port to use for the rpcserver.
-rpcport       int default=8004 restart
-
-## Port to use for the web server
-httpport       int default=0 restart
-
-## Cluster name
-clustername	string default="" restart
-
-## Distribution key
-distributionkey int default=-1
-
-## Number of threads used for rpc transport threads
-## A zero value will make the backend smart about the number.
-rpc.transportthreads int default=0 restart
-
-## Dispatch search requests to threadpool
-search.async bool default=true
-
-## Dispatch docsum requests to threadpool
-docsum.async bool default=true
-
-## Num searcher threads
-numsearcherthreads int default=64 restart
-
-## Number of threads used per search
-numthreadspersearch int default=1 restart
-
-## Num summary threads
-numsummarythreads int default=16 restart
-
-## Perform extra validation of stored data on startup
-## It requires a restart to enable, but no restart to disable.
-## Hence it must always be followed by a manual restart when enabled.
-validate_and_sanitize_docstore enum {NO, YES} default = NO
-
-## Maximum number of concurrent flushes outstanding.
-flush.maxconcurrent int default=2 restart
-
-## Number of seconds between checking for stuff to flush when the system is idling.
-flush.idleinterval double default=10.0 restart
-
-## Which flushstrategy to use.
-flush.strategy enum {SIMPLE, MEMORY} default=MEMORY restart
-
-## The total maximum memory (in bytes) used by FLUSH components before running flush.
-## A FLUSH component will free memory when flushed (e.g. memory index).
-flush.memory.maxmemory long default=4294967296
-
-## Maximum total disk bloat factor before forcing flush.
-flush.memory.diskbloatfactor double default=0.25
-
-## Max disk usage (in bytes) for all transaction logs before running flush.
-## In this case the oldest component is flushed such that transaction log can be pruned and disk freed.
-flush.memory.maxtlssize long default=21474836480
-
-## The maximum memory (in bytes) used by a single FLUSH component before running flush.
-## A FLUSH component will free memory when flushed (e.g. memory index).
-flush.memory.each.maxmemory long default=1073741824
-
-## Maximum disk bloat factor per component before forcing flush.
-flush.memory.each.diskbloatfactor double default=0.25
-
-## Age of unflushed content before forcing age prioritization.
-## Unit is seconds with 31 hours being the default.
-## 31 is selected as it is both a prime and (31-24=7) is a prime and hence it will
-## not be closer to a multiple of a day for a month, and it will be at least one hour away.
-flush.memory.maxage.time double default=111600.0
-
-## When resource limit for memory is reached we choose a conservative mode for the flush strategy.
-## In this case this factor is multiplied with 'maxmemory' and 'each.maxmemory' to calculate conservative values to use instead.
-flush.memory.conservative.memorylimitfactor double default=0.5
-
-## When resource limit for disk is reached we choose a conservative mode for the flush strategy.
-## In this case this factor is multiplied with 'maxtlssize' to calculate a conservative value to use instead.
-flush.memory.conservative.disklimitfactor double default=0.5
-
-## The factor used to multiply with the resource limits for disk / memory to find the high
-## watermark indicating when to from normal into conservative mode for the flush strategy.
-flush.memory.conservative.highwatermarkfactor double default=0.95
-
-## The factor used to multiply with the resource limits for disk / memory to find the low
-## watermark indicating when to go back from conservative to normal mode for the flush strategy.
-flush.memory.conservative.lowwatermarkfactor double default=0.9
-
-## The cost of replaying a byte when replaying the transaction log.
-##
-## The estimate of the total cost of replaying the transaction log:
-## (number of bytes to replay) * replaycost + (number of operations to replay) * replayoperationcost
-##
-## The prepare for restart flush strategy will choose a set of components to flush
-## such that the cost of flushing these + the cost of replaying the transaction log
-## is as low as possible.
-flush.preparerestart.replaycost double default=8.0
-
-## The cost of replaying an operation when replaying the transaction log.
-##
-## The estimate of the total cost of replaying the transaction log:
-## (number of bytes to replay) * replaycost + (number of operations to replay) * replayoperationcost
-##
-## The default value is chosen based on the following example:
-## Assume we can replay 9 MB/s and this corresponds to 24000 ops/s.
-## replayoperationcost = (bytes to replay) * replaycost / (operations to replay) = 9 MB * 8.0 / 24000 = 3000
-##
-## The prepare for restart flush strategy will choose a set of components to flush
-## such that the cost of flushing these + the cost of replaying the transaction log
-## is as low as possible.
-flush.preparerestart.replayoperationcost double default=3000.0
-
-## The cost of writing a byte when flushing components to disk.
-##
-## The number of bytes to write (for a set of flushed components) * writecost
-## gives an estimate of the total cost of flushing this set of components.
-##
-## The prepare for restart flush strategy will choose a set of components to flush
-## such that the cost of flushing these + the cost of replaying the transaction log
-## is as low as possible.
-flush.preparerestart.writecost double default=1.0
-
-## Control io options during write both under dump and fusion.
-indexing.write.io enum {NORMAL, OSYNC, DIRECTIO} default=DIRECTIO restart
-
-## Control io options during read both under dump and fusion.
-indexing.read.io enum {NORMAL, DIRECTIO} default=DIRECTIO restart
-
-## Option to specify what is most important during indexing.
-## This is experimental and will most likely be temporary.
-indexing.optimize enum {LATENCY, THROUGHPUT, ADAPTIVE} default=THROUGHPUT restart
-
-## Maximum number of pending operations for each of the internal
-## indexing threads.  Only used when visibility delay is zero.
-indexing.tasklimit int default=-1000
-
-## Kind of watermark for when to activate extra manpower
-## Utilized if optimize is set to either THROUGHPUT or ADAPTIVE
-indexing.kind_of_watermark int default = 0 restart
-
-## Controls minimum reaction time in seconds if using THROUGHPUT
-indexing.reactiontime double default = 0.001 restart
-
-## How long a freshly loaded index shall be warmed up
-## before being used for serving
-index.warmup.time double default=0.0 restart
-
-# Indicate if we also want warm up with full unpack, instead of only cheaper seek.
-index.warmup.unpack bool default=false restart
-
-## How many flushed indexes there can be before fusion is forced while node is
-## not in retired state.
-## Setting to 1 will force an immediate fusion.
-index.maxflushed int default=2
-
-## How many flushed indexes there can be before fusion is forced while node is
-## in retired state.
-## Setting to 1 will force an immediate fusion.
-index.maxflushedretired int default=20
-
-## Control io options during flushing of attributes.
-attribute.write.io enum {NORMAL, OSYNC, DIRECTIO} default=DIRECTIO restart
-
-## Multiple optional options for use with mmap
-search.mmap.options[] enum {POPULATE, HUGETLB} restart
-
-## Advise to give to os when mapping memory.
-## TODO Check if default should be random
-search.mmap.advise enum {NORMAL, RANDOM, SEQUENTIAL} default=NORMAL restart
-
-## Max number of threads allowed to handle large queries concurrently
-## Positive number means there is a limit, 0 or negative means no limit.
-## TODO Check if ever used in config.
-search.memory.limiter.maxthreads int default=0
-
-## Minimum coverage of corpus to postprocess before applying above concurrency limit.
-search.memory.limiter.mincoverage double default=1.0
-
-## Minimum number of hits to postprocess before applying above concurrency limit.
-## Both must be covered before applying limiter.
-search.memory.limiter.minhits int default=1000000
-
-## Control of grouping session manager entries
-grouping.sessionmanager.maxentries int default=500 restart
-
-## Control of pruning interval to remove sessions that have timed out
-grouping.sessionmanager.pruning.interval double default=1.0
-
-## Redundancy of documents.
-distribution.redundancy long default=1
-
-## Searchable copies of the documents.
-distribution.searchablecopies long default=1
-
-## Control cache size in bytes.
-## Postive numbers are absolute in bytes.
-## Negative numbers are a percentage of memory.
-summary.cache.maxbytes long default=-4
-
-## Control compression type of the summary while in the cache.
-summary.cache.compression.type enum {NONE, LZ4, ZSTD} default=LZ4
-
-## Control compression level of the summary while in cache.
-## LZ4 has normal range 1..9 while ZSTD has range 1..19
-## 6 is a default for lz4 to prioritize speed.
-summary.cache.compression.level int default=6
-
-## Control if cache entry is updated or ivalidated when changed.
-summary.cache.update_strategy enum {INVALIDATE, UPDATE} default=INVALIDATE
-
-## Control compression type of the summary while in memory during compaction
-## NB So far only stragey=LOG honours it.
-## TODO Use same as for store (chunk.compression).
-summary.log.compact.compression.type enum {NONE, LZ4, ZSTD} default=ZSTD
-
-## Control compression level of the summary while in memory during compaction
-## LZ4 has normal range 1..9 while ZSTD has range 1..19
-## 9 is a reasonable default for both
-summary.log.compact.compression.level int default=9
-
-## Control compression type of the summary
-summary.log.chunk.compression.type enum {NONE, LZ4, ZSTD} default=ZSTD
-
-## Control compression level of the summary
-## LZ4 has normal range 1..9 while ZSTD has range 1..19
-## 9 is a reasonable default for both. Going above for ZSTD can give an improvement,
-## but is better done in conjunction with increasing chunk size.
-summary.log.chunk.compression.level int default=9
-
-## Max size in bytes per chunk.
-summary.log.chunk.maxbytes int default=65536
-
-## Max size per summary file.
-summary.log.maxfilesize long default=1000000000
-
-## Max number of lid entries per file
-## TODO Decide based on memory on node.
-summary.log.maxnumlids int default=40000000
-
-## Max disk bloat factor. This will trigger compacting.
-summary.log.maxdiskbloatfactor double default=0.1
-
-## Max bucket spread within a single summary file. This will trigger bucket order compacting.
-summary.log.maxbucketspread double default=2.5
-
-## If a file goes below this ratio compared to allowed max size it will be joined to the front.
-## Value in the range [0.0, 1.0]
-summary.log.minfilesizefactor double default=0.2
-
-## Control io options during flush of stored documents.
-summary.write.io enum {NORMAL, OSYNC, DIRECTIO} default=DIRECTIO
-
-## Control io options during read of stored documents.
-## All summary.read options will take effect immediately on new files written.
-## On old files it will take effect either upon compact or on restart.
-## TODO Default is probably DIRECTIO
-summary.read.io enum {NORMAL, DIRECTIO, MMAP } default=MMAP restart
-
-## Multiple optional options for use with mmap
-summary.read.mmap.options[] enum {POPULATE, HUGETLB} restart
-
-## Advise to give to os when mapping memory.
-summary.read.mmap.advise enum {NORMAL, RANDOM, SEQUENTIAL} default=NORMAL restart
-
-## The name of the input document type
-documentdb[].inputdoctypename string
-## The type of the documentdb
-documentdb[].mode enum {INDEX, STREAMING, STORE_ONLY} default=INDEX
-## The configid used to subscribe to config for this database.
-documentdb[].configid string
-## How many seconds is allowed from document is received to it is visible in the index.
-documentdb[].visibilitydelay double default=0.0
-## Whether this document type is globally distributed or not.
-documentdb[].global bool default=false
-
-## Minimum initial size for any per document tables.
-documentdb[].allocation.initialnumdocs long default=1024
-## Grow factor for any per document tables.
-documentdb[].allocation.growfactor double default=0.2
-## Constant added when growing any per document tables.
-documentdb[].allocation.growbias int default=1
-
-## The number of documents to amortize memory spike cost over
-documentdb[].allocation.amortizecount int default=10000
-
-## The grow factor used when allocating buffers in the array store
-## used in multi-value attribute vectors to store underlying values.
-documentdb[].allocation.multivaluegrowfactor double default=0.2
-
-## The ratio of used bytes that can be dead before attempting to perform compaction.
-documentdb[].allocation.max_dead_bytes_ratio double default=0.05
-
-## The ratio of used address space that can be dead before attempting to perform compaction.
-documentdb[].allocation.max_dead_address_space_ratio double default=0.2
-
-## Upper bound for number of buffers that can be compacted at the same time in
-## a data store for a specific reason (e.g. memory used, address space used).
-documentdb[].allocation.max_compact_buffers int default=1
-
-## Ratio of active buffers that can be compacted at the same time in a data
-## store for a specific reason (e.g. memory used, address space used).
-## Effective limit is ceil(active_buffers * active_buffers_ratio).
-documentdb[].allocation.active_buffers_ratio double default=0.1
-
-## The interval of when periodic tasks should be run
-periodic.interval double default=3600.0
-
-## Connect spec for transactionlog server.
-## TODO Consider not using RPC at all
-tlsspec       string default="tcp/localhost:13700" restart
-
-## ConfigId for transactionlogserver
-tlsconfigid   string default="" restart
-
-## Slobrok configid
-slobrokconfigid         string default="" restart
-
-## Routing configid
-routingconfigid         string default="" restart
-
-## filedistributor rpc configuration
-filedistributor.configid reference default="" restart
-
-## Interval between pruning of old removed documents.
-##
-## If set to 0 (default) the value is calculated as (pruneremoveddocumentsage / 100) (default 3.36 hours).
-pruneremoveddocumentsinterval double default=0.0
-
-## Age of removed document before it can be pruned.
-##
-## Default value is 2 weeks (1209600 seconds).
-pruneremoveddocumentsage double default=1209600.0
-
-## Minimum size of packets to compress (0 means no compression)
-##
-packetcompresslimit int default=1024
-
-## Compression level for packets
-##
-## Default value is 3
-packetcompresslevel int default=3
-
-## Compression type for packets
-##
-## Default is LZ4
-packetcompresstype enum {NONE, LZ4} default=LZ4
-
-## Interval between considering if lid space compaction should be done (in seconds).
-##
-## Default value is 10 seconds.
-lidspacecompaction.interval double default=10.0
-
-## The allowed lid bloat (in docs) before considering lid space compaction.
-##
-## When considering compaction the lid bloat is calculated as (docIdLimit - numDocs).
-## The lid bloat must be >= allowedlidbloat before considering compaction.
-lidspacecompaction.allowedlidbloat int default=1
-
-## The allowed lid bloat factor (relative) before considering lid space compaction.
-##
-## When considering compaction the lid bloat factor is calculated as (docIdLimit - numDocs)/docIdLimit.
-## The lid bloat factor must be >= allowedlidbloatfactor before considering compaction.
-lidspacecompaction.allowedlidbloatfactor double default=0.01
-
-## The rate (ops / second) of remove batch operations for when to block lid space compaction.
-##
-## When considering compaction, if the current observed rate of remove batch operations
-## is higher than the given block rate, the lid space compaction job is blocked.
-## It is considered again at the next regular interval (see above).
-##
-## Remove batch operations are used when deleting buckets on a content node.
-## This functionality ensures that during massive deleting of buckets (e.g. as part of redistribution of data to a new node),
-## lid space compaction do not interfere, but instead is applied after deleting of buckets is complete.
-lidspacecompaction.removebatchblockrate double default=0.5
-
-## The rate (ops / second) of remove operations for when to block lid space compaction.
-##
-## When considering compaction, if the current observed rate of remove operations
-## is higher than the given block rate, the lid space compaction job is blocked.
-## It is considered again at the next regular interval (see above).
-lidspacecompaction.removeblockrate double default=100.0
-
-## Maximum docs to move in single operation per bucket
-bucketmove.maxdocstomoveperbucket int default=1
-
-## This is the maximum value visibilitydelay you can have.
-## A to higher value here will cost more memory while not improving too much.
-maxvisibilitydelay double default=1.0
-
-## You can set this to a number above zero for visit to shortcut expensive serialize size computation.
-## This value will be provided instead.
-## negative number will compute it accurately.
-## This is only used for weakly consistent visiting, like streaming search.
-visit.defaultserializedsize long default=1
-
-## This will ignore the maxbytes limit advised from above.
-## This is only used for weakly consistent visiting, like streaming search.
-visit.ignoremaxbytes bool default=true
-
-## Number of initializer threads used for loading structures from disk at proton startup.
-## The threads are shared between document databases when value is larger than 0.
-## When set to 0 (default) we use 1 separate thread per document database.
-## TODO Consider if really necessary, could be automatic.
-initialize.threads int default = 0
-
-## Portion of max address space used in components in attribute vectors
-## before put and update operations in feed is blocked.
-writefilter.attribute.address_space_limit double default = 0.92
-
-## Portion of physical memory that can be resident memory in anonymous mapping
-## by the proton process before put and update portion of feed is blocked.
-writefilter.memorylimit double default = 0.8
-
-## Portion of space on disk partition that can be used or reserved before
-## put and update portion of feed is blocked.
-writefilter.disklimit double default = 0.8
-
-## Interval between sampling of disk and memory usage. Default is 10 seconds.
-writefilter.sampleinterval double default = 10.0
-
-## The size of the disk partition (in bytes) on which proton basedir is located.
-## If set to 0, the disk size is sampled by looking at the filesystem space info.
-## The disk size is used when determining if feed should be blocked in writefilter.
-hwinfo.disk.size long default = 0 restart
-
-## Whether the disk partition is shared among several instances of proton (e.g. when using docker).
-## If shared, disk usage is sampled by doing a recursive directory scan in proton basedir.
-## If not, disk usage is sampled by looking at the filesystem space info.
-hwinfo.disk.shared bool default = false restart
-
-## Override for disk write speed, measured in MiB/s. When zero, the
-## actual disk write speed is sampled by writing data to a temporary file.
-hwinfo.disk.writespeed double default = 200.0 restart
-
-## Amount of data to write to temporary file when sampling disk write speed.
-## Default is 1 GiB.
-## TODO Check if still in use
-hwinfo.disk.samplewritesize long default = 1073741824 restart
-
-## Minimum write speed needed to avoid disk being considered slow.
-## Unit is MiB/s, default is 100.0 MiB/s.
-## TODO Check if still in use
-hwinfo.disk.slowwritespeedlimit double default = 100.0 restart
-
-## The size of physical memory (in bytes) available to proton.
-## If set to 0, the memory size is sampled as _SC_PHYS_PAGES * _SC_PAGESIZE by using sysconf to do the lookup.
-## The memory size is used when determining if feed should be blocked in writefilter.
-hwinfo.memory.size long default = 0 restart
-
-## The number of cores on the cpu.
-## If set to 0, this is sampled by using std::thread::hardware_concurrency().
-hwinfo.cpu.cores int default = 0 restart
-
-## A number between 0.0 and 1.0 that specifies the concurrency when handling feed operations.
-## When set to 1.0 all cores on the cpu is utilized.
-##
-## 3 thread pools used for various aspect of feeding are configured based on this setting:
-##   1) Basic shared thread pool. E.g. used for compressing and compacting documents.
-##   2) Warmup thread pool. Used for disk index warmup.
-##   3) Field writer thread pool. Used for writing data to document fields:
-##     - Inverting index fields
-##     - Writing changes to index fields
-##     - Writing changes to attribute fields
-##
-## See shared_threading_service_config.cpp for details on how the thread pool sizes are calculated.
-feeding.concurrency double default = 0.2 restart
-
-## A number between 0.0 and 1.0 telling how nice the feed and background threads shall be.
-## A value of 0.0, which is default, means 'not any nicer than anyone else'.
-## The scale from 0.0 to 1.0 is not linear. It is OS specific.
-feeding.niceness double default = 0.0 restart
-
-## Maximum number of pending tasks for the master thread in each document db.
-##
-## This limit is only considered when executing tasks for handling external feed operations.
-## In that case the calling thread (persistence thread) is blocked until the master thread has capacity to handle more tasks.
-## When this limit is set to 0 it is ignored.
-## TODO Check if still in use
-feeding.master_task_limit int default = 0
-
-## Adjustment to resource limit when determining if maintenance jobs can run.
-##
-## Currently used by 'lid_space_compaction' and 'move_buckets' jobs.
-maintenancejobs.resourcelimitfactor double default = 1.05
-
-## The max outstanding move operations a maintenance job can have before being blocked.
-##
-## The job is unblocked (and executed again) when this goes under the limit again.
-## Currently used by 'lid_space_compaction' job.
-maintenancejobs.maxoutstandingmoveops int default=100
-
-## Controls the type of bucket checksum used. Do not change unless 
-## in depth understanding is present.
-bucketdb.checksumtype enum {LEGACY, XXHASH64} default = LEGACY restart
-
-## Chooses the throttling policy used to control the window size
-## of the SharedOperationThrottler component used by the transaction log replay feed state.
-replay_throttling_policy.type enum { UNLIMITED, DYNAMIC } default=DYNAMIC
-## Only used if replay_throttling_policy.type == DYNAMIC:
-## TODO consider just hardcoding values as they have never been tuned.
-replay_throttling_policy.min_window_size int default=100
-replay_throttling_policy.max_window_size int default=10000
-replay_throttling_policy.window_size_increment int default=20
-
-## Everything below are deprecated and ignored. Will go away at any time.
-
-## Deprecated and ignored, will soon go away
-indexing.semiunboundtasklimit int default = 1000
-
-## Include visits in the cache, if the visitoperation allows it.
-## This will enable another separate cache of summary.cache.maxbytes size.
-## IGNORED and DEPRECATED Will go away soon
-summary.cache.allowvisitcaching bool default=true
-
-## Control number of cache entries preallocated.
-## Default is no preallocation.
-## Can be set to a higher number to avoid resizing.
-## IGNORED and DEPRECATED Will go away soon
-summary.cache.initialentries long default=0 restart
-
-## Skip crc32 check on read.
-## IGNORED and DEPRECATED Will go away soon
-summary.log.chunk.skipcrconread bool default=false
-
-## Overrides the number of threads used for writing fields across all document dbs.
-## See feeding.concurrency for details.
-## DEPRECATED - Remove usage
-indexing.threads int default=1 restart
-
-## How much memory is set aside for caching.
-## Now only used for caching of dictionary lookups.
-## TODO Still relevant, check config model, seems unused.
-index.cache.size long default=0 restart
-
-## Specifies which tensor implementation to use for all backend code.
-##
-## TENSOR_ENGINE (default) uses DefaultTensorEngine, which has been the production implementation for years.
-## FAST_VALUE uses the new and optimized FastValueBuilderFactory instead.
-## TODO: Remove when default has been switched to FAST_VALUE.
-tensor_implementation enum {TENSOR_ENGINE, FAST_VALUE} default = FAST_VALUE
-
-## Whether to report issues back to the container via protobuf field
-## TODO Remove always on
-forward_issues bool default = true
-
diff --git a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt
index d42f764fa77..7bb1c9b878c 100644
--- a/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/common/CMakeLists.txt
@@ -29,7 +29,6 @@ vespa_add_library(searchcore_pcommon STATIC
     statusreport.cpp
     DEPENDS
     searchcore_proton_metrics
-    searchcore_fconfig
     EXTERNAL_DEPENDS
     ${VESPA_STDCXX_FS_LIB}
 )
diff --git a/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp b/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp
index 2f054843dd3..e25eb5c422c 100644
--- a/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/hw_info_sampler.cpp
@@ -1,10 +1,10 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "hw_info_sampler.h"
+#include <vespa/config-hwinfo.h>
 #include <vespa/config/print/fileconfigwriter.h>
 #include <vespa/config/subscription/configsubscriber.hpp>
 #include <vespa/fastos/file.h>
-#include <vespa/searchcore/config/config-hwinfo.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/vespalib/util/time.h>
 #include <vespa/vespalib/util/resource_limits.h>
diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/docsummary/CMakeLists.txt
index 9861812df6b..d1f3739c663 100644
--- a/searchcore/src/vespa/searchcore/proton/docsummary/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/docsummary/CMakeLists.txt
@@ -8,6 +8,4 @@ vespa_add_library(searchcore_docsummary STATIC
     summaryflushtarget.cpp
     summarymanager.cpp
     summarymanagerinitializer.cpp
-    DEPENDS
-    searchcore_fconfig
 )
diff --git a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt
index 34e2ee283f1..0f36ab4e834 100644
--- a/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/server/CMakeLists.txt
@@ -124,7 +124,6 @@ vespa_add_library(searchcore_server STATIC
     searchcore_persistenceengine
     searchcore_reprocessing
     searchcore_summaryengine
-    searchcore_fconfig
     searchcore_reference
     configdefinitions
     EXTERNAL_DEPENDS
diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h
index e697ad58a81..583009fcf04 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h
+++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfig.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
+#include <vespa/config-proton.h>
 #include <vespa/searchcore/proton/common/hw_info.h>
-#include <vespa/searchcore/config/config-proton.h>
 #include <vespa/document/config/config-documenttypes.h>
 #include <vespa/document/config/documenttypes_config_fwd.h>
 #include <vespa/searchlib/common/tunefileinfo.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/memory_flush_config_updater.h b/searchcore/src/vespa/searchcore/proton/server/memory_flush_config_updater.h
index ca50838e70c..0fecc137f48 100644
--- a/searchcore/src/vespa/searchcore/proton/server/memory_flush_config_updater.h
+++ b/searchcore/src/vespa/searchcore/proton/server/memory_flush_config_updater.h
@@ -4,7 +4,7 @@
 
 #include "i_disk_mem_usage_listener.h"
 #include "memoryflush.h"
-#include <vespa/searchcore/config/config-proton.h>
+#include <vespa/config-proton.h>
 #include <vespa/searchcore/proton/common/hw_info.h>
 #include <mutex>
 
diff --git a/searchcore/src/vespa/searchcore/proton/server/prepare_restart_handler.h b/searchcore/src/vespa/searchcore/proton/server/prepare_restart_handler.h
index a35692c9205..0c821779e03 100644
--- a/searchcore/src/vespa/searchcore/proton/server/prepare_restart_handler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/prepare_restart_handler.h
@@ -2,7 +2,7 @@
 
 #pragma once
 
-#include <vespa/searchcore/config/config-proton.h>
+#include <vespa/config-proton.h>
 #include <condition_variable>
 #include <memory>
 #include <mutex>
diff --git a/searchcore/src/vespa/searchcore/proton/server/shared_threading_service_config.cpp b/searchcore/src/vespa/searchcore/proton/server/shared_threading_service_config.cpp
index c1802b40deb..027d0537c95 100644
--- a/searchcore/src/vespa/searchcore/proton/server/shared_threading_service_config.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/shared_threading_service_config.cpp
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "shared_threading_service_config.h"
-#include <vespa/searchcore/config/config-proton.h>
+#include <vespa/config-proton.h>
 #include <cmath>
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/threading_service_config.cpp b/searchcore/src/vespa/searchcore/proton/server/threading_service_config.cpp
index a2ab9e7c925..cd8725814d7 100644
--- a/searchcore/src/vespa/searchcore/proton/server/threading_service_config.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/threading_service_config.cpp
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "threading_service_config.h"
-#include <vespa/searchcore/config/config-proton.h>
+#include <vespa/config-proton.h>
 #include <cmath>
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/server/threading_service_config.h b/searchcore/src/vespa/searchcore/proton/server/threading_service_config.h
index d13c7fb392f..7ba3c3eaebe 100644
--- a/searchcore/src/vespa/searchcore/proton/server/threading_service_config.h
+++ b/searchcore/src/vespa/searchcore/proton/server/threading_service_config.h
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/searchcore/config/config-proton.h>
+#include <vespa/config-proton.h>
 #include <vespa/searchcore/proton/common/hw_info.h>
 #include <vespa/vespalib/util/executor.h>
 #include <vespa/vespalib/util/time.h>
diff --git a/searchcore/src/vespa/searchcore/proton/test/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/test/CMakeLists.txt
index e3b1aad3c60..40e2b460bc6 100644
--- a/searchcore/src/vespa/searchcore/proton/test/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/test/CMakeLists.txt
@@ -20,7 +20,6 @@ vespa_add_library(searchcore_test STATIC
     transport_helper.cpp
     DEPENDS
     searchcore_server
-    searchcore_fconfig
     searchcorespi
     searchlib_test
 )