Include only what you need.

15 files changed, 32 insertions, 12 deletions

diff --git a/vespalib/src/tests/guard/guard_test.cpp b/vespalib/src/tests/guard/guard_test.cpp
index 358a56d44cb..a9d5d5f894c 100644
--- a/vespalib/src/tests/guard/guard_test.cpp
+++ b/vespalib/src/tests/guard/guard_test.cpp
@@ -1,8 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/vespalib/util/guard.h>
+#include <fcntl.h>
+#include <unistd.h>
 
 using namespace vespalib;
 
diff --git a/vespalib/src/tests/net/selector/selector_test.cpp b/vespalib/src/tests/net/selector/selector_test.cpp
index c91b3e0b054..964e37adf3b 100644
--- a/vespalib/src/tests/net/selector/selector_test.cpp
+++ b/vespalib/src/tests/net/selector/selector_test.cpp
@@ -6,6 +6,7 @@
 #include <thread>
 #include <functional>
 #include <chrono>
+#include <fcntl.h>
 
 using namespace vespalib;
 
diff --git a/vespalib/src/tests/net/socket/socket_test.cpp b/vespalib/src/tests/net/socket/socket_test.cpp
index bfeb73f72fc..c7cb2a0b6d9 100644
--- a/vespalib/src/tests/net/socket/socket_test.cpp
+++ b/vespalib/src/tests/net/socket/socket_test.cpp
@@ -10,6 +10,8 @@
 #include <thread>
 #include <functional>
 #include <chrono>
+#include <unistd.h>
+#include <sys/stat.h>
 
 using namespace vespalib;
 
diff --git a/vespalib/src/tests/signalhandler/signalhandler_test.cpp b/vespalib/src/tests/signalhandler/signalhandler_test.cpp
index a83661e8697..b11cc5746d9 100644
--- a/vespalib/src/tests/signalhandler/signalhandler_test.cpp
+++ b/vespalib/src/tests/signalhandler/signalhandler_test.cpp
@@ -1,8 +1,11 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("signalhandler_test");
+
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/util/signalhandler.h>
+#include <unistd.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("signalhandler_test");
 
 using namespace vespalib;
 
diff --git a/vespalib/src/tests/text/utf8/utf8_test.cpp b/vespalib/src/tests/text/utf8/utf8_test.cpp
index 9110b44f646..a44c0a7560b 100644
--- a/vespalib/src/tests/text/utf8/utf8_test.cpp
+++ b/vespalib/src/tests/text/utf8/utf8_test.cpp
@@ -1,10 +1,14 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/log/log.h>
-LOG_SETUP("utf8_test");
+
 #include <vespa/vespalib/testkit/test_kit.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/text/utf8.h>
+#include <fcntl.h>
+#include <unistd.h>
 
+
+#include <vespa/log/log.h>
+LOG_SETUP("utf8_test");
 #if 0
 #include <vespa/fastlib/text/unicodeutil.h>
 #endif
diff --git a/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp b/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp
index f8df7cb5221..ee25652a3a8 100644
--- a/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp
+++ b/vespalib/src/vespa/vespalib/hwaccelrated/avxprivate.hpp
@@ -3,12 +3,9 @@
 #pragma once
 
 #include <vespa/fastos/dynamiclibrary.h>
+#include <cstring>
 
-namespace vespalib {
-
-namespace hwaccelrated {
-
-namespace avx {
+namespace vespalib::hwaccelrated::avx {
 
 namespace {
 
@@ -80,5 +77,3 @@ T dotProductSelectAlignment(const T * af, const T * bf, size_t sz)
 }
 
 }
-}
-}
diff --git a/vespalib/src/vespa/vespalib/io/fileutil.cpp b/vespalib/src/vespa/vespalib/io/fileutil.cpp
index 3b092bd63f4..389218cea35 100644
--- a/vespalib/src/vespa/vespalib/io/fileutil.cpp
+++ b/vespalib/src/vespa/vespalib/io/fileutil.cpp
@@ -6,6 +6,9 @@
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/fastos/file.h>
 #include <ostream>
+#include <cassert>
+#include <unistd.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 
 #include <vespa/log/log.h>
diff --git a/vespalib/src/vespa/vespalib/stllike/asciistream.cpp b/vespalib/src/vespa/vespalib/stllike/asciistream.cpp
index 8d3ff1d77dc..7b895f3eb73 100644
--- a/vespalib/src/vespa/vespalib/stllike/asciistream.cpp
+++ b/vespalib/src/vespa/vespalib/stllike/asciistream.cpp
@@ -9,6 +9,7 @@
 #include <algorithm>
 #include <limits>
 #include <stdexcept>
+#include <cassert>
 
 namespace vespalib {
 
diff --git a/vespalib/src/vespa/vespalib/test/socket_options_verifier.h b/vespalib/src/vespa/vespalib/test/socket_options_verifier.h
index ace0adb9c8e..2be96b861af 100644
--- a/vespalib/src/vespa/vespalib/test/socket_options_verifier.h
+++ b/vespalib/src/vespa/vespalib/test/socket_options_verifier.h
@@ -3,6 +3,9 @@
 #pragma once
 
 #include <vespa/vespalib/testkit/test_kit.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <netinet/tcp.h>
 
 namespace vespalib {
 namespace test {
diff --git a/vespalib/src/vespa/vespalib/testkit/test_kit.h b/vespalib/src/vespa/vespalib/testkit/test_kit.h
index d9f8428c680..7e6b07d71df 100644
--- a/vespalib/src/vespa/vespalib/testkit/test_kit.h
+++ b/vespalib/src/vespa/vespalib/testkit/test_kit.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <memory>
+#include <cstring>
 #include "test_macros.h"
 #include "test_comparators.h"
 #include "test_master.h"
diff --git a/vespalib/src/vespa/vespalib/testkit/test_master.cpp b/vespalib/src/vespa/vespalib/testkit/test_master.cpp
index 9ea5a8a1c6a..d5309845dfd 100644
--- a/vespalib/src/vespa/vespalib/testkit/test_master.cpp
+++ b/vespalib/src/vespa/vespalib/testkit/test_master.cpp
@@ -2,6 +2,7 @@
 
 #include "test_master.h"
 #include <vespa/vespalib/util/barrier.h>
+#include <cstring>
 
 namespace vespalib {
 
diff --git a/vespalib/src/vespa/vespalib/util/alloc.cpp b/vespalib/src/vespa/vespalib/util/alloc.cpp
index be443163b81..dff744a0a41 100644
--- a/vespalib/src/vespa/vespalib/util/alloc.cpp
+++ b/vespalib/src/vespa/vespalib/util/alloc.cpp
@@ -9,6 +9,7 @@
 #include <atomic>
 #include <unordered_map>
 #include <vespa/fastos/file.h>
+#include <unistd.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".vespalib.alloc");
diff --git a/vespalib/src/vespa/vespalib/util/slaveproc.cpp b/vespalib/src/vespa/vespalib/util/slaveproc.cpp
index 76fa86ac5db..8b35fa3559b 100644
--- a/vespalib/src/vespa/vespalib/util/slaveproc.cpp
+++ b/vespalib/src/vespa/vespalib/util/slaveproc.cpp
@@ -3,6 +3,7 @@
 #include <vespa/fastos/time.h>
 #include "guard.h"
 #include "slaveproc.h"
+#include <cstring>
 
 #ifndef FASTOS_NO_THREADS
 
diff --git a/vespalib/src/vespa/vespalib/util/stringfmt.h b/vespalib/src/vespa/vespalib/util/stringfmt.h
index 625c9530a48..f806368adf5 100644
--- a/vespalib/src/vespa/vespalib/util/stringfmt.h
+++ b/vespalib/src/vespa/vespalib/util/stringfmt.h
@@ -7,6 +7,7 @@
 #ifndef PRId64
   #define PRId64 "ld"
   #define PRIu64 "lu"
+  #define PRIx64 "lx"
 #endif
 
 namespace vespalib {
diff --git a/vespalib/src/vespa/vespalib/util/sync.h b/vespalib/src/vespa/vespalib/util/sync.h
index 737cdbc3fed..ccadbfb8dfc 100644
--- a/vespalib/src/vespa/vespalib/util/sync.h
+++ b/vespalib/src/vespa/vespalib/util/sync.h
@@ -6,6 +6,8 @@
 #include <vespa/fastos/mutex.h>
 #include <vespa/fastos/cond.h>
 #include <vespa/fastos/time.h>
+#include <cassert>
+
 
 namespace vespalib {