Complete the split also for tests.

6 files changed, 25 insertions, 7 deletions

diff --git a/searchlib/src/tests/attribute/changevector/changevector_test.cpp b/searchlib/src/tests/attribute/changevector/changevector_test.cpp
index 9f0a796fd3e..c9361387401 100644
--- a/searchlib/src/tests/attribute/changevector/changevector_test.cpp
+++ b/searchlib/src/tests/attribute/changevector/changevector_test.cpp
@@ -1,10 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("changevector_test");
 #include <vespa/vespalib/testkit/testapp.h>
 
-#include <vespa/searchlib/attribute/changevector.h>
+#include <vespa/searchlib/attribute/changevector.hpp>
 
 using namespace search;
 
diff --git a/searchlib/src/tests/memoryindex/compact_document_words_store/compact_document_words_store_test.cpp b/searchlib/src/tests/memoryindex/compact_document_words_store/compact_document_words_store_test.cpp
index 662adbf6b94..0c8606ab3a3 100644
--- a/searchlib/src/tests/memoryindex/compact_document_words_store/compact_document_words_store_test.cpp
+++ b/searchlib/src/tests/memoryindex/compact_document_words_store/compact_document_words_store_test.cpp
@@ -1,11 +1,10 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".memoryindex.compact_document_words_store_test");
+
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchlib/datastore/entryref.h>
 #include <vespa/searchlib/memoryindex/compact_document_words_store.h>
 #include <vespa/vespalib/stllike/string.h>
+#include <vespa/vespalib/stllike/hash_map.hpp>
 #include <iostream>
 #include <map>
 
diff --git a/searchlib/src/vespa/searchlib/common/rcuvector.cpp b/searchlib/src/vespa/searchlib/common/rcuvector.cpp
index abc59b47a48..5de91fcb448 100644
--- a/searchlib/src/vespa/searchlib/common/rcuvector.cpp
+++ b/searchlib/src/vespa/searchlib/common/rcuvector.cpp
@@ -15,6 +15,25 @@ template class RcuVectorBase<int64_t>;
 template class RcuVectorBase<float>;
 template class RcuVectorBase<double>;
 
+template class RcuVector<uint8_t>;
+template class RcuVector<uint16_t>;
+template class RcuVector<uint32_t>;
+template class RcuVector<int8_t>;
+template class RcuVector<int16_t>;
+template class RcuVector<int32_t>;
+template class RcuVector<int64_t>;
+template class RcuVector<float>;
+template class RcuVector<double>;
+
+template class RcuVectorHeld<uint8_t>;
+template class RcuVectorHeld<uint16_t>;
+template class RcuVectorHeld<uint32_t>;
+template class RcuVectorHeld<int8_t>;
+template class RcuVectorHeld<int16_t>;
+template class RcuVectorHeld<int32_t>;
+template class RcuVectorHeld<int64_t>;
+template class RcuVectorHeld<float>;
+template class RcuVectorHeld<double>;
 
 }
 }
diff --git a/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp b/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp
index f92fc22d30d..d0900ab9154 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp
@@ -3,6 +3,7 @@
 #include "compact_document_words_store.h"
 #include <vespa/searchlib/datastore/datastore.hpp>
 #include <vespa/vespalib/stllike/hash_map.hpp>
+
 #include <vespa/log/log.h>
 LOG_SETUP(".memoryindex.compact_document_words_store");
 
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_range_term_expander.h b/searchlib/src/vespa/searchlib/predicate/predicate_range_term_expander.h
index f422edc32fc..7920b700720 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_range_term_expander.h
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_range_term_expander.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <vespa/vespalib/stllike/string.h>
+#include <vespa/vespalib/util/exceptions.h>
 
 namespace search {
 namespace predicate {
diff --git a/searchlib/src/vespa/searchlib/predicate/simple_index.hpp b/searchlib/src/vespa/searchlib/predicate/simple_index.hpp
index 1298791e95e..0c6776d6b39 100644
--- a/searchlib/src/vespa/searchlib/predicate/simple_index.hpp
+++ b/searchlib/src/vespa/searchlib/predicate/simple_index.hpp
@@ -2,6 +2,7 @@
 #pragma once
 
 #include "simple_index.h"
+#include <vespa/searchlib/common/rcuvector.hpp>
 
 namespace search {
 namespace predicate {