diff --git a/src/execution_context.cpp b/src/execution_context.cpp
index 409c170..f145405 100644
--- a/src/execution_context.cpp
+++ b/src/execution_context.cpp
@@ -4,12 +4,10 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/context/detail/config.hpp>
-
-#if ! defined(BOOST_CONTEXT_NO_CPP14)
-
 # include "boost/context/execution_context.hpp"
 
+#if ! defined(BOOST_CONTEXT_NO_CPP11)
+
 # include <boost/config.hpp>
 
 # ifdef BOOST_HAS_ABI_HEADERS
diff --git a/src/posix/stack_traits.cpp b/src/posix/stack_traits.cpp
index 686be57..6470396 100644
--- a/src/posix/stack_traits.cpp
+++ b/src/posix/stack_traits.cpp
@@ -20,7 +20,7 @@ extern "C" {
 
 #include <boost/assert.hpp>
 #include <boost/config.hpp>
-#if ! defined(BOOST_CONTEXT_NO_CPP14)
+#if ! defined(BOOST_CONTEXT_NO_CPP11)
 # include <mutex>
 #else
 # include <boost/thread.hpp>
@@ -49,7 +49,7 @@ void stacksize_limit_( rlimit * limit) BOOST_NOEXCEPT_OR_NOTHROW {
 
 std::size_t pagesize() BOOST_NOEXCEPT_OR_NOTHROW {
     static std::size_t size = 0;
-#if ! defined(BOOST_CONTEXT_NO_CPP14)
+#if ! defined(BOOST_CONTEXT_NO_CPP11)
     static std::once_flag flag;
     std::call_once( flag, pagesize_, & size);
 #else
@@ -61,7 +61,7 @@ std::size_t pagesize() BOOST_NOEXCEPT_OR_NOTHROW {
 
 rlimit stacksize_limit() BOOST_NOEXCEPT_OR_NOTHROW {
     static rlimit limit;
-#if ! defined(BOOST_CONTEXT_NO_CPP14)
+#if ! defined(BOOST_CONTEXT_NO_CPP11)
     static std::once_flag flag;
     std::call_once( flag, stacksize_limit_, & limit);
 #else
diff --git a/src/windows/stack_traits.cpp b/src/windows/stack_traits.cpp
index 8a463ad..1432ad2 100644
--- a/src/windows/stack_traits.cpp
+++ b/src/windows/stack_traits.cpp
@@ -20,7 +20,7 @@ extern "C" {
 
 #include <boost/assert.hpp>
 #include <boost/context/detail/config.hpp>
-#if ! defined(BOOST_CONTEXT_NO_CPP14)
+#if ! defined(BOOST_CONTEXT_NO_CPP11)
 # include <mutex>
 #else
 # include <boost/thread.hpp>
@@ -54,7 +54,7 @@ void system_info_( SYSTEM_INFO * si) BOOST_NOEXCEPT_OR_NOTHROW {
 
 SYSTEM_INFO system_info() BOOST_NOEXCEPT_OR_NOTHROW {
     static SYSTEM_INFO si;
-#if ! defined(BOOST_CONTEXT_NO_CPP14)
+#if ! defined(BOOST_CONTEXT_NO_CPP11)
     static std::once_flag flag;
     std::call_once( flag, static_cast< void(*)( SYSTEM_INFO *) >( system_info_), & si);
 #else