Include what you need.

2 files changed, 11 insertions, 17 deletions

diff --git a/searchlib/src/tests/postinglistbm/andstress.cpp b/searchlib/src/tests/postinglistbm/andstress.cpp
index 183cec6bbf1..bdf90fb7732 100644
--- a/searchlib/src/tests/postinglistbm/andstress.cpp
+++ b/searchlib/src/tests/postinglistbm/andstress.cpp
@@ -1,7 +1,5 @@
 // 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(".andstress");
 #include "andstress.h"
 #include <vector>
 
@@ -14,14 +12,17 @@ LOG_SETUP(".andstress");
 #include <vespa/searchlib/test/fakedata/fakezcfilterocc.h>
 #include <vespa/searchlib/test/fakedata/fakezcbfilterocc.h>
 #include <vespa/searchlib/test/fakedata/fpfactory.h>
+#include <vespa/fastos/thread.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP(".andstress");
 
 using search::fef::TermFieldMatchData;
 using search::fef::TermFieldMatchDataArray;
 using search::queryeval::SearchIterator;
 using namespace search::fakedata;
 
-namespace postinglistbm
-{
+namespace postinglistbm {
 
 class AndStressWorker;
 
diff --git a/searchlib/src/tests/postinglistbm/andstress.h b/searchlib/src/tests/postinglistbm/andstress.h
index b752e602f5d..07e344f3549 100644
--- a/searchlib/src/tests/postinglistbm/andstress.h
+++ b/searchlib/src/tests/postinglistbm/andstress.h
@@ -1,23 +1,17 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-
 #include <vector>
-namespace search
-{
-class Rand48;
-
-namespace fakedata
-{
+#include <string>
 
-class FakeWordSet;
+namespace search {
+class Rand48;
 
-}
+namespace fakedata { class FakeWordSet; }
 
 }
 
-namespace postinglistbm
-{
+namespace postinglistbm {
 
 class AndStress
 {
@@ -39,5 +33,4 @@ public:
         bool unpack);
 };
 
-} // namespace postinglistbm
-
+}