Add missing include statements. Check for atomic wait support.

7 files changed, 9 insertions, 0 deletions

diff --git a/vespamalloc/src/vespamalloc/malloc/common.h b/vespamalloc/src/vespamalloc/malloc/common.h
index a8bc8b102ec..58e05878f64 100644
--- a/vespamalloc/src/vespamalloc/malloc/common.h
+++ b/vespamalloc/src/vespamalloc/malloc/common.h
@@ -4,7 +4,9 @@
 #include <new>
 #include <atomic>
 #include <cassert>
+#include <cstdio>
 #include <vespamalloc/util/osmem.h>
+#include <thread>
 
 extern "C" void MallocRecurseOnSuspend(bool recurse) __attribute__ ((noinline));
 
diff --git a/vespamalloc/src/vespamalloc/malloc/datasegment.cpp b/vespamalloc/src/vespamalloc/malloc/datasegment.cpp
index 28b69717fb5..4bb36eade43 100644
--- a/vespamalloc/src/vespamalloc/malloc/datasegment.cpp
+++ b/vespamalloc/src/vespamalloc/malloc/datasegment.cpp
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "datasegment.h"
+#include <unistd.h>
 
 namespace vespamalloc::segment {
 
diff --git a/vespamalloc/src/vespamalloc/malloc/freelist.hpp b/vespamalloc/src/vespamalloc/malloc/freelist.hpp
index 0bc812b8ad3..9b18c375804 100644
--- a/vespamalloc/src/vespamalloc/malloc/freelist.hpp
+++ b/vespamalloc/src/vespamalloc/malloc/freelist.hpp
@@ -2,6 +2,7 @@
 #pragma once
 
 #include "freelist.h"
+#include <climits>
 
 namespace vespamalloc::segment {
 
diff --git a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h
index 88229aca77a..de72f0f3f2e 100644
--- a/vespamalloc/src/vespamalloc/malloc/memorywatcher.h
+++ b/vespamalloc/src/vespamalloc/malloc/memorywatcher.h
@@ -7,6 +7,7 @@
 #include <sys/stat.h>
 #include <ctype.h>
 #include <fcntl.h>
+#include <unistd.h>
 #include <vespamalloc/malloc/malloc.h>
 #include <vespamalloc/util/callstack.h>
 
diff --git a/vespamalloc/src/vespamalloc/malloc/mmappool.cpp b/vespamalloc/src/vespamalloc/malloc/mmappool.cpp
index 30e9985dae3..1d4cb5a6b5e 100644
--- a/vespamalloc/src/vespamalloc/malloc/mmappool.cpp
+++ b/vespamalloc/src/vespamalloc/malloc/mmappool.cpp
@@ -2,6 +2,7 @@
 #include "mmappool.h"
 #include "common.h"
 #include <sys/mman.h>
+#include <unistd.h>
 
 namespace vespamalloc {
 
diff --git a/vespamalloc/src/vespamalloc/malloc/mmappool.h b/vespamalloc/src/vespamalloc/malloc/mmappool.h
index aa8679c8171..6c06b840b5b 100644
--- a/vespamalloc/src/vespamalloc/malloc/mmappool.h
+++ b/vespamalloc/src/vespamalloc/malloc/mmappool.h
@@ -2,6 +2,7 @@
 #pragma once
 
 #include <atomic>
+#include <mutex>
 #include <unordered_map>
 
 namespace vespamalloc {
diff --git a/vespamalloc/src/vespamalloc/util/osmem.cpp b/vespamalloc/src/vespamalloc/util/osmem.cpp
index c61926c084b..e0cfbc36938 100644
--- a/vespamalloc/src/vespamalloc/util/osmem.cpp
+++ b/vespamalloc/src/vespamalloc/util/osmem.cpp
@@ -2,6 +2,7 @@
 #include "osmem.h"
 #include <vespamalloc/malloc/common.h>
 #include <cstdio>
+#include <cctype>
 #include <cassert>
 #include <cerrno>
 #include <cstdlib>
@@ -10,6 +11,7 @@
 #include <sys/statfs.h>
 #include <sys/mman.h>
 #include <linux/mman.h>
+#include <functional>
 
 namespace vespamalloc {