diff --git a/include/boost/fiber/condition_variable.hpp b/include/boost/fiber/condition_variable.hpp
index 47665da2..628680e3 100644
--- a/include/boost/fiber/condition_variable.hpp
+++ b/include/boost/fiber/condition_variable.hpp
@@ -10,7 +10,6 @@
 #include <algorithm>
 #include <atomic>
 #include <chrono>
-#include <condition_variable>
 #include <functional>
 #include <mutex>
 
diff --git a/src/barrier.cpp b/src/barrier.cpp
index 2c0879b1..e6deed87 100644
--- a/src/barrier.cpp
+++ b/src/barrier.cpp
@@ -6,6 +6,7 @@
 
 #include "boost/fiber/barrier.hpp"
 
+#include <mutex>
 #include <system_error>
 
 #include "boost/fiber/exceptions.hpp"
diff --git a/src/context.cpp b/src/context.cpp
index 21a018a4..b33c0e70 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -7,6 +7,7 @@
 #include "boost/fiber/context.hpp"
 
 #include <cstdlib>
+#include <mutex>
 #include <new>
 
 #include "boost/fiber/exceptions.hpp"
diff --git a/test/test_condition_mt.cpp b/test/test_condition_mt.cpp
index 34c3066b..3b86cf6b 100644
--- a/test/test_condition_mt.cpp
+++ b/test/test_condition_mt.cpp
@@ -6,10 +6,11 @@
 //
 // This test is based on the tests of Boost.Thread 
 
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <iostream>
 #include <map>
+#include <mutex>
 #include <stdexcept>
 #include <vector>
 
diff --git a/test/test_condition_variable.cpp b/test/test_condition_variable.cpp
index 5bcd110b..ee72f5a9 100644
--- a/test/test_condition_variable.cpp
+++ b/test/test_condition_variable.cpp
@@ -7,10 +7,11 @@
 // This test is based on the tests of Boost.Thread 
 
 #include <chrono>
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <iostream>
 #include <map>
+#include <mutex>
 #include <stdexcept>
 #include <vector>
 
diff --git a/test/test_fiber.cpp b/test/test_fiber.cpp
index 8929358d..29a3f65b 100644
--- a/test/test_fiber.cpp
+++ b/test/test_fiber.cpp
@@ -7,6 +7,7 @@
 // This test is based on the tests of Boost.Thread
 
 #include <chrono>
+#include <mutex>
 #include <sstream>
 #include <string>
 
diff --git a/test/test_fss.cpp b/test/test_fss.cpp
index 561b72b2..14a61cca 100644
--- a/test/test_fss.cpp
+++ b/test/test_fss.cpp
@@ -6,6 +6,7 @@
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <iostream>
+#include <mutex>
 
 #include <boost/test/unit_test.hpp>