GC unused code and update includes

10 files changed, 21 insertions, 11 deletions

diff --git a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
index 71467519dbd..2f69f0b45cf 100644
--- a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
+++ b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp
@@ -18,6 +18,7 @@
 #include <vespa/searchlib/diskindex/pagedict4file.h>
 #include <vespa/searchlib/diskindex/pagedict4randread.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/fastos/time.h>
 #include <vespa/fastos/app.h>
 #include <vespa/log/log.h>
 LOG_SETUP("fieldwriter_test");
diff --git a/searchlib/src/tests/fef/phrasesplitter/benchmark.cpp b/searchlib/src/tests/fef/phrasesplitter/benchmark.cpp
index 500a032d967..c789fb582ec 100644
--- a/searchlib/src/tests/fef/phrasesplitter/benchmark.cpp
+++ b/searchlib/src/tests/fef/phrasesplitter/benchmark.cpp
@@ -1,6 +1,4 @@
 // 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("phrasesplitter_test");
 #include <vespa/vespalib/testkit/testapp.h>
 
 #include <iomanip>
@@ -8,9 +6,12 @@ LOG_SETUP("phrasesplitter_test");
 #include <vespa/searchlib/fef/matchdatalayout.h>
 #include <vespa/searchlib/fef/phrasesplitter.h>
 #include <vespa/searchlib/fef/test/queryenvironment.h>
+#include <vespa/fastos/time.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("phrasesplitter_test");
 
-namespace search {
-namespace fef {
+namespace search::fef {
 
 class Benchmark : public vespalib::TestApp
 {
@@ -80,6 +81,5 @@ Benchmark::Main()
 }
 
 }
-}
 
 TEST_APPHOOK(search::fef::Benchmark);
diff --git a/searchlib/src/tests/postinglistbm/andstress.cpp b/searchlib/src/tests/postinglistbm/andstress.cpp
index 40f919509e8..15e56c2d4ef 100644
--- a/searchlib/src/tests/postinglistbm/andstress.cpp
+++ b/searchlib/src/tests/postinglistbm/andstress.cpp
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "andstress.h"
-#include <vector>
 
 #include <vespa/searchlib/common/bitvector.h>
 #include <vespa/searchlib/test/fakedata/fakeword.h>
@@ -13,8 +12,10 @@
 #include <vespa/searchlib/test/fakedata/fakezcbfilterocc.h>
 #include <vespa/searchlib/test/fakedata/fpfactory.h>
 #include <vespa/fastos/thread.h>
+#include <vespa/fastos/time.h>
 #include <mutex>
 #include <condition_variable>
+#include <vector>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".andstress");
diff --git a/searchlib/src/tests/transactionlogstress/translogstress.cpp b/searchlib/src/tests/transactionlogstress/translogstress.cpp
index abba84b75b6..7a7bc410371 100644
--- a/searchlib/src/tests/transactionlogstress/translogstress.cpp
+++ b/searchlib/src/tests/transactionlogstress/translogstress.cpp
@@ -7,6 +7,7 @@
 #include <vespa/searchlib/util/runnable.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/fastos/app.h>
+#include <vespa/fastos/time.h>
 #include <iostream>
 #include <stdexcept>
 #include <sstream>
diff --git a/searchlib/src/tests/util/bufferwriter/bm.cpp b/searchlib/src/tests/util/bufferwriter/bm.cpp
index 3370860d2b6..b19a7390e9c 100644
--- a/searchlib/src/tests/util/bufferwriter/bm.cpp
+++ b/searchlib/src/tests/util/bufferwriter/bm.cpp
@@ -1,11 +1,13 @@
 // 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("bufferwriter_bm");
-#include <vespa/vespalib/testkit/testapp.h>
-#include <iostream>
 #include "work.h"
 #include <vespa/searchlib/util/drainingbufferwriter.h>
+#include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/fastos/timestamp.h>
+#include <iostream>
+
+#include <vespa/log/log.h>
+LOG_SETUP("bufferwriter_bm");
 
 using search::DrainingBufferWriter;
 
diff --git a/searchlib/src/vespa/searchlib/docstore/filechunk.h b/searchlib/src/vespa/searchlib/docstore/filechunk.h
index 87dc2e018eb..7d79760a61c 100644
--- a/searchlib/src/vespa/searchlib/docstore/filechunk.h
+++ b/searchlib/src/vespa/searchlib/docstore/filechunk.h
@@ -7,11 +7,12 @@
 #include "lid_info.h"
 #include "randread.h"
 #include <vespa/searchlib/util/memoryusage.h>
+#include <vespa/searchlib/common/tunefileinfo.h>
 #include <vespa/vespalib/util/ptrholder.h>
 #include <vespa/vespalib/util/sync.h>
 #include <vespa/vespalib/stllike/hash_map.h>
-#include <vespa/searchlib/common/tunefileinfo.h>
 #include <vespa/vespalib/util/generationhandler.h>
+#include <vespa/fastos/timestamp.h>
 
 class FastOS_FileInterface;
 
diff --git a/searchlib/src/vespa/searchlib/features/debug_attribute_wait.cpp b/searchlib/src/vespa/searchlib/features/debug_attribute_wait.cpp
index 20de658f7f6..99645cc3338 100644
--- a/searchlib/src/vespa/searchlib/features/debug_attribute_wait.cpp
+++ b/searchlib/src/vespa/searchlib/features/debug_attribute_wait.cpp
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "debug_attribute_wait.h"
+#include <vespa/fastos/time.h>
 #include <thread>
 
 using search::attribute::IAttributeVector;
diff --git a/searchlib/src/vespa/searchlib/features/debug_wait.cpp b/searchlib/src/vespa/searchlib/features/debug_wait.cpp
index 565ca27a759..6a26b24b451 100644
--- a/searchlib/src/vespa/searchlib/features/debug_wait.cpp
+++ b/searchlib/src/vespa/searchlib/features/debug_wait.cpp
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "debug_wait.h"
+#include <vespa/fastos/time.h>
 #include <thread>
 
 namespace search {
diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakewordset.cpp b/searchlib/src/vespa/searchlib/test/fakedata/fakewordset.cpp
index b4009f1e6b0..1f8ea9fb2ea 100644
--- a/searchlib/src/vespa/searchlib/test/fakedata/fakewordset.cpp
+++ b/searchlib/src/vespa/searchlib/test/fakedata/fakewordset.cpp
@@ -2,6 +2,7 @@
 
 #include "fakewordset.h"
 #include "fakeword.h"
+#include <vespa/fastos/time.h>
 #include <sstream>
 
 #include <vespa/log/log.h>
diff --git a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp
index fe708f52a93..2cb546395d3 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/trans_log_server_explorer.cpp
@@ -3,6 +3,7 @@
 #include "trans_log_server_explorer.h"
 #include <vespa/vespalib/data/slime/slime.h>
 #include <vespa/fastos/file.h>
+#include <vespa/fastos/timestamp.h>
 
 
 using vespalib::slime::Inserter;