Merge pull request #3145 from vespa-engine/balder/reduce-includes-and-visibility

Balder/reduce includes and visibility

6 files changed, 9 insertions, 2 deletions

diff --git a/documentapi/src/tests/messages/messages50test.h b/documentapi/src/tests/messages/messages50test.h
index 642dad8d734..8711264ee7a 100644
--- a/documentapi/src/tests/messages/messages50test.h
+++ b/documentapi/src/tests/messages/messages50test.h
@@ -6,7 +6,7 @@
 class Messages50Test : public TestBase {
 protected:
     const vespalib::Version getVersion() const override { return vespalib::Version(5, 0); }
-    bool shouldTestCoverage() const override { return FALSE; }
+    bool shouldTestCoverage() const override { return false; }
     bool tryDocumentReply(const string &filename, uint32_t type);
     bool tryVisitorReply(const string &filename, uint32_t type);
 
diff --git a/documentapi/src/tests/messages/messages51test.h b/documentapi/src/tests/messages/messages51test.h
index 6ad1573f4f5..897491af892 100644
--- a/documentapi/src/tests/messages/messages51test.h
+++ b/documentapi/src/tests/messages/messages51test.h
@@ -6,7 +6,7 @@
 class Messages51Test : public Messages50Test {
 protected:
     const vespalib::Version getVersion() const override { return vespalib::Version(5, 1); }
-    bool shouldTestCoverage() const override { return TRUE; }
+    bool shouldTestCoverage() const override { return true; }
 
 public:
     Messages51Test();
diff --git a/documentapi/src/tests/messages/testbase.cpp b/documentapi/src/tests/messages/testbase.cpp
index c36faa251ab..8f2729964a6 100644
--- a/documentapi/src/tests/messages/testbase.cpp
+++ b/documentapi/src/tests/messages/testbase.cpp
@@ -3,6 +3,10 @@
 #include "testbase.h"
 #include <vespa/document/base/testdocrepo.h>
 #include <vespa/vespalib/util/exception.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <algorithm>
+
 #include <vespa/log/log.h>
 LOG_SETUP(".testbase");
 
diff --git a/documentapi/src/tests/priority/priority.cpp b/documentapi/src/tests/priority/priority.cpp
index 1a363dfff31..bc255215813 100644
--- a/documentapi/src/tests/priority/priority.cpp
+++ b/documentapi/src/tests/priority/priority.cpp
@@ -3,6 +3,7 @@
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/documentapi/messagebus/priority.h>
 #include <fstream>
+#include <algorithm>
 
 using namespace documentapi;
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
index ca698f4ae3a..b3e6ac422eb 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/visitor.cpp
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "visitor.h"
+#include <climits>
 
 namespace documentapi {
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablerepository.cpp b/documentapi/src/vespa/documentapi/messagebus/routablerepository.cpp
index 03562553fc0..ce83a2cd638 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablerepository.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablerepository.cpp
@@ -5,6 +5,7 @@
 #include <vespa/document/util/stringutil.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <sstream>
+#include <algorithm>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".routablerepository");