diff --git a/dbcon/mysql/ha_mcs_impl_if.h b/dbcon/mysql/ha_mcs_impl_if.h
index ee86eb2ff..3eefebf32 100644
--- a/dbcon/mysql/ha_mcs_impl_if.h
+++ b/dbcon/mysql/ha_mcs_impl_if.h
@@ -18,6 +18,7 @@
    MA 02110-1301, USA. */
 
 #pragma once
+#include <bitset>
 #include <string>
 #include <stdint.h>
 #ifdef _MSC_VER
diff --git a/storage-manager/src/MetadataFile.cpp b/storage-manager/src/MetadataFile.cpp
index e45c95173..820e7fe06 100644
--- a/storage-manager/src/MetadataFile.cpp
+++ b/storage-manager/src/MetadataFile.cpp
@@ -19,6 +19,7 @@
  * MetadataFile.cpp
  */
 #include "MetadataFile.h"
+#include <set>
 #include <boost/filesystem.hpp>
 #define BOOST_SPIRIT_THREADSAFE
 #include <boost/property_tree/ptree.hpp>
diff --git a/storage-manager/src/S3Storage.h b/storage-manager/src/S3Storage.h
index a26c4073c..6b6a911cc 100644
--- a/storage-manager/src/S3Storage.h
+++ b/storage-manager/src/S3Storage.h
@@ -17,6 +17,7 @@
 
 #pragma once
 
+#include <deque>
 #include <string>
 #include <map>
 #include "CloudStorage.h"
diff --git a/tools/passwd/secrets.cpp b/tools/passwd/secrets.cpp
index 045613981..a9a270c2f 100644
--- a/tools/passwd/secrets.cpp
+++ b/tools/passwd/secrets.cpp
@@ -12,6 +12,8 @@
  */
 #include "secrets.h"
 
+#include <array>
+#include <cstdint>
 #include <cctype>
 #include <fstream>
 #include <pwd.h>
diff --git a/utils/cloudio/SocketPool.h b/utils/cloudio/SocketPool.h
index c0fe807d2..0366feeff 100644
--- a/utils/cloudio/SocketPool.h
+++ b/utils/cloudio/SocketPool.h
@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include <deque>
+
 #include <boost/utility.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>