Fix warnings hidden earlier due to including application headers as system includes

2 files changed, 3 insertions, 5 deletions

diff --git a/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp b/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp
index 45ce6780201..3bfb31893d2 100644
--- a/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp
+++ b/searchcore/src/tests/proton/matching/constant_value_repo/constant_value_repo_test.cpp
@@ -1,6 +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/vespalib/testkit/test_kit.h>
 
 #include <vespa/searchcore/proton/matching/constant_value_repo.h>
diff --git a/searchcore/src/tests/proton/matching/query_test.cpp b/searchcore/src/tests/proton/matching/query_test.cpp
index 12e6ceaddab..d490a85ba0e 100644
--- a/searchcore/src/tests/proton/matching/query_test.cpp
+++ b/searchcore/src/tests/proton/matching/query_test.cpp
@@ -1,10 +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 query.
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("query_test");
-
 #include <vespa/document/datatype/positiondatatype.h>
 #include <vespa/searchcore/proton/matching/fakesearchcontext.h>
 #include <vespa/searchcore/proton/matching/matchdatareservevisitor.h>
@@ -107,6 +103,7 @@ class Test : public vespalib::TestApp {
     void requireThatBlackListBlueprintCanBeUsed();
 
 public:
+    ~Test();
     int Main() override;
 };
 
@@ -858,6 +855,8 @@ Test::requireThatBlackListBlueprintCanBeUsed()
     EXPECT_EQUAL(exp, act);
 }
 
+Test::~Test() {}
+
 int
 Test::Main()
 {