Do not include fastos.h

9 files changed, 15 insertions, 31 deletions

diff --git a/streamingvisitors/src/tests/hitcollector/hitcollector.cpp b/streamingvisitors/src/tests/hitcollector/hitcollector.cpp
index 3929eb4407e..3875122d9e8 100644
--- a/streamingvisitors/src/tests/hitcollector/hitcollector.cpp
+++ b/streamingvisitors/src/tests/hitcollector/hitcollector.cpp
@@ -1,6 +1,4 @@
 // 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>
 #include <vespa/vespalib/testkit/testapp.h>
 
 #include <vespa/document/fieldvalue/fieldvalues.h>
@@ -10,8 +8,6 @@
 #include <vespa/vdslib/container/searchresult.h>
 #include <vespa/vsm/common/storagedocument.h>
 
-LOG_SETUP("hitcollector_test");
-
 using namespace document;
 using namespace search::fef;
 using namespace vespalib;
diff --git a/streamingvisitors/src/tests/querywrapper/querywrapper.cpp b/streamingvisitors/src/tests/querywrapper/querywrapper.cpp
index b717962d920..741ef31ca3a 100644
--- a/streamingvisitors/src/tests/querywrapper/querywrapper.cpp
+++ b/streamingvisitors/src/tests/querywrapper/querywrapper.cpp
@@ -1,12 +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/vespalib/testkit/testapp.h>
-#include <iostream>
 #include <vespa/searchlib/query/tree/querybuilder.h>
 #include <vespa/searchlib/query/tree/simplequery.h>
 #include <vespa/searchlib/query/tree/stackdumpcreator.h>
-
 #include <vespa/searchvisitor/querywrapper.h>
+#include <iostream>
 
 using namespace search;
 using namespace search::query;
diff --git a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
index 6cb49a77ed2..e583fe55a51 100644
--- a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
@@ -1,12 +1,12 @@
 // 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(".searchvisitor.hitcollector");
 #include "hitcollector.h"
 #include <vespa/searchlib/fef/feature_resolver.h>
 #include <stdexcept>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".searchvisitor.hitcollector");
+
 using search::FeatureSet;
 using search::fef::MatchData;
 using vdslib::SearchResult;
diff --git a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp
index 1dc6a096f2e..5e598f0f82b 100644
--- a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.cpp
@@ -1,8 +1,5 @@
 // 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(".searchvisitor.indexenvironment");
 #include "indexenvironment.h"
 
 using namespace search::fef;
diff --git a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.cpp
index ca90df395fd..a69dd525f96 100644
--- a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.cpp
@@ -1,11 +1,11 @@
 // 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(".searchvisitor.queryenvironment");
 #include "queryenvironment.h"
 #include <vespa/searchlib/common/location.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP(".searchvisitor.queryenvironment");
+
 using search::IAttributeManager;
 using search::fef::Properties;
 using vespalib::string;
diff --git a/streamingvisitors/src/vespa/searchvisitor/querytermdata.cpp b/streamingvisitors/src/vespa/searchvisitor/querytermdata.cpp
index 7b2bcd1e4d5..2cabc36ea96 100644
--- a/streamingvisitors/src/vespa/searchvisitor/querytermdata.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/querytermdata.cpp
@@ -1,8 +1,5 @@
 // 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(".searchvisitor.querytermdata");
 #include "querytermdata.h"
 
 using namespace search::fef;
diff --git a/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp b/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp
index f375b532839..4ed2de2755d 100644
--- a/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/querywrapper.cpp
@@ -1,8 +1,5 @@
 // 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(".searchvisitor.querywrapper");
 #include "querywrapper.h"
 
 using namespace search;
diff --git a/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp b/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp
index b638b072d1d..d25154aba7f 100644
--- a/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/rankmanager.cpp
@@ -1,12 +1,12 @@
 // 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(".searchvisitor.rankmanager");
+#include "rankmanager.h"
 #include <vespa/searchlib/features/setup.h>
 #include <vespa/searchlib/fef/functiontablefactory.h>
 #include <vespa/vespalib/util/vstringfmt.h>
-#include "rankmanager.h"
+
+#include <vespa/log/log.h>
+LOG_SETUP(".searchvisitor.rankmanager");
 
 using vespa::config::search::RankProfilesConfig;
 using vespa::config::search::vsm::VsmfieldsConfig;
diff --git a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp
index 6a028f15719..03bc5412467 100644
--- a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.cpp
@@ -1,14 +1,13 @@
 // 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(".searchvisitor.rankprocessor");
+#include "querytermdata.h"
+#include "rankprocessor.h"
 #include <vespa/searchlib/fef/handle.h>
 #include <vespa/searchlib/fef/simpletermfielddata.h>
 #include <vespa/vsm/vsm/fieldsearchspec.h>
-#include "querytermdata.h"
-#include "rankprocessor.h"
 #include <cmath>
+#include <vespa/log/log.h>
+LOG_SETUP(".searchvisitor.rankprocessor");
 
 using search::FeatureSet;
 using search::HitList;