Now everything builds without fastos.h

2 files changed, 8 insertions, 6 deletions

diff --git a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
index 09701cb6ddf..225a977e384 100644
--- a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
+++ b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
@@ -1,15 +1,16 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for diskindexcleaner.
 
-#include <vespa/log/log.h>
-LOG_SETUP("diskindexcleaner_test");
-
 #include <vespa/searchcorespi/index/activediskindexes.h>
 #include <vespa/searchcorespi/index/diskindexcleaner.h>
 #include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/fastos/file.h>
 #include <string>
 #include <vector>
 
+#include <vespa/log/log.h>
+LOG_SETUP("diskindexcleaner_test");
+
 using std::string;
 using std::vector;
 using namespace searchcorespi::index;
diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp
index a67e6d859bb..fa7572d50bd 100644
--- a/searchcore/src/tests/proton/index/indexmanager_test.cpp
+++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp
@@ -1,9 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for IndexManager.
 
-#include <vespa/log/log.h>
-LOG_SETUP("indexmanager_test");
-
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/fieldvalue/fieldvalue.h>
 #include <vespa/searchcore/proton/index/indexmanager.h>
@@ -28,8 +25,12 @@ LOG_SETUP("indexmanager_test");
 #include <vespa/vespalib/util/blockingthreadstackexecutor.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/searchlib/common/sequencedtaskexecutor.h>
+#include <vespa/fastos/file.h>
 #include <set>
 
+#include <vespa/log/log.h>
+LOG_SETUP("indexmanager_test");
+
 using document::Document;
 using document::FieldValue;
 using search::SequencedTaskExecutor;