diff --git a/example/executor.cpp b/example/executor.cpp
index cb8fccc95..7f6b1ce3e 100644
--- a/example/executor.cpp
+++ b/example/executor.cpp
@@ -7,9 +7,6 @@
 #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
diff --git a/example/future_fallback_to.cpp b/example/future_fallback_to.cpp
index c148b7c1c..d1a3c52fd 100644
--- a/example/future_fallback_to.cpp
+++ b/example/future_fallback_to.cpp
@@ -4,9 +4,6 @@
 //  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
diff --git a/example/future_then.cpp b/example/future_then.cpp
index f8bdcc0a5..86ee1970c 100644
--- a/example/future_then.cpp
+++ b/example/future_then.cpp
@@ -4,9 +4,6 @@
 //  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
diff --git a/example/future_unwrap.cpp b/example/future_unwrap.cpp
index f49b98d59..017ffaf09 100644
--- a/example/future_unwrap.cpp
+++ b/example/future_unwrap.cpp
@@ -4,9 +4,6 @@
 //  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
diff --git a/example/future_when_all.cpp b/example/future_when_all.cpp
index c6962ead5..b467acb00 100644
--- a/example/future_when_all.cpp
+++ b/example/future_when_all.cpp
@@ -5,9 +5,6 @@
 
 #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
diff --git a/example/generic_executor_ref.cpp b/example/generic_executor_ref.cpp
index 15b3b948c..5797b7353 100644
--- a/example/generic_executor_ref.cpp
+++ b/example/generic_executor_ref.cpp
@@ -7,9 +7,6 @@
 #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
diff --git a/example/lambda_future.cpp b/example/lambda_future.cpp
index 2f77bca4a..6df1cee7f 100644
--- a/example/lambda_future.cpp
+++ b/example/lambda_future.cpp
@@ -8,9 +8,6 @@
 #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_USES_LOG
diff --git a/example/parallel_accumulate.cpp b/example/parallel_accumulate.cpp
index 55d4d9e41..15dcbb8d5 100644
--- a/example/parallel_accumulate.cpp
+++ b/example/parallel_accumulate.cpp
@@ -7,12 +7,9 @@
 #define BOOST_THREAD_PROVIDES_EXECUTORS
 #define BOOST_THREAD_USES_LOG_THREAD_ID
 #define BOOST_THREAD_QUEUE_DEPRECATE_OLD
-//#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
+#if ! defined  BOOST_NO_CXX11_DECLTYPE
+#define BOOST_RESULT_OF_USE_DECLTYPE
+#endif
 
 #include <boost/thread/executors/basic_thread_pool.hpp>
 #include <boost/thread/future.hpp>
diff --git a/example/parallel_quick_sort.cpp b/example/parallel_quick_sort.cpp
index 8fce29ff0..4332a5906 100644
--- a/example/parallel_quick_sort.cpp
+++ b/example/parallel_quick_sort.cpp
@@ -7,12 +7,9 @@
 #define BOOST_THREAD_PROVIDES_EXECUTORS
 #define BOOST_THREAD_USES_LOG_THREAD_ID
 #define BOOST_THREAD_QUEUE_DEPRECATE_OLD
-//#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
+#if ! defined  BOOST_NO_CXX11_DECLTYPE
+#define BOOST_RESULT_OF_USE_DECLTYPE
+#endif
 
 #include <boost/thread/executors/basic_thread_pool.hpp>
 #include <boost/thread/future.hpp>
diff --git a/include/boost/thread/detail/config.hpp b/include/boost/thread/detail/config.hpp
index 3bfc931d2..475dadbaa 100644
--- a/include/boost/thread/detail/config.hpp
+++ b/include/boost/thread/detail/config.hpp
@@ -239,7 +239,6 @@
     ! defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && \
     ! defined(BOOST_NO_CXX11_DECLTYPE) && \
     ! defined(BOOST_NO_CXX11_DECLTYPE_N3276) && \
-    ! defined(BOOST_THREAD_NO_CXX11_DECLTYPE_N3276) && \
     ! defined(BOOST_NO_CXX11_TRAILING_RESULT_TYPES) && \
     ! defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && \
     ! defined(BOOST_NO_CXX11_HDR_TUPLE)
diff --git a/include/boost/thread/detail/invoke.hpp b/include/boost/thread/detail/invoke.hpp
index c81f50fba..e772da29e 100644
--- a/include/boost/thread/detail/invoke.hpp
+++ b/include/boost/thread/detail/invoke.hpp
@@ -47,7 +47,6 @@ namespace boost
 #if ! defined(BOOST_NO_SFINAE_EXPR) && \
     ! defined(BOOST_NO_CXX11_DECLTYPE) && \
     ! defined(BOOST_NO_CXX11_DECLTYPE_N3276) && \
-    ! defined(BOOST_THREAD_NO_CXX11_DECLTYPE_N3276) && \
     ! defined(BOOST_NO_CXX11_TRAILING_RESULT_TYPES)
 
 #define BOOST_THREAD_PROVIDES_INVOKE
@@ -339,7 +338,6 @@ namespace boost
     ! defined BOOST_NO_CXX11_HDR_FUNCTIONAL && \
     defined  BOOST_MSVC
 
-//#error
     template <class Ret, class Fp>
     inline
     Ret invoke(BOOST_THREAD_RV_REF(Fp) f)
diff --git a/test/sync/futures/when_all/iterators_pass.cpp b/test/sync/futures/when_all/iterators_pass.cpp
index 16c44ffad..2316a8d19 100644
--- a/test/sync/futures/when_all/iterators_pass.cpp
+++ b/test/sync/futures/when_all/iterators_pass.cpp
@@ -20,9 +20,6 @@
 
 #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
diff --git a/test/sync/futures/when_all/none_pass.cpp b/test/sync/futures/when_all/none_pass.cpp
index 6ca36f518..613e2368d 100755
--- a/test/sync/futures/when_all/none_pass.cpp
+++ b/test/sync/futures/when_all/none_pass.cpp
@@ -18,9 +18,6 @@
 
 #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
diff --git a/test/sync/futures/when_all/one_pass.cpp b/test/sync/futures/when_all/one_pass.cpp
index 9f780e70b..437d3ea53 100644
--- a/test/sync/futures/when_all/one_pass.cpp
+++ b/test/sync/futures/when_all/one_pass.cpp
@@ -19,9 +19,6 @@
 
 #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
diff --git a/test/sync/futures/when_all/variadic_pass.cpp b/test/sync/futures/when_all/variadic_pass.cpp
index 441f09773..c406b04b4 100644
--- a/test/sync/futures/when_all/variadic_pass.cpp
+++ b/test/sync/futures/when_all/variadic_pass.cpp
@@ -19,9 +19,6 @@
 
 #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
diff --git a/test/sync/futures/when_any/iterators_pass.cpp b/test/sync/futures/when_any/iterators_pass.cpp
index 39319067e..21e2a0efd 100644
--- a/test/sync/futures/when_any/iterators_pass.cpp
+++ b/test/sync/futures/when_any/iterators_pass.cpp
@@ -20,9 +20,6 @@
 
 #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
diff --git a/test/sync/futures/when_any/none_pass.cpp b/test/sync/futures/when_any/none_pass.cpp
index c869f5a9f..2edd0bc6d 100755
--- a/test/sync/futures/when_any/none_pass.cpp
+++ b/test/sync/futures/when_any/none_pass.cpp
@@ -18,9 +18,6 @@
 
 #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
diff --git a/test/sync/futures/when_any/one_pass.cpp b/test/sync/futures/when_any/one_pass.cpp
index a048ba166..50f5dab56 100644
--- a/test/sync/futures/when_any/one_pass.cpp
+++ b/test/sync/futures/when_any/one_pass.cpp
@@ -18,9 +18,6 @@
 
 #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