Merge pull request #22690 from vespa-engine/balder/fold-searchcommon-into-searchlib

Fold searchcommon into searchlib

68 files changed, 9 insertions, 62 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b0c2fbf8f6..ec0fc4a4dda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,7 +112,6 @@ add_subdirectory(node-repository)
 add_subdirectory(orchestrator)
 add_subdirectory(persistence)
 add_subdirectory(predicate-search)
-add_subdirectory(searchcommon)
 add_subdirectory(searchcore)
 add_subdirectory(searchlib)
 add_subdirectory(searchsummary)
diff --git a/searchcommon/.gitignore b/searchcommon/.gitignore
deleted file mode 100644
index f3c7a7c5da6..00000000000
--- a/searchcommon/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/searchcommon/CMakeLists.txt b/searchcommon/CMakeLists.txt
deleted file mode 100644
index e5260ecb69e..00000000000
--- a/searchcommon/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_define_module(
-    DEPENDS
-    fastos
-    vespalog
-    vespalib
-    config_cloudconfig
-    configdefinitions
-    vespaeval
-
-    TESTS
-    src/tests/attribute/config
-    src/tests/schema
-
-    LIBS
-    src/vespa/searchcommon
-    src/vespa/searchcommon/attribute
-    src/vespa/searchcommon/common
-    src/vespa/searchcommon/config
-)
diff --git a/searchcommon/OWNERS b/searchcommon/OWNERS
deleted file mode 100644
index cf65e9c8229..00000000000
--- a/searchcommon/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-geirst
-baldersheim
-toregge
diff --git a/searchcommon/src/.gitignore b/searchcommon/src/.gitignore
deleted file mode 100644
index 2e8e6fd906a..00000000000
--- a/searchcommon/src/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/Makefile.ini
-/config_command.sh
-/project.dsw
diff --git a/searchcommon/src/vespa/searchcommon/CMakeLists.txt b/searchcommon/src/vespa/searchcommon/CMakeLists.txt
deleted file mode 100644
index 4d0d900bdf2..00000000000
--- a/searchcommon/src/vespa/searchcommon/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(searchcommon
-    SOURCES
-    $<TARGET_OBJECTS:searchcommon_searchcommon_common>
-    $<TARGET_OBJECTS:searchcommon_searchcommon_attribute>
-    INSTALL lib64
-    DEPENDS
-)
diff --git a/searchcommon/src/vespa/searchcommon/config/.gitignore b/searchcommon/src/vespa/searchcommon/config/.gitignore
deleted file mode 100644
index 7e7c0fe7fae..00000000000
--- a/searchcommon/src/vespa/searchcommon/config/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/.depend
-/Makefile
diff --git a/searchcommon/src/vespa/searchcommon/config/CMakeLists.txt b/searchcommon/src/vespa/searchcommon/config/CMakeLists.txt
deleted file mode 100644
index e97068a5662..00000000000
--- a/searchcommon/src/vespa/searchcommon/config/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(searchcommon_config INTERFACE
-    SOURCES
-    INSTALL lib64
-    DEPENDS
-)
diff --git a/searchcommon/testrun/.gitignore b/searchcommon/testrun/.gitignore
deleted file mode 100644
index 8f0724a7dba..00000000000
--- a/searchcommon/testrun/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/test-report.html
-/test-report.html.bottom
-/test-report.html.entry
-/test-report.html.summary
-/test-report.html.top
-test.*.*.desc
-test.*.*.file.*
-test.*.*.files.html
-test.*.*.log
-tmp.*
-/test.*.*.result
-/Makefile
diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt
index 1d478f4f328..bd1f9e16ce8 100644
--- a/searchlib/CMakeLists.txt
+++ b/searchlib/CMakeLists.txt
@@ -11,7 +11,6 @@ vespa_define_module(
     fastlib_fast
     document
     config_cloudconfig
-    searchcommon
 
     EXTERNAL_DEPENDS
     ${VESPA_GLIBC_RT_LIB}
@@ -52,6 +51,8 @@ vespa_define_module(
     src/vespa/searchlib/transactionlog
     src/vespa/searchlib/uca
     src/vespa/searchlib/util
+    src/vespa/searchcommon/attribute
+    src/vespa/searchcommon/common
 
     APPS
     src/apps/docstore
@@ -212,6 +213,8 @@ vespa_define_module(
     src/tests/rankingexpression/intrinsic_blueprint_adapter
     src/tests/ranksetup
     src/tests/ranksetup/verify_feature
+    src/tests/searchcommon/attribute/config
+    src/tests/searchcommon/schema
     src/tests/sort
     src/tests/sortresults
     src/tests/sortspec
diff --git a/searchcommon/src/tests/.gitignore b/searchlib/src/tests/searchcommon/.gitignore
index a3e9c375723..a3e9c375723 100644
--- a/searchcommon/src/tests/.gitignore
+++ b/searchlib/src/tests/searchcommon/.gitignore
diff --git a/searchcommon/src/tests/attribute/config/.gitignore b/searchlib/src/tests/searchcommon/attribute/config/.gitignore
index ffdb7b1e933..ffdb7b1e933 100644
--- a/searchcommon/src/tests/attribute/config/.gitignore
+++ b/searchlib/src/tests/searchcommon/attribute/config/.gitignore
diff --git a/searchcommon/src/tests/attribute/config/CMakeLists.txt b/searchlib/src/tests/searchcommon/attribute/config/CMakeLists.txt
index 71df8414aee..f61138c5d73 100644
--- a/searchcommon/src/tests/attribute/config/CMakeLists.txt
+++ b/searchlib/src/tests/searchcommon/attribute/config/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(searchcommon_attribute_config_test_app TEST
     SOURCES
     attribute_config_test.cpp
     DEPENDS
-    searchcommon
+    searchlib
 )
 vespa_add_test(NAME searchcommon_attribute_config_test_app NO_VALGRIND COMMAND searchcommon_attribute_config_test_app)
diff --git a/searchcommon/src/tests/attribute/config/attribute_config_test.cpp b/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp
index 918e14546e6..918e14546e6 100644
--- a/searchcommon/src/tests/attribute/config/attribute_config_test.cpp
+++ b/searchlib/src/tests/searchcommon/attribute/config/attribute_config_test.cpp
diff --git a/searchcommon/src/tests/schema/.gitignore b/searchlib/src/tests/searchcommon/schema/.gitignore
index e000f0ca2c8..e000f0ca2c8 100644
--- a/searchcommon/src/tests/schema/.gitignore
+++ b/searchlib/src/tests/searchcommon/schema/.gitignore
diff --git a/searchcommon/src/tests/schema/CMakeLists.txt b/searchlib/src/tests/searchcommon/schema/CMakeLists.txt
index 515a5206f04..2304c319dea 100644
--- a/searchcommon/src/tests/schema/CMakeLists.txt
+++ b/searchlib/src/tests/searchcommon/schema/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(searchcommon_schema_test_app TEST
     SOURCES
     schema_test.cpp
     DEPENDS
-    searchcommon
+    searchlib
     GTest::GTest
 )
 vespa_add_test(NAME searchcommon_schema_test_app NO_VALGRIND COMMAND searchcommon_schema_test_app)
diff --git a/searchcommon/src/tests/schema/imported-fields-cfg/attributes.cfg b/searchlib/src/tests/searchcommon/schema/imported-fields-cfg/attributes.cfg
index 9a08f7e2324..9a08f7e2324 100644
--- a/searchcommon/src/tests/schema/imported-fields-cfg/attributes.cfg
+++ b/searchlib/src/tests/searchcommon/schema/imported-fields-cfg/attributes.cfg
diff --git a/searchcommon/src/tests/schema/load-save-cfg/attributes.cfg b/searchlib/src/tests/searchcommon/schema/load-save-cfg/attributes.cfg
index 09f711b6a65..09f711b6a65 100644
--- a/searchcommon/src/tests/schema/load-save-cfg/attributes.cfg
+++ b/searchlib/src/tests/searchcommon/schema/load-save-cfg/attributes.cfg
diff --git a/searchcommon/src/tests/schema/load-save-cfg/indexschema.cfg b/searchlib/src/tests/searchcommon/schema/load-save-cfg/indexschema.cfg
index b9d82b9b569..b9d82b9b569 100644
--- a/searchcommon/src/tests/schema/load-save-cfg/indexschema.cfg
+++ b/searchlib/src/tests/searchcommon/schema/load-save-cfg/indexschema.cfg
diff --git a/searchcommon/src/tests/schema/load-save-cfg/summary.cfg b/searchlib/src/tests/searchcommon/schema/load-save-cfg/summary.cfg
index 0c2de33d076..0c2de33d076 100644
--- a/searchcommon/src/tests/schema/load-save-cfg/summary.cfg
+++ b/searchlib/src/tests/searchcommon/schema/load-save-cfg/summary.cfg
diff --git a/searchcommon/src/tests/schema/schema-without-index-field-properties.txt b/searchlib/src/tests/searchcommon/schema/schema-without-index-field-properties.txt
index 4491b1242e0..4491b1242e0 100644
--- a/searchcommon/src/tests/schema/schema-without-index-field-properties.txt
+++ b/searchlib/src/tests/searchcommon/schema/schema-without-index-field-properties.txt
diff --git a/searchcommon/src/tests/schema/schema_test.cpp b/searchlib/src/tests/searchcommon/schema/schema_test.cpp
index 09a7359bac7..09a7359bac7 100644
--- a/searchcommon/src/tests/schema/schema_test.cpp
+++ b/searchlib/src/tests/searchcommon/schema/schema_test.cpp
diff --git a/searchcommon/src/vespa/searchcommon/.gitignore b/searchlib/src/vespa/searchcommon/.gitignore
index f76a9d84bed..f76a9d84bed 100644
--- a/searchcommon/src/vespa/searchcommon/.gitignore
+++ b/searchlib/src/vespa/searchcommon/.gitignore
diff --git a/searchcommon/src/vespa/searchcommon/attribute/.gitignore b/searchlib/src/vespa/searchcommon/attribute/.gitignore
index 7e7c0fe7fae..7e7c0fe7fae 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/.gitignore
+++ b/searchlib/src/vespa/searchcommon/attribute/.gitignore
diff --git a/searchcommon/src/vespa/searchcommon/attribute/CMakeLists.txt b/searchlib/src/vespa/searchcommon/attribute/CMakeLists.txt
index 704fe238ed5..704fe238ed5 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/CMakeLists.txt
+++ b/searchlib/src/vespa/searchcommon/attribute/CMakeLists.txt
diff --git a/searchcommon/src/vespa/searchcommon/attribute/attribute_utils.cpp b/searchlib/src/vespa/searchcommon/attribute/attribute_utils.cpp
index cd5cc58c75c..cd5cc58c75c 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/attribute_utils.cpp
+++ b/searchlib/src/vespa/searchcommon/attribute/attribute_utils.cpp
diff --git a/searchcommon/src/vespa/searchcommon/attribute/attribute_utils.h b/searchlib/src/vespa/searchcommon/attribute/attribute_utils.h
index e4c2a8e4727..e4c2a8e4727 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/attribute_utils.h
+++ b/searchlib/src/vespa/searchcommon/attribute/attribute_utils.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/attributecontent.h b/searchlib/src/vespa/searchcommon/attribute/attributecontent.h
index f5960ce358b..f5960ce358b 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/attributecontent.h
+++ b/searchlib/src/vespa/searchcommon/attribute/attributecontent.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/basictype.cpp b/searchlib/src/vespa/searchcommon/attribute/basictype.cpp
index 5bab2fc06d2..5bab2fc06d2 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/basictype.cpp
+++ b/searchlib/src/vespa/searchcommon/attribute/basictype.cpp
diff --git a/searchcommon/src/vespa/searchcommon/attribute/basictype.h b/searchlib/src/vespa/searchcommon/attribute/basictype.h
index bd7b4a2b4bc..bd7b4a2b4bc 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/basictype.h
+++ b/searchlib/src/vespa/searchcommon/attribute/basictype.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/collectiontype.cpp b/searchlib/src/vespa/searchcommon/attribute/collectiontype.cpp
index b77382f6126..b77382f6126 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/collectiontype.cpp
+++ b/searchlib/src/vespa/searchcommon/attribute/collectiontype.cpp
diff --git a/searchcommon/src/vespa/searchcommon/attribute/collectiontype.h b/searchlib/src/vespa/searchcommon/attribute/collectiontype.h
index 35cb7612ed0..35cb7612ed0 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/collectiontype.h
+++ b/searchlib/src/vespa/searchcommon/attribute/collectiontype.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/config.cpp b/searchlib/src/vespa/searchcommon/attribute/config.cpp
index 0a50faa04c0..0a50faa04c0 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/config.cpp
+++ b/searchlib/src/vespa/searchcommon/attribute/config.cpp
diff --git a/searchcommon/src/vespa/searchcommon/attribute/config.h b/searchlib/src/vespa/searchcommon/attribute/config.h
index f572f5038fc..f572f5038fc 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/config.h
+++ b/searchlib/src/vespa/searchcommon/attribute/config.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/distance_metric.h b/searchlib/src/vespa/searchcommon/attribute/distance_metric.h
index 26efa30bba4..26efa30bba4 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/distance_metric.h
+++ b/searchlib/src/vespa/searchcommon/attribute/distance_metric.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/hnsw_index_params.h b/searchlib/src/vespa/searchcommon/attribute/hnsw_index_params.h
index 4f9d3c5593c..4f9d3c5593c 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/hnsw_index_params.h
+++ b/searchlib/src/vespa/searchcommon/attribute/hnsw_index_params.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/i_attribute_functor.h b/searchlib/src/vespa/searchcommon/attribute/i_attribute_functor.h
index da5127de8ee..da5127de8ee 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/i_attribute_functor.h
+++ b/searchlib/src/vespa/searchcommon/attribute/i_attribute_functor.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/i_multi_value_attribute.h b/searchlib/src/vespa/searchcommon/attribute/i_multi_value_attribute.h
index ea1fbe0b2b4..ea1fbe0b2b4 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/i_multi_value_attribute.h
+++ b/searchlib/src/vespa/searchcommon/attribute/i_multi_value_attribute.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/i_multi_value_read_view.h b/searchlib/src/vespa/searchcommon/attribute/i_multi_value_read_view.h
index 8e5005eae8d..8e5005eae8d 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/i_multi_value_read_view.h
+++ b/searchlib/src/vespa/searchcommon/attribute/i_multi_value_read_view.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/i_search_context.h b/searchlib/src/vespa/searchcommon/attribute/i_search_context.h
index ff62c535e7f..ff62c535e7f 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/i_search_context.h
+++ b/searchlib/src/vespa/searchcommon/attribute/i_search_context.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/iattributecontext.h b/searchlib/src/vespa/searchcommon/attribute/iattributecontext.h
index bb349057ca9..bb349057ca9 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/iattributecontext.h
+++ b/searchlib/src/vespa/searchcommon/attribute/iattributecontext.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/iattributevector.h b/searchlib/src/vespa/searchcommon/attribute/iattributevector.h
index fa91f301b92..fa91f301b92 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/iattributevector.h
+++ b/searchlib/src/vespa/searchcommon/attribute/iattributevector.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/multi_value_traits.h b/searchlib/src/vespa/searchcommon/attribute/multi_value_traits.h
index f03b031f991..f03b031f991 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/multi_value_traits.h
+++ b/searchlib/src/vespa/searchcommon/attribute/multi_value_traits.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/multivalue.h b/searchlib/src/vespa/searchcommon/attribute/multivalue.h
index 2ed8309188e..2ed8309188e 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/multivalue.h
+++ b/searchlib/src/vespa/searchcommon/attribute/multivalue.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/persistent_predicate_params.h b/searchlib/src/vespa/searchcommon/attribute/persistent_predicate_params.h
index d81eb9c5d3c..d81eb9c5d3c 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/persistent_predicate_params.h
+++ b/searchlib/src/vespa/searchcommon/attribute/persistent_predicate_params.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/predicate_params.h b/searchlib/src/vespa/searchcommon/attribute/predicate_params.h
index 133b7331689..133b7331689 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/predicate_params.h
+++ b/searchlib/src/vespa/searchcommon/attribute/predicate_params.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/search_context_params.cpp b/searchlib/src/vespa/searchcommon/attribute/search_context_params.cpp
index 2e8aba6f5f8..2e8aba6f5f8 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/search_context_params.cpp
+++ b/searchlib/src/vespa/searchcommon/attribute/search_context_params.cpp
diff --git a/searchcommon/src/vespa/searchcommon/attribute/search_context_params.h b/searchlib/src/vespa/searchcommon/attribute/search_context_params.h
index 168f4215ef6..168f4215ef6 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/search_context_params.h
+++ b/searchlib/src/vespa/searchcommon/attribute/search_context_params.h
diff --git a/searchcommon/src/vespa/searchcommon/attribute/status.cpp b/searchlib/src/vespa/searchcommon/attribute/status.cpp
index a7d1f5b3d38..a7d1f5b3d38 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/status.cpp
+++ b/searchlib/src/vespa/searchcommon/attribute/status.cpp
diff --git a/searchcommon/src/vespa/searchcommon/attribute/status.h b/searchlib/src/vespa/searchcommon/attribute/status.h
index f2212d4c76a..f2212d4c76a 100644
--- a/searchcommon/src/vespa/searchcommon/attribute/status.h
+++ b/searchlib/src/vespa/searchcommon/attribute/status.h
diff --git a/searchcommon/src/vespa/searchcommon/common/.gitignore b/searchlib/src/vespa/searchcommon/common/.gitignore
index 7e7c0fe7fae..7e7c0fe7fae 100644
--- a/searchcommon/src/vespa/searchcommon/common/.gitignore
+++ b/searchlib/src/vespa/searchcommon/common/.gitignore
diff --git a/searchcommon/src/vespa/searchcommon/common/CMakeLists.txt b/searchlib/src/vespa/searchcommon/common/CMakeLists.txt
index 6cc02ae7884..6cc02ae7884 100644
--- a/searchcommon/src/vespa/searchcommon/common/CMakeLists.txt
+++ b/searchlib/src/vespa/searchcommon/common/CMakeLists.txt
diff --git a/searchcommon/src/vespa/searchcommon/common/datatype.cpp b/searchlib/src/vespa/searchcommon/common/datatype.cpp
index 1fe3a488aac..1fe3a488aac 100644
--- a/searchcommon/src/vespa/searchcommon/common/datatype.cpp
+++ b/searchlib/src/vespa/searchcommon/common/datatype.cpp
diff --git a/searchcommon/src/vespa/searchcommon/common/datatype.h b/searchlib/src/vespa/searchcommon/common/datatype.h
index e1c6a44b620..e1c6a44b620 100644
--- a/searchcommon/src/vespa/searchcommon/common/datatype.h
+++ b/searchlib/src/vespa/searchcommon/common/datatype.h
diff --git a/searchcommon/src/vespa/searchcommon/common/dictionary_config.cpp b/searchlib/src/vespa/searchcommon/common/dictionary_config.cpp
index e1b990e5660..e1b990e5660 100644
--- a/searchcommon/src/vespa/searchcommon/common/dictionary_config.cpp
+++ b/searchlib/src/vespa/searchcommon/common/dictionary_config.cpp
diff --git a/searchcommon/src/vespa/searchcommon/common/dictionary_config.h b/searchlib/src/vespa/searchcommon/common/dictionary_config.h
index f51341ad799..f51341ad799 100644
--- a/searchcommon/src/vespa/searchcommon/common/dictionary_config.h
+++ b/searchlib/src/vespa/searchcommon/common/dictionary_config.h
diff --git a/searchcommon/src/vespa/searchcommon/common/growstrategy.cpp b/searchlib/src/vespa/searchcommon/common/growstrategy.cpp
index f35cdbaa640..f35cdbaa640 100644
--- a/searchcommon/src/vespa/searchcommon/common/growstrategy.cpp
+++ b/searchlib/src/vespa/searchcommon/common/growstrategy.cpp
diff --git a/searchcommon/src/vespa/searchcommon/common/growstrategy.h b/searchlib/src/vespa/searchcommon/common/growstrategy.h
index b9b4a42cf72..b9b4a42cf72 100644
--- a/searchcommon/src/vespa/searchcommon/common/growstrategy.h
+++ b/searchlib/src/vespa/searchcommon/common/growstrategy.h
diff --git a/searchcommon/src/vespa/searchcommon/common/iblobconverter.h b/searchlib/src/vespa/searchcommon/common/iblobconverter.h
index 6581c3e5ccb..6581c3e5ccb 100644
--- a/searchcommon/src/vespa/searchcommon/common/iblobconverter.h
+++ b/searchlib/src/vespa/searchcommon/common/iblobconverter.h
diff --git a/searchcommon/src/vespa/searchcommon/common/range.h b/searchlib/src/vespa/searchcommon/common/range.h
index ea2553c129b..ea2553c129b 100644
--- a/searchcommon/src/vespa/searchcommon/common/range.h
+++ b/searchlib/src/vespa/searchcommon/common/range.h
diff --git a/searchcommon/src/vespa/searchcommon/common/schema.cpp b/searchlib/src/vespa/searchcommon/common/schema.cpp
index c6a2a4532a3..c6a2a4532a3 100644
--- a/searchcommon/src/vespa/searchcommon/common/schema.cpp
+++ b/searchlib/src/vespa/searchcommon/common/schema.cpp
diff --git a/searchcommon/src/vespa/searchcommon/common/schema.h b/searchlib/src/vespa/searchcommon/common/schema.h
index 3a9bcbdd904..3a9bcbdd904 100644
--- a/searchcommon/src/vespa/searchcommon/common/schema.h
+++ b/searchlib/src/vespa/searchcommon/common/schema.h
diff --git a/searchcommon/src/vespa/searchcommon/common/schemaconfigurer.cpp b/searchlib/src/vespa/searchcommon/common/schemaconfigurer.cpp
index ff69ca9818a..8fbebe80b4b 100644
--- a/searchcommon/src/vespa/searchcommon/common/schemaconfigurer.cpp
+++ b/searchlib/src/vespa/searchcommon/common/schemaconfigurer.cpp
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "schemaconfigurer.h"
+#include "subscriptionproxyng.h"
 #include <vespa/config-attributes.h>
 #include <vespa/config-imported-fields.h>
 #include <vespa/config-indexschema.h>
@@ -9,8 +10,6 @@
 #include <vespa/searchcommon/attribute/collectiontype.h>
 #include <vespa/searchcommon/attribute/basictype.h>
 
-#include <vespa/searchcommon/config/subscriptionproxyng.h>
-
 #include <vespa/log/log.h>
 LOG_SETUP(".index.schemaconfigurer");
 
diff --git a/searchcommon/src/vespa/searchcommon/common/schemaconfigurer.h b/searchlib/src/vespa/searchcommon/common/schemaconfigurer.h
index 925aefcfa25..925aefcfa25 100644
--- a/searchcommon/src/vespa/searchcommon/common/schemaconfigurer.h
+++ b/searchlib/src/vespa/searchcommon/common/schemaconfigurer.h
diff --git a/searchcommon/src/vespa/searchcommon/config/subscriptionproxyng.h b/searchlib/src/vespa/searchcommon/common/subscriptionproxyng.h
index dd24480f689..dd24480f689 100644
--- a/searchcommon/src/vespa/searchcommon/config/subscriptionproxyng.h
+++ b/searchlib/src/vespa/searchcommon/common/subscriptionproxyng.h
diff --git a/searchcommon/src/vespa/searchcommon/common/undefinedvalues.h b/searchlib/src/vespa/searchcommon/common/undefinedvalues.h
index bbe3198a8dc..bbe3198a8dc 100644
--- a/searchcommon/src/vespa/searchcommon/common/undefinedvalues.h
+++ b/searchlib/src/vespa/searchcommon/common/undefinedvalues.h
diff --git a/searchlib/src/vespa/searchlib/CMakeLists.txt b/searchlib/src/vespa/searchlib/CMakeLists.txt
index 83dc08091e5..91813a17379 100644
--- a/searchlib/src/vespa/searchlib/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/CMakeLists.txt
@@ -29,6 +29,8 @@ vespa_add_library(searchlib
     $<TARGET_OBJECTS:searchlib_tensor>
     $<TARGET_OBJECTS:searchlib_transactionlog>
     $<TARGET_OBJECTS:searchlib_util>
+    $<TARGET_OBJECTS:searchcommon_searchcommon_common>
+    $<TARGET_OBJECTS:searchcommon_searchcommon_attribute>
 
     INSTALL lib64
     DEPENDS
diff --git a/searchsummary/CMakeLists.txt b/searchsummary/CMakeLists.txt
index 668ac5fa60a..84633bee262 100644
--- a/searchsummary/CMakeLists.txt
+++ b/searchsummary/CMakeLists.txt
@@ -6,7 +6,6 @@ vespa_define_module(
     configdefinitions
     fastlib_fast
     document
-    searchcommon
     searchlib
 
     LIBS