Include asciistream in implementation only.

13 files changed, 23 insertions, 13 deletions

diff --git a/vespalib/src/tests/alloc/allocate_and_core.cpp b/vespalib/src/tests/alloc/allocate_and_core.cpp
index 63718de5ee4..8664a969031 100644
--- a/vespalib/src/tests/alloc/allocate_and_core.cpp
+++ b/vespalib/src/tests/alloc/allocate_and_core.cpp
@@ -1,5 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/vespalib/util/alloc.h>
+#include <string.h>
+#include <assert.h>
 
 using namespace vespalib::alloc;
 
diff --git a/vespalib/src/tests/exception_classes/mmap.cpp b/vespalib/src/tests/exception_classes/mmap.cpp
index e8a82a412ae..8cc36c725fd 100644
--- a/vespalib/src/tests/exception_classes/mmap.cpp
+++ b/vespalib/src/tests/exception_classes/mmap.cpp
@@ -1,5 +1,8 @@
 #include <vespa/vespalib/util/alloc.h>
 #include <vector>
+#include <assert.h>
+#include <string.h>
+#include <sys/resource.h>
 
 using namespace vespalib::alloc;
 
diff --git a/vespalib/src/vespa/vespalib/net/socket_address.cpp b/vespalib/src/vespa/vespalib/net/socket_address.cpp
index 3e0399ebf50..76ae01418c6 100644
--- a/vespalib/src/vespa/vespalib/net/socket_address.cpp
+++ b/vespalib/src/vespa/vespalib/net/socket_address.cpp
@@ -1,11 +1,9 @@
 // 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 "socket_address.h"
 #include <vespa/vespalib/util/stringfmt.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <arpa/inet.h>
 #include <netdb.h>
diff --git a/vespalib/src/vespa/vespalib/net/socket_address.h b/vespalib/src/vespa/vespalib/net/socket_address.h
index 369054e6885..a71b676f274 100644
--- a/vespalib/src/vespa/vespalib/net/socket_address.h
+++ b/vespalib/src/vespa/vespalib/net/socket_address.h
@@ -6,6 +6,7 @@
 #include <vespa/vespalib/stllike/string.h>
 #include "socket_handle.h"
 #include <vector>
+#include <sys/socket.h>
 
 namespace vespalib {
 
diff --git a/vespalib/src/vespa/vespalib/net/socket_handle.h b/vespalib/src/vespa/vespalib/net/socket_handle.h
index 81c1ffc6df1..a7dc44c6f2b 100644
--- a/vespalib/src/vespa/vespalib/net/socket_handle.h
+++ b/vespalib/src/vespa/vespalib/net/socket_handle.h
@@ -1,8 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-
 #pragma once
 
+#include <unistd.h>
+
 namespace vespalib {
 
 /**
diff --git a/vespalib/src/vespa/vespalib/objects/nbostream.h b/vespalib/src/vespa/vespalib/objects/nbostream.h
index b868574f443..e632704f1fa 100644
--- a/vespalib/src/vespa/vespalib/objects/nbostream.h
+++ b/vespalib/src/vespa/vespalib/objects/nbostream.h
@@ -5,6 +5,7 @@
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/util/array.h>
 #include <vespa/vespalib/util/buffer.h>
+#include <arpa/inet.h>
 
 namespace vespalib {
 
diff --git a/vespalib/src/vespa/vespalib/util/atomic.h b/vespalib/src/vespa/vespalib/util/atomic.h
index c9259671cae..1f796482fbf 100644
--- a/vespalib/src/vespa/vespalib/util/atomic.h
+++ b/vespalib/src/vespa/vespalib/util/atomic.h
@@ -4,7 +4,8 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
+#include <sys/types.h>
+#include <stdint.h>
 
 namespace vespalib {
 
@@ -31,7 +32,7 @@ public:
      **/
     struct TaggedPtr
     {
-        TaggedPtr() : _ptr(NULL), _tag(0) { }
+        TaggedPtr() : _ptr(nullptr), _tag(0) { }
         TaggedPtr(void * h, size_t t) : _ptr(h), _tag(t) { }
         TaggedPtr(const TaggedPtr & h) : _ptr(h._ptr), _tag(h._tag) { }
         TaggedPtr & operator = (const TaggedPtr & h) { if (this != &h) {_ptr = h._ptr; _tag = h._tag; }; return *this; }
diff --git a/vespalib/src/vespa/vespalib/util/buffer.h b/vespalib/src/vespa/vespalib/util/buffer.h
index eda3e56e6e7..88fe6359aae 100644
--- a/vespalib/src/vespa/vespalib/util/buffer.h
+++ b/vespalib/src/vespa/vespalib/util/buffer.h
@@ -1,7 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/fastos/types.h>
+#include <sys/types.h>
 
 namespace vespalib {
 
@@ -11,7 +11,7 @@ namespace vespalib {
 class BufferRef
 {
 public:
-    BufferRef() : _buf(NULL), _sz(0) { }
+    BufferRef() : _buf(nullptr), _sz(0) { }
     BufferRef(void * buf, size_t sz) : _buf(buf), _sz(sz) { }
     const char * c_str() const { return static_cast<const char *>(_buf); }
     char * str()               { return static_cast<char *>(_buf); }
@@ -32,7 +32,7 @@ private:
 class ConstBufferRef
 {
 public:
-    ConstBufferRef() : _buf(NULL), _sz(0) { }
+    ConstBufferRef() : _buf(nullptr), _sz(0) { }
     ConstBufferRef(const void * buf, size_t sz) : _buf(buf), _sz(sz) { }
     ConstBufferRef(const BufferRef & rhs) : _buf(rhs.data()), _sz(rhs.size()) { }
     const char * c_str() const { return static_cast<const char *>(_buf); }
diff --git a/vespalib/src/vespa/vespalib/util/generationhandler.h b/vespalib/src/vespa/vespalib/util/generationhandler.h
index b940e2cad5f..61ef400cae0 100644
--- a/vespalib/src/vespa/vespalib/util/generationhandler.h
+++ b/vespalib/src/vespa/vespalib/util/generationhandler.h
@@ -4,6 +4,7 @@
 
 #include <stdint.h>
 #include <atomic>
+#include <assert.h>
 
 namespace vespalib {
 
@@ -37,8 +38,7 @@ public:
             : _refCount(1),
               _generation(0),
               _next(0)
-        {
-        }
+        { }
 
         ~GenerationHold()
         {
diff --git a/vespalib/src/vespa/vespalib/util/optimized.h b/vespalib/src/vespa/vespalib/util/optimized.h
index 1791c67f10d..ec11bbb686a 100644
--- a/vespalib/src/vespa/vespalib/util/optimized.h
+++ b/vespalib/src/vespa/vespalib/util/optimized.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <vespa/fastos/types.h>
+#include <stdint.h>
 
 namespace vespalib {
 
diff --git a/vespalib/src/vespa/vespalib/util/referencecounter.h b/vespalib/src/vespa/vespalib/util/referencecounter.h
index 6d9f4ed0d56..791c29c6d7c 100644
--- a/vespalib/src/vespa/vespalib/util/referencecounter.h
+++ b/vespalib/src/vespa/vespalib/util/referencecounter.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/vespalib/util/atomic.h>
+#include <assert.h>
 
 namespace vespalib
 {
diff --git a/vespalib/src/vespa/vespalib/util/sync.h b/vespalib/src/vespa/vespalib/util/sync.h
index ee563f1414b..a44763ec755 100644
--- a/vespalib/src/vespa/vespalib/util/sync.h
+++ b/vespalib/src/vespa/vespalib/util/sync.h
@@ -3,7 +3,9 @@
 
 #pragma once
 
-#include <vespa/fastos/fastos.h>
+#include <vespa/fastos/mutex.h>
+#include <vespa/fastos/cond.h>
+#include <vespa/fastos/time.h>
 
 namespace vespalib {
 
diff --git a/vespalib/src/vespa/vespalib/util/threadstackexecutorbase.h b/vespalib/src/vespa/vespalib/util/threadstackexecutorbase.h
index 872d8bc9dc8..a72c11d583d 100644
--- a/vespalib/src/vespa/vespalib/util/threadstackexecutorbase.h
+++ b/vespalib/src/vespa/vespalib/util/threadstackexecutorbase.h
@@ -9,6 +9,7 @@
 #include "sync.h"
 #include <memory>
 #include "noncopyable.hpp"
+#include <vespa/fastos/thread.h>
 
 namespace vespalib {