Reduce code visibility.

4 files changed, 11 insertions, 6 deletions

diff --git a/searchlib/src/tests/queryeval/blueprint/leaf_blueprints_test.cpp b/searchlib/src/tests/queryeval/blueprint/leaf_blueprints_test.cpp
index d816e799b59..dd1d57fc296 100644
--- a/searchlib/src/tests/queryeval/blueprint/leaf_blueprints_test.cpp
+++ b/searchlib/src/tests/queryeval/blueprint/leaf_blueprints_test.cpp
@@ -1,10 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("blueprint_test");
+
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchlib/queryeval/blueprint.h>
 #include <vespa/searchlib/queryeval/leaf_blueprints.h>
-#include <vespa/vespalib/objects/visit.h>
+#include <vespa/searchlib/fef/matchdata.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("blueprint_test");
 
 using namespace search::queryeval;
 using namespace search::fef;
diff --git a/searchlib/src/tests/queryeval/blueprint/mysearch.h b/searchlib/src/tests/queryeval/blueprint/mysearch.h
index 73abcce3dc4..520a5d8448f 100644
--- a/searchlib/src/tests/queryeval/blueprint/mysearch.h
+++ b/searchlib/src/tests/queryeval/blueprint/mysearch.h
@@ -2,6 +2,7 @@
 #include <vespa/searchlib/queryeval/blueprint.h>
 #include <vespa/searchlib/queryeval/multisearch.h>
 #include <vespa/searchlib/fef/termfieldmatchdataarray.h>
+#include <vespa/searchlib/fef/matchdata.h>
 #include <vespa/vespalib/objects/visit.hpp>
 
 namespace search::queryeval {
diff --git a/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp b/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp
index c02bea9c5df..64ff8898bb0 100644
--- a/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp
+++ b/searchlib/src/tests/queryeval/sourceblender/sourceblender.cpp
@@ -9,6 +9,7 @@
 #include <vespa/searchlib/test/searchiteratorverifier.h>
 #include <vespa/searchlib/common/bitvectoriterator.h>
 #include <vespa/searchlib/attribute/fixedsourceselector.h>
+#include <vespa/searchlib/fef/matchdata.h>
 
 using namespace search::queryeval;
 using namespace search::fef;
diff --git a/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp b/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp
index 9f4c0058b93..8d70daa4ca8 100644
--- a/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp
+++ b/searchlib/src/tests/queryeval/termwise_eval/termwise_eval_test.cpp
@@ -11,6 +11,7 @@
 #include <vespa/vespalib/test/insertion_operators.h>
 #include <vespa/searchlib/test/searchiteratorverifier.h>
 #include <vespa/searchlib/common/bitvectoriterator.h>
+#include <vespa/searchlib/fef/matchdata.h>
 #include <vespa/vespalib/objects/visit.hpp>
 
 using namespace vespalib;
@@ -81,15 +82,15 @@ struct MyBlueprint : SimpleLeafBlueprint {
         setEstimate(HitEstimate(hits.size(), hits.empty()));
         set_allow_termwise_eval(allow_termwise_eval);
     }
-    ~MyBlueprint();
+    ~MyBlueprint() override;
     SearchIterator::UP createLeafSearch(const fef::TermFieldMatchDataArray &,
                                         bool strict) const override
     {
-        return SearchIterator::UP(new MyTerm(hits, strict));
+        return std::make_unique<MyTerm>(hits, strict);
     }
 };
 
-MyBlueprint::~MyBlueprint() {}
+MyBlueprint::~MyBlueprint() = default;
 
 struct MyOr : OrBlueprint {
     bool use_my_value;