1 files changed, 6 insertions, 5 deletions
diff --git a/streamingvisitors/src/tests/matching_elements_filler/matching_elements_filler_test.cpp b/streamingvisitors/src/tests/matching_elements_filler/matching_elements_filler_test.cpp
index f85d3046d69..ee8e5a322e2 100644
--- a/streamingvisitors/src/tests/matching_elements_filler/matching_elements_filler_test.cpp
+++ b/streamingvisitors/src/tests/matching_elements_filler/matching_elements_filler_test.cpp
@@ -26,11 +26,11 @@
 
 using document::ArrayDataType;
 using document::ArrayFieldValue;
-using document::Field;
-using document::FieldPath;
 using document::DataType;
 using document::DocumentId;
 using document::DocumentType;
+using document::Field;
+using document::FieldPath;
 using document::IntFieldValue;
 using document::MapDataType;
 using document::MapFieldValue;
@@ -38,11 +38,12 @@ using document::StringFieldValue;
 using document::StructDataType;
 using document::StructFieldValue;
 using search::MatchingElements;
-using search::Query;
 using search::StructFieldMapper;
 using search::fef::MatchData;
 using search::query::StackDumpCreator;
 using search::query::Weight;
+using search::streaming::Query;
+using search::streaming::QueryNodeResultFactory;
 using storage::HitCollector;
 using storage::MatchingElementsFiller;
 using vdslib::SearchResult;
@@ -84,7 +85,7 @@ struct BoundTerm {
 
 Query make_query(std::unique_ptr<search::query::Node> root) {
     vespalib::string stack_dump = StackDumpCreator::create(*root);
-    search::QueryNodeResultFactory empty;
+    QueryNodeResultFactory empty;
     Query query(empty, stack_dump);
     return query;
 }
@@ -278,7 +279,7 @@ class MatchingElementsFillerTest : public ::testing::Test {
     vsm::DocumentTypeIndexFieldMapT         _index_to_field_ids;
     HitCollector                            _hit_collector;
     SearchResult                            _search_result;
-    search::Query                           _query;
+    Query                                   _query;
     vsm::SharedSearcherBuf                  _shared_searcher_buf;
     std::unique_ptr<MatchingElementsFiller> _matching_elements_filler;
     std::unique_ptr<MatchingElements>       _matching_elements;