diff --git a/example/executor.cpp b/example/executor.cpp
index 2670c004..0ef02252 100644
--- a/example/executor.cpp
+++ b/example/executor.cpp
@@ -3,8 +3,17 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/config.hpp>
+#if ! defined  BOOST_NO_CXX11_DECLTYPE
+#define BOOST_RESULT_OF_USE_DECLTYPE
+#endif
+#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
+#endif
+
 #define BOOST_THREAD_VERSION 4
 #define BOOST_THREAD_PROVIDES_EXECUTORS
+//#define BOOST_THREAD_USES_LOG
 #define BOOST_THREAD_USES_LOG_THREAD_ID
 #define BOOST_THREAD_QUEUE_DEPRECATE_OLD
 
diff --git a/example/future_fallback_to.cpp b/example/future_fallback_to.cpp
index c2c228c3..e3944e47 100644
--- a/example/future_fallback_to.cpp
+++ b/example/future_fallback_to.cpp
@@ -3,13 +3,17 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_THREAD_VERSION 4
-//#define BOOST_THREAD_USES_LOG
-#define BOOST_THREAD_USES_LOG_THREAD_ID
 #include <boost/config.hpp>
 #ifndef BOOST_NO_CXX11_DECLTYPE_N3276
 #define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
 #endif
+#if ! defined  BOOST_NO_CXX11_DECLTYPE
+#define BOOST_RESULT_OF_USE_DECLTYPE
+#endif
+
+#define BOOST_THREAD_VERSION 4
+//#define BOOST_THREAD_USES_LOG
+#define BOOST_THREAD_USES_LOG_THREAD_ID
 
 #include <boost/thread/detail/log.hpp>
 #include <boost/thread/future.hpp>
diff --git a/example/future_then.cpp b/example/future_then.cpp
index fb4f7042..5402bce3 100644
--- a/example/future_then.cpp
+++ b/example/future_then.cpp
@@ -3,13 +3,18 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_THREAD_VERSION 4
-//#define BOOST_THREAD_USES_LOG
-#define BOOST_THREAD_USES_LOG_THREAD_ID
 #include <boost/config.hpp>
 #ifndef BOOST_NO_CXX11_DECLTYPE_N3276
 #define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
 #endif
+#if ! defined  BOOST_NO_CXX11_DECLTYPE
+#define BOOST_RESULT_OF_USE_DECLTYPE
+#endif
+
+
+#define BOOST_THREAD_VERSION 4
+//#define BOOST_THREAD_USES_LOG
+#define BOOST_THREAD_USES_LOG_THREAD_ID
 
 #include <boost/thread/detail/log.hpp>
 #include <boost/thread/future.hpp>
diff --git a/example/future_unwrap.cpp b/example/future_unwrap.cpp
index 3b7b2850..324ab318 100644
--- a/example/future_unwrap.cpp
+++ b/example/future_unwrap.cpp
@@ -3,13 +3,17 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_THREAD_VERSION 4
-//#define BOOST_THREAD_USES_LOG
-#define BOOST_THREAD_USES_LOG_THREAD_ID
 #include <boost/config.hpp>
 #ifndef BOOST_NO_CXX11_DECLTYPE_N3276
 #define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
 #endif
+#if ! defined  BOOST_NO_CXX11_DECLTYPE
+#define BOOST_RESULT_OF_USE_DECLTYPE
+#endif
+
+#define BOOST_THREAD_VERSION 4
+//#define BOOST_THREAD_USES_LOG
+#define BOOST_THREAD_USES_LOG_THREAD_ID
 
 #include <boost/thread/detail/log.hpp>
 #include <boost/thread/future.hpp>
diff --git a/example/future_when_all.cpp b/example/future_when_all.cpp
index 027385f2..913fd9ad 100644
--- a/example/future_when_all.cpp
+++ b/example/future_when_all.cpp
@@ -3,10 +3,19 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/config.hpp>
+
+#ifndef BOOST_NO_CXX11_DECLTYPE_N3276
+#define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
+#endif
+#if ! defined  BOOST_NO_CXX11_DECLTYPE
+#define BOOST_RESULT_OF_USE_DECLTYPE
+#endif
+
+
 #define BOOST_THREAD_VERSION 4
 #define BOOST_THREAD_USES_LOG
 #define BOOST_THREAD_USES_LOG_THREAD_ID
-#include <boost/config.hpp>
 
 #if ! defined BOOST_THREAD_PROVIDES_FUTURE_WHEN_ALL_WHEN_ANY \
  && ! defined BOOST_THREAD_DONT_PROVIDE_FUTURE_WHEN_ALL_WHEN_ANY
diff --git a/example/lambda_future.cpp b/example/lambda_future.cpp
index 49a3a18f..3d8684d2 100644
--- a/example/lambda_future.cpp
+++ b/example/lambda_future.cpp
@@ -8,14 +8,14 @@
 #if ! defined  BOOST_NO_CXX11_DECLTYPE
 #define BOOST_RESULT_OF_USE_DECLTYPE
 #endif
-#define BOOST_THREAD_VERSION 4
-//#define BOOST_THREAD_USES_LOG
-#define BOOST_THREAD_USES_LOG_THREAD_ID
-#include <boost/config.hpp>
 #ifndef BOOST_NO_CXX11_DECLTYPE_N3276
 #define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
 #endif
 
+#define BOOST_THREAD_VERSION 4
+//#define BOOST_THREAD_USES_LOG
+#define BOOST_THREAD_USES_LOG_THREAD_ID
+
 #include <boost/thread/detail/log.hpp>
 #include <boost/thread/future.hpp>
 #include <boost/assert.hpp>
diff --git a/example/make_future.cpp b/example/make_future.cpp
index 287102aa..afaa13f9 100644
--- a/example/make_future.cpp
+++ b/example/make_future.cpp
@@ -3,12 +3,15 @@
 //  Distributed under the Boost Software License, Version 1.0. (See accompanying
 //  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_THREAD_VERSION 4
-
 #include <boost/config.hpp>
 #ifndef BOOST_NO_CXX11_DECLTYPE_N3276
 #define BOOST_THREAD_NO_CXX11_DECLTYPE_N3276
 #endif
+#if ! defined  BOOST_NO_CXX11_DECLTYPE
+#define BOOST_RESULT_OF_USE_DECLTYPE
+#endif
+
+#define BOOST_THREAD_VERSION 4
 
 #include <boost/thread/future.hpp>
 #include <iostream>
diff --git a/test/sync/futures/async/async_pass.cpp b/test/sync/futures/async/async_pass.cpp
index a02c2437..529d2359 100644
--- a/test/sync/futures/async/async_pass.cpp
+++ b/test/sync/futures/async/async_pass.cpp
@@ -29,7 +29,10 @@
 //#define BOOST_THREAD_VERSION 3
 #define BOOST_THREAD_VERSION 4
 #define BOOST_THREAD_PROVIDES_EXECUTORS
-
+#include <boost/config.hpp>
+//#if ! defined  BOOST_NO_CXX11_DECLTYPE
+//#define BOOST_RESULT_OF_USE_DECLTYPE
+//#endif
 #include <iostream>
 #include <boost/thread/future.hpp>
 #include <boost/thread/thread.hpp>