Include only what you need.

5 files changed, 6 insertions, 2 deletions

diff --git a/config/src/tests/configgen/value_converter.cpp b/config/src/tests/configgen/value_converter.cpp
index 1034d0821fd..8c969b77271 100644
--- a/config/src/tests/configgen/value_converter.cpp
+++ b/config/src/tests/configgen/value_converter.cpp
@@ -3,6 +3,7 @@
 #include <vespa/config/configgen/value_converter.h>
 #include <vespa/config/common/exceptions.h>
 #include <vespa/vespalib/data/slime/slime.h>
+#include <climits>
 
 using namespace config;
 using namespace config::internal;
diff --git a/config/src/tests/frtconnectionpool/frtconnectionpool.cpp b/config/src/tests/frtconnectionpool/frtconnectionpool.cpp
index c14cdbbbc23..79ec1ee42f4 100644
--- a/config/src/tests/frtconnectionpool/frtconnectionpool.cpp
+++ b/config/src/tests/frtconnectionpool/frtconnectionpool.cpp
@@ -5,6 +5,7 @@
 #include <vespa/fnet/frt/error.h>
 #include <sstream>
 #include <set>
+#include <unistd.h>
 
 using namespace config;
 
diff --git a/config/src/tests/functiontest/functiontest.cpp b/config/src/tests/functiontest/functiontest.cpp
index 7fe87775f74..257e131534b 100644
--- a/config/src/tests/functiontest/functiontest.cpp
+++ b/config/src/tests/functiontest/functiontest.cpp
@@ -37,8 +37,8 @@ checkVariableAccess(const FunctionTestConfig & config)
     EXPECT_EQUAL(1u, config.boolarr.size());
     EXPECT_EQUAL(0u, config.intarr.size());
     EXPECT_EQUAL(2u, config.longarr.size());
-    LOG(error, "0: %" PRId64, config.longarr[0]);
-    LOG(error, "1: %" PRId64, config.longarr[1]);
+    LOG(error, "0: %ld", config.longarr[0]);
+    LOG(error, "1: %ld", config.longarr[1]);
     EXPECT_EQUAL(std::numeric_limits<int64_t>::max(), config.longarr[0]);
     EXPECT_EQUAL(std::numeric_limits<int64_t>::min(), config.longarr[1]);
     EXPECT_EQUAL(2u, config.doublearr.size());
diff --git a/config/src/tests/misc/configsystem.cpp b/config/src/tests/misc/configsystem.cpp
index f0f526265ca..9574d9d274a 100644
--- a/config/src/tests/misc/configsystem.cpp
+++ b/config/src/tests/misc/configsystem.cpp
@@ -3,6 +3,7 @@
 #include <vespa/config/common/configsystem.h>
 #include <vespa/defaults.h>
 #include <vespa/fastos/file.h>
+#include <unistd.h>
 
 using namespace config;
 
diff --git a/config/src/tests/print/print.cpp b/config/src/tests/print/print.cpp
index e058b91822e..9df4bcf4914 100644
--- a/config/src/tests/print/print.cpp
+++ b/config/src/tests/print/print.cpp
@@ -8,6 +8,7 @@
 #include <vespa/config/helper/configgetter.hpp>
 #include "config-my.h"
 #include "config-motd.h"
+#include <sys/stat.h>
 
 using namespace config;