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

15 files changed, 90 insertions, 140 deletions

diff --git a/searchcore/src/tests/grouping/grouping.cpp b/searchcore/src/tests/grouping/grouping.cpp
index 638eb40c3dc..156902ac179 100644
--- a/searchcore/src/tests/grouping/grouping.cpp
+++ b/searchcore/src/tests/grouping/grouping.cpp
@@ -139,8 +139,8 @@ class CheckAttributeReferences : public vespalib::ObjectOperation, public vespal
 {
 public:
     CheckAttributeReferences(bool log=false) : _log(log), _numrefs(0) { }
-    bool _log;
-    int _numrefs;
+    bool     _log;
+    uint32_t _numrefs;
 private:
     void execute(vespalib::Identifiable &obj) override {
         if (_log) {
@@ -338,7 +338,7 @@ TEST_F("testGroupingSession", DoomFixture()) {
     for (unsigned int i = 0; i < gl3.size(); i++) {
         gl3[i]->select(attrCheck_after, attrCheck_after);
     }
-    EXPECT_EQUAL(attrCheck_after._numrefs, 0);
+    EXPECT_EQUAL(attrCheck_after._numrefs, 0u);
     {
         EXPECT_EQUAL(id, session.getSessionId());
         ASSERT_TRUE(!session.getGroupingManager().empty());
diff --git a/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp b/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp
index 49869d99978..f5eb55f2abc 100644
--- a/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_initializer/attribute_initializer_test.cpp
@@ -1,7 +1,5 @@
 // Copyright 2017 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("attribute_initializer_test");
+
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/searchcore/proton/test/directory_handler.h>
@@ -19,8 +17,7 @@ using search::SerialNum;
 
 const vespalib::string test_dir = "test_output";
 
-namespace proton
-{
+namespace proton {
 
 namespace {
 
@@ -100,8 +97,8 @@ TEST("require that integer attribute can be initialized")
     saveAttr("a", int32_sv, 10, 2);
     Fixture f;
     auto av = f.createInitializer({"a", int32_sv}, 5)->init().getAttribute();
-    EXPECT_EQUAL(2, av->getCreateSerialNum());
-    EXPECT_EQUAL(2, av->getNumDocs());
+    EXPECT_EQUAL(2u, av->getCreateSerialNum());
+    EXPECT_EQUAL(2u, av->getNumDocs());
 }
 
 TEST("require that mismatching base type is not loaded")
@@ -109,8 +106,8 @@ TEST("require that mismatching base type is not loaded")
     saveAttr("a", int32_sv, 10, 2);
     Fixture f;
     auto av = f.createInitializer({"a", int16_sv}, 5)->init().getAttribute();
-    EXPECT_EQUAL(5, av->getCreateSerialNum());
-    EXPECT_EQUAL(1, av->getNumDocs());
+    EXPECT_EQUAL(5u, av->getCreateSerialNum());
+    EXPECT_EQUAL(1u, av->getNumDocs());
 }
 
 TEST("require that mismatching collection type is not loaded")
@@ -118,8 +115,8 @@ TEST("require that mismatching collection type is not loaded")
     saveAttr("a", int32_sv, 10, 2);
     Fixture f;
     auto av = f.createInitializer({"a", int32_array}, 5)->init().getAttribute();
-    EXPECT_EQUAL(5, av->getCreateSerialNum());
-    EXPECT_EQUAL(1, av->getNumDocs());
+    EXPECT_EQUAL(5u, av->getCreateSerialNum());
+    EXPECT_EQUAL(1u, av->getNumDocs());
 }
 
 TEST("require that mismatching weighted set collection type params is not loaded")
@@ -128,11 +125,11 @@ TEST("require that mismatching weighted set collection type params is not loaded
     saveAttr("b", string_wset2, 10, 2);
     Fixture f;
     auto av = f.createInitializer({"a", string_wset2}, 5)->init().getAttribute();
-    EXPECT_EQUAL(5, av->getCreateSerialNum());
-    EXPECT_EQUAL(1, av->getNumDocs());
+    EXPECT_EQUAL(5u, av->getCreateSerialNum());
+    EXPECT_EQUAL(1u, av->getNumDocs());
     auto av2 = f.createInitializer({"b", string_wset}, 5)->init().getAttribute();
-    EXPECT_EQUAL(5, av2->getCreateSerialNum());
-    EXPECT_EQUAL(1, av2->getNumDocs());
+    EXPECT_EQUAL(5u, av2->getCreateSerialNum());
+    EXPECT_EQUAL(1u, av2->getNumDocs());
 }
 
 TEST("require that predicate attributes can be initialized")
@@ -140,8 +137,8 @@ TEST("require that predicate attributes can be initialized")
     saveAttr("a", predicate, 10, 2);
     Fixture f;
     auto av = f.createInitializer({"a", predicate}, 5)->init().getAttribute();
-    EXPECT_EQUAL(2, av->getCreateSerialNum());
-    EXPECT_EQUAL(2, av->getNumDocs());
+    EXPECT_EQUAL(2u, av->getCreateSerialNum());
+    EXPECT_EQUAL(2u, av->getNumDocs());
 }
 
 TEST("require that predicate attributes will not be initialized with future-created attribute")
@@ -149,8 +146,8 @@ TEST("require that predicate attributes will not be initialized with future-crea
     saveAttr("a", predicate, 10, 8);
     Fixture f;
     auto av = f.createInitializer({"a", predicate}, 5)->init().getAttribute();
-    EXPECT_EQUAL(5, av->getCreateSerialNum());
-    EXPECT_EQUAL(1, av->getNumDocs());
+    EXPECT_EQUAL(5u, av->getCreateSerialNum());
+    EXPECT_EQUAL(1u, av->getNumDocs());
 }
 
 TEST("require that predicate attributes will not be initialized with mismatching type")
@@ -158,8 +155,8 @@ TEST("require that predicate attributes will not be initialized with mismatching
     saveAttr("a", predicate, 10, 2);
     Fixture f;
     auto av = f.createInitializer({"a", getPredicateWithArity(4)}, 5)->init().getAttribute();
-    EXPECT_EQUAL(5, av->getCreateSerialNum());
-    EXPECT_EQUAL(1, av->getNumDocs());
+    EXPECT_EQUAL(5u, av->getCreateSerialNum());
+    EXPECT_EQUAL(1u, av->getNumDocs());
 }
 
 TEST("require that tensor attribute can be initialized")
@@ -167,8 +164,8 @@ TEST("require that tensor attribute can be initialized")
     saveAttr("a", getTensor("tensor(x[10])"), 10, 2);
     Fixture f;
     auto av = f.createInitializer({"a", getTensor("tensor(x[10])")}, 5)->init().getAttribute();
-    EXPECT_EQUAL(2, av->getCreateSerialNum());
-    EXPECT_EQUAL(2, av->getNumDocs());
+    EXPECT_EQUAL(2u, av->getCreateSerialNum());
+    EXPECT_EQUAL(2u, av->getNumDocs());
 }
 
 TEST("require that tensor attributes will not be initialized with future-created attribute")
@@ -176,8 +173,8 @@ TEST("require that tensor attributes will not be initialized with future-created
     saveAttr("a", getTensor("tensor(x[10])"), 10, 8);
     Fixture f;
     auto av = f.createInitializer({"a", getTensor("tensor(x[10])")}, 5)->init().getAttribute();
-    EXPECT_EQUAL(5, av->getCreateSerialNum());
-    EXPECT_EQUAL(1, av->getNumDocs());
+    EXPECT_EQUAL(5u, av->getCreateSerialNum());
+    EXPECT_EQUAL(1u, av->getNumDocs());
 }
 
 TEST("require that tensor attributes will not be initialized with mismatching type")
@@ -185,8 +182,8 @@ TEST("require that tensor attributes will not be initialized with mismatching ty
     saveAttr("a", getTensor("tensor(x[10])"), 10, 2);
     Fixture f;
     auto av = f.createInitializer({"a", getTensor("tensor(x[11])")}, 5)->init().getAttribute();
-    EXPECT_EQUAL(5, av->getCreateSerialNum());
-    EXPECT_EQUAL(1, av->getNumDocs());
+    EXPECT_EQUAL(5u, av->getCreateSerialNum());
+    EXPECT_EQUAL(1u, av->getNumDocs());
 }
 
 TEST("require that too old attribute is not loaded")
@@ -194,8 +191,8 @@ TEST("require that too old attribute is not loaded")
     saveAttr("a", int32_sv, 3, 2);
     Fixture f;
     auto av = f.createInitializer({"a", int32_sv}, 5)->init().getAttribute();
-    EXPECT_EQUAL(5, av->getCreateSerialNum());
-    EXPECT_EQUAL(1, av->getNumDocs());
+    EXPECT_EQUAL(5u, av->getCreateSerialNum());
+    EXPECT_EQUAL(1u, av->getNumDocs());
 }
 
 }
diff --git a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
index 50502767395..5375f7817ec 100644
--- a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
@@ -1,10 +1,7 @@
 // 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("attributeflush_test");
+
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
-#include <vespa/vespalib/util/sync.h>
 #include <vespa/searchcore/proton/attribute/attributemanager.h>
 #include <vespa/searchcore/proton/attribute/attributedisklayout.h>
 #include <vespa/searchcore/proton/attribute/attribute_writer.h>
@@ -12,13 +9,14 @@ LOG_SETUP("attributeflush_test");
 #include <vespa/searchlib/attribute/attributefactory.h>
 #include <vespa/searchlib/attribute/integerbase.h>
 #include <vespa/searchlib/common/indexmetainfo.h>
-#include <vespa/searchlib/util/dirtraverse.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/common/foregroundtaskexecutor.h>
 #include <vespa/searchcore/proton/test/directory_handler.h>
-#include <vespa/searchcore/proton/common/hw_info.h>
-#include <vespa/searchlib/attribute/attributevector.hpp>
+#include <vespa/fastos/file.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("attributeflush_test");
 
 using namespace document;
 using namespace search;
@@ -36,8 +34,7 @@ typedef std::shared_ptr<Gate> GateSP;
 
 namespace proton {
 
-namespace
-{
+namespace {
 
 const uint64_t createSerialNum = 42u;
 
@@ -581,7 +578,7 @@ Test::requireThatFlushedAttributeCanBeLoaded(const HwInfo &hwInfo)
         AttributeManager &am = amf._m;
         AttributeVector::SP av = amf.addPostingAttribute(attrName);
         IntegerAttribute & ia = static_cast<IntegerAttribute &>(*av);
-        EXPECT_EQUAL(1, av->getNumDocs());
+        EXPECT_EQUAL(1u, av->getNumDocs());
         av->addDocs(numDocs);
         EXPECT_EQUAL(numDocs + 1, av->getNumDocs());
         for (uint32_t i = 0; i < numDocs; ++i) {
diff --git a/searchcore/src/tests/proton/common/dummydbowner.h b/searchcore/src/tests/proton/common/dummydbowner.h
index 8f44985d619..1b0b609e33d 100644
--- a/searchcore/src/tests/proton/common/dummydbowner.h
+++ b/searchcore/src/tests/proton/common/dummydbowner.h
@@ -17,6 +17,7 @@ struct DummyDBOwner : IDocumentDBOwner {
         : _registry(std::make_shared<DocumentDBReferenceRegistry>())
     {
     }
+    ~DummyDBOwner() {}
 
     bool isInitializing() const override { return false; }
 
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index e0e0c477753..d7311a2cc63 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -343,44 +343,22 @@ private:
                 uint32_t id,
                 bool relaxed = false);
 
-    void
-    requireThatAdapterHandlesAllFieldTypes();
-
-    void
-    requireThatAdapterHandlesMultipleDocuments();
-
-    void
-    requireThatAdapterHandlesDocumentIdField();
-
-    void
-    requireThatDocsumRequestIsProcessed();
-
-    void
-    requireThatRewritersAreUsed();
-
-    void
-    requireThatAttributesAreUsed();
-
-    void
-    requireThatSummaryAdapterHandlesPutAndRemove();
-
-    void
-    requireThatAnnotationsAreUsed();
-
-    void
-    requireThatUrisAreUsed();
-
-    void
-    requireThatPositionsAreUsed();
-
-    void
-    requireThatRawFieldsWorks();
-
-    void
-    requireThatFieldCacheRepoCanReturnDefaultFieldCache();
+    void requireThatAdapterHandlesAllFieldTypes();
+    void requireThatAdapterHandlesMultipleDocuments();
+    void requireThatAdapterHandlesDocumentIdField();
+    void requireThatDocsumRequestIsProcessed();
+    void requireThatRewritersAreUsed();
+    void requireThatAttributesAreUsed();
+    void requireThatSummaryAdapterHandlesPutAndRemove();
+    void requireThatAnnotationsAreUsed();
+    void requireThatUrisAreUsed();
+    void requireThatPositionsAreUsed();
+    void requireThatRawFieldsWorks();
+    void requireThatFieldCacheRepoCanReturnDefaultFieldCache();
 
 public:
     Test();
+    ~Test();
     int Main() override;
 };
 
@@ -1313,7 +1291,7 @@ Test::Test()
     }
 }
 
-
+Test::~Test() {}
 
 int
 Test::Main()
diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
index 487e84c02d6..878833fa58b 100644
--- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
+++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
@@ -196,6 +196,7 @@ class Test : public vespalib::TestApp {
     void setSpanTree(StringFieldValue & value, SpanTree::UP tree);
 public:
     Test();
+    ~Test();
     int Main() override;
 };
 
@@ -246,6 +247,8 @@ Test::Test() :
     ASSERT_TRUE(_documentType);
 }
 
+Test::~Test() {}
+
 #define TEST_CALL(func) \
     TEST_DO(setUp()); \
     TEST_DO(func); \
diff --git a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
index f7832d7e4dc..9c17b904eed 100644
--- a/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
+++ b/searchcore/src/tests/proton/feedoperation/feedoperation_test.cpp
@@ -1,20 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for feedoperation.
 
-#include <vespa/log/log.h>
-LOG_SETUP("feedoperation_test");
-#include <vespa/fastos/fastos.h>
 
-#include <vespa/document/base/documentid.h>
-#include <vespa/document/bucket/bucketid.h>
-#include <vespa/document/datatype/datatype.h>
-#include <vespa/document/fieldvalue/document.h>
-#include <vespa/document/update/documentupdate.h>
-#include <vespa/document/update/assignvalueupdate.h>
-#include <vespa/document/update/fieldupdate.h>
-#include <vespa/document/update/valueupdate.h>
-#include <vespa/document/fieldvalue/fieldvalues.h>
-#include <persistence/spi/types.h>
 #include <vespa/searchcore/proton/feedoperation/compact_lid_space_operation.h>
 #include <vespa/searchcore/proton/feedoperation/deletebucketoperation.h>
 #include <vespa/searchcore/proton/feedoperation/joinbucketsoperation.h>
@@ -29,6 +16,13 @@ LOG_SETUP("feedoperation_test");
 #include <vespa/searchcore/proton/feedoperation/updateoperation.h>
 #include <vespa/searchcore/proton/feedoperation/wipehistoryoperation.h>
 #include <vespa/searchlib/query/base.h>
+#include <persistence/spi/types.h>
+#include <vespa/document/base/documentid.h>
+#include <vespa/document/datatype/datatype.h>
+#include <vespa/document/fieldvalue/document.h>
+#include <vespa/document/update/documentupdate.h>
+#include <vespa/document/update/assignvalueupdate.h>
+#include <vespa/document/fieldvalue/fieldvalues.h>
 #include <vespa/document/repo/configbuilder.h>
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/vespalib/testkit/testapp.h>
@@ -91,12 +85,12 @@ uint32_t getDocIdSize(const DocumentId &doc_id)
 void assertDocumentOperation(DocumentOperation &op, BucketId expBucket, uint32_t expDocSize)
 {
     EXPECT_EQUAL(expBucket, op.getBucketId());
-    EXPECT_EQUAL(10, op.getTimestamp().getValue());
+    EXPECT_EQUAL(10u, op.getTimestamp().getValue());
     EXPECT_EQUAL(expDocSize, op.getSerializedDocSize());
-    EXPECT_EQUAL(1, op.getSubDbId());
-    EXPECT_EQUAL(2, op.getLid());
-    EXPECT_EQUAL(3, op.getPrevSubDbId());
-    EXPECT_EQUAL(4, op.getPrevLid());
+    EXPECT_EQUAL(1u, op.getSubDbId());
+    EXPECT_EQUAL(2u, op.getLid());
+    EXPECT_EQUAL(3u, op.getPrevSubDbId());
+    EXPECT_EQUAL(4u, op.getPrevLid());
 }
 
 DocumentTypeRepo::UP
@@ -277,7 +271,7 @@ TEST_F("require that we can serialize and deserialize update operations", Fixtur
         op.deserialize(stream, *f._repo);
         EXPECT_EQUAL(*upd, *op.getUpdate());
         EXPECT_EQUAL(bucket, op.getBucketId());
-        EXPECT_EQUAL(10, op.getTimestamp().getValue());
+        EXPECT_EQUAL(10u, op.getTimestamp().getValue());
     }
 }
 
@@ -295,7 +289,7 @@ TEST_F("require that we can deserialize old update operations", Fixture)
         op.deserialize(stream, *f._repo);
         EXPECT_EQUAL(*upd, *op.getUpdate());
         EXPECT_EQUAL(bucket, op.getBucketId());
-        EXPECT_EQUAL(10, op.getTimestamp().getValue());
+        EXPECT_EQUAL(10u, op.getTimestamp().getValue());
     }
 }
 
@@ -310,7 +304,7 @@ TEST_F("require that we can serialize and deserialize put operations", Fixture)
         PutOperation op(bucket, Timestamp(10), doc);
         op.setDbDocumentId({1, 2});
         op.setPrevDbDocumentId({3, 4});
-        EXPECT_EQUAL(0, op.getSerializedDocSize());
+        EXPECT_EQUAL(0u, op.getSerializedDocSize());
         op.serialize(stream);
         EXPECT_EQUAL(expSerializedDocSize, op.getSerializedDocSize());
     }
@@ -332,7 +326,7 @@ TEST_F("require that we can serialize and deserialize move operations", Fixture)
     {
         MoveOperation op(bucket, Timestamp(10), doc, {3, 4}, 1);
         op.setTargetLid(2);
-        EXPECT_EQUAL(0, op.getSerializedDocSize());
+        EXPECT_EQUAL(0u, op.getSerializedDocSize());
         op.serialize(stream);
         EXPECT_EQUAL(expSerializedDocSize, op.getSerializedDocSize());
     }
@@ -354,7 +348,7 @@ TEST_F("require that we can serialize and deserialize remove operations", Fixtur
         RemoveOperation op(bucket, Timestamp(10), docId);
         op.setDbDocumentId({1, 2});
         op.setPrevDbDocumentId({3, 4});
-        EXPECT_EQUAL(0, op.getSerializedDocSize());
+        EXPECT_EQUAL(0u, op.getSerializedDocSize());
         op.serialize(stream);
         EXPECT_EQUAL(expSerializedDocSize, op.getSerializedDocSize());
     }
diff --git a/searchcore/src/tests/proton/index/fusionrunner_test.cpp b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
index 53db6f44c91..af2bafab09c 100644
--- a/searchcore/src/tests/proton/index/fusionrunner_test.cpp
+++ b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
@@ -1,28 +1,18 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for fusionrunner.
 
-#include <vespa/fastos/fastos.h>
-#include <vespa/log/log.h>
-LOG_SETUP("fusionrunner_test");
-
-#include <vespa/document/fieldvalue/document.h>
-#include <vespa/document/fieldvalue/fieldvalue.h>
-#include <vespa/searchlib/memoryindex/memoryindex.h>
 #include <vespa/searchcore/proton/index/indexmanager.h>
+#include <vespa/searchcore/proton/server/executorthreadingservice.h>
 #include <vespa/searchcorespi/index/fusionrunner.h>
-#include <vespa/searchcorespi/index/fusionspec.h>
-#include <vespa/searchlib/attribute/fixedsourceselector.h>
+#include <vespa/searchlib/memoryindex/memoryindex.h>
 #include <vespa/searchlib/diskindex/diskindex.h>
 #include <vespa/searchlib/diskindex/indexbuilder.h>
-#include <vespa/searchlib/fef/matchdata.h>
 #include <vespa/searchlib/fef/matchdatalayout.h>
-#include <vespa/searchlib/fef/termfieldmatchdata.h>
 #include <vespa/searchlib/index/docbuilder.h>
 #include <vespa/searchlib/index/dummyfileheadercontext.h>
 #include <vespa/searchlib/query/tree/simplequery.h>
-#include <vespa/searchlib/queryeval/fake_requestcontext.h>
-#include <vespa/searchcore/proton/server/executorthreadingservice.h>
 #include <vespa/vespalib/testkit/testapp.h>
+#include <vespa/fastos/file.h>
 #include <set>
 
 using document::Document;
@@ -96,8 +86,8 @@ public:
           _ops(_fileHeaderContext,
                TuneFileIndexManager(), 0,
                _threadingService)
-    {
-    }
+    {}
+    ~Test() {}
     int Main() override;
 };
 
diff --git a/searchcore/src/tests/proton/index/indexcollection_test.cpp b/searchcore/src/tests/proton/index/indexcollection_test.cpp
index b6c98e1631e..e78baadb4de 100644
--- a/searchcore/src/tests/proton/index/indexcollection_test.cpp
+++ b/searchcore/src/tests/proton/index/indexcollection_test.cpp
@@ -1,16 +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("indexcollection_test");
 
 #include <vespa/searchcore/proton/matching/fakesearchcontext.h>
-#include <vespa/searchcorespi/index/indexcollection.h>
 #include <vespa/searchcorespi/index/warmupindexcollection.h>
-#include <vespa/searchlib/queryeval/fake_searchable.h>
-#include <vespa/searchlib/attribute/fixedsourceselector.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/util/threadstackexecutor.h>
 
+#include <vespa/log/log.h>
+LOG_SETUP("indexcollection_test");
+
 using search::queryeval::ISourceSelector;
 using search::queryeval::FakeSearchable;
 using search::FixedSourceSelector;
@@ -46,6 +43,7 @@ public:
              _executor(1, 128*1024),
              _warmup(new FakeIndexSearchable)
     {}
+    ~Test() {}
 
     int Main() override;
 };
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()
 {
diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp b/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp
index f08121f46f6..49a89bb882d 100644
--- a/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp
+++ b/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp
@@ -1,7 +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("disk_mem_usage_filter_test");
+
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchcore/proton/server/disk_mem_usage_filter.h>
 
@@ -9,8 +7,7 @@ using proton::DiskMemUsageFilter;
 
 namespace fs = std::experimental::filesystem;
 
-namespace
-{
+namespace {
 
 struct Fixture
 {
@@ -66,9 +63,9 @@ TEST_F("Check that default filter allows write", Fixture)
 
 TEST_F("Check that stats are wired through", Fixture)
 {
-    EXPECT_EQUAL(42, f._filter.getMemoryStats().getMappingsCount());
+    EXPECT_EQUAL(42u, f._filter.getMemoryStats().getMappingsCount());
     f.triggerMemoryLimit();
-    EXPECT_EQUAL(43, f._filter.getMemoryStats().getMappingsCount());
+    EXPECT_EQUAL(43u, f._filter.getMemoryStats().getMappingsCount());
 }
 
 TEST_F("Check that disk limit can be reached", Fixture)
diff --git a/searchcore/src/tests/proton/server/memory_flush_config_updater/memory_flush_config_updater_test.cpp b/searchcore/src/tests/proton/server/memory_flush_config_updater/memory_flush_config_updater_test.cpp
index 21d8e70c472..9096b5530f8 100644
--- a/searchcore/src/tests/proton/server/memory_flush_config_updater/memory_flush_config_updater_test.cpp
+++ b/searchcore/src/tests/proton/server/memory_flush_config_updater/memory_flush_config_updater_test.cpp
@@ -1,7 +1,6 @@
 // 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 <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchcore/proton/server/memory_flush_config_updater.h>
 
 using namespace proton;
@@ -50,7 +49,7 @@ struct Fixture
         : strategy(std::make_shared<MemoryFlush>(MemoryFlushConfigUpdater::convertConfig(getDefaultConfig()))),
           updater(strategy, getDefaultConfig())
     {}
-    void assertStrategyConfig(int64_t expMaxGlobalMemory, int64_t expMaxEachMemory, int64_t expMaxGlobalTlsSize) {
+    void assertStrategyConfig(uint64_t expMaxGlobalMemory, int64_t expMaxEachMemory, uint64_t expMaxGlobalTlsSize) {
         EXPECT_EQUAL(expMaxGlobalMemory, strategy->getConfig().maxGlobalMemory);
         EXPECT_EQUAL(expMaxEachMemory, strategy->getConfig().maxMemoryGain);
         EXPECT_EQUAL(expMaxGlobalTlsSize, strategy->getConfig().maxGlobalTlsSize);
diff --git a/searchcore/src/tests/proton/statusreport/CMakeLists.txt b/searchcore/src/tests/proton/statusreport/CMakeLists.txt
index 98462c157fc..c88613388ab 100644
--- a/searchcore/src/tests/proton/statusreport/CMakeLists.txt
+++ b/searchcore/src/tests/proton/statusreport/CMakeLists.txt
@@ -3,5 +3,6 @@ vespa_add_executable(searchcore_statusreport_test_app TEST
     SOURCES
     statusreport.cpp
     DEPENDS
+    searchcore_pcommon
 )
 vespa_add_test(NAME searchcore_statusreport_test_app COMMAND searchcore_statusreport_test_app)
diff --git a/searchcore/src/tests/proton/statusreport/statusreport.cpp b/searchcore/src/tests/proton/statusreport/statusreport.cpp
index 81dfe05fa2c..43b4452835a 100644
--- a/searchcore/src/tests/proton/statusreport/statusreport.cpp
+++ b/searchcore/src/tests/proton/statusreport/statusreport.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("statusreport_test");
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/searchcore/proton/common/statusreport.h>