Revert "Revert "Fix warnings hidden earlier due to including application headers as s…""

1 files changed, 6 insertions, 3 deletions

diff --git a/searchlib/src/tests/nativerank/nativerank.cpp b/searchlib/src/tests/nativerank/nativerank.cpp
index 4c03f14e141..e9fb147dc3b 100644
--- a/searchlib/src/tests/nativerank/nativerank.cpp
+++ b/searchlib/src/tests/nativerank/nativerank.cpp
@@ -1,7 +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>
-LOG_SETUP("nativerank_test");
 
 #include <vespa/searchlib/features/nativeattributematchfeature.h>
 #include <vespa/searchlib/features/nativefieldmatchfeature.h>
@@ -16,6 +13,9 @@ LOG_SETUP("nativerank_test");
 #include <vespa/searchlib/fef/test/ftlib.h>
 #include <vespa/searchlib/fef/test/dummy_dependency_handler.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("nativerank_test");
+
 using namespace search::fef;
 using namespace search::fef::test;
 using CollectionType = FieldInfo::CollectionType;
@@ -56,9 +56,12 @@ private:
     void testNativeRank();
 
 public:
+    ~Test();
     int Main() override;
 };
 
+Test::~Test() {}
+
 void
 Test::testNativeFieldMatch()
 {