diff --git a/include/boost/config/suffix.hpp b/include/boost/config/suffix.hpp
index 93b45cef..80628b86 100644
--- a/include/boost/config/suffix.hpp
+++ b/include/boost/config/suffix.hpp
@@ -207,6 +207,17 @@
 #  undef BOOST_HAS_THREADS
 #endif
 
+//
+// Turn threading detail macros off if we don't (want to) use threading
+//
+#ifndef BOOST_HAS_THREADS
+#  undef BOOST_HAS_PTHREADS
+#  undef BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
+#  undef BOOST_HAS_WINTHREADS
+#  undef BOOST_HAS_BETHREADS
+#  undef BOOST_HAS_MPTASKS
+#endif
+
 //
 // If the compiler claims to be C99 conformant, then it had better
 // have a <stdint.h>: