diff --git a/boost/fiber/detail/scheduler.hpp b/boost/fiber/detail/scheduler.hpp
index 12c025d1..42731eca 100644
--- a/boost/fiber/detail/scheduler.hpp
+++ b/boost/fiber/detail/scheduler.hpp
@@ -76,7 +76,6 @@ private:
     >                                           wqueue_t;
     typedef wqueue_t::index< f_tag_t >::type    f_idx_t;
     typedef wqueue_t::index< tp_tag_t >::type   tp_idx_t;
-
     typedef std::deque< fiber_base::ptr_t >     rqueue_t;
 
     fiber_base::ptr_t       active_fiber_;
diff --git a/libs/fiber/build/Jamfile.v2 b/libs/fiber/build/Jamfile.v2
index 3ec90514..007e91d8 100644
--- a/libs/fiber/build/Jamfile.v2
+++ b/libs/fiber/build/Jamfile.v2
@@ -13,7 +13,6 @@ project boost/fiber
     : requirements
       <library>/boost/chrono//boost_chrono
       <library>/boost/context//boost_context
-      <library>/boost/thread//boost_thread
       <link>static
       <threading>multi
     : source-location ../src
diff --git a/libs/fiber/examples/Jamfile.v2 b/libs/fiber/examples/Jamfile.v2
index 9b913a0e..a5d61fa0 100644
--- a/libs/fiber/examples/Jamfile.v2
+++ b/libs/fiber/examples/Jamfile.v2
@@ -12,7 +12,6 @@ project boost/fiber/example
       <library>../build//boost_fibers
       <library>/boost/context//boost_context
       <library>/boost/system//boost_system
-      <library>/boost/thread//boost_thread
       <link>static
       <threading>multi
     ;
diff --git a/libs/fiber/src/detail/scheduler.cpp b/libs/fiber/src/detail/scheduler.cpp
index c2f5420b..add8d71d 100644
--- a/libs/fiber/src/detail/scheduler.cpp
+++ b/libs/fiber/src/detail/scheduler.cpp
@@ -13,7 +13,6 @@
 #include <boost/assert.hpp>
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
-#include <boost/thread/tss.hpp>
 
 #include <boost/fiber/exceptions.hpp>
 
@@ -46,9 +45,14 @@ scheduler::~scheduler()
 scheduler &
 scheduler::instance()
 {
-	static thread_specific_ptr< scheduler > static_local;
-	if ( ! static_local.get() ) static_local.reset( new scheduler() );
-	return * static_local.get();
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__) || \
+    (defined(__ICC) && defined(BOOST_WINDOWS))
+	static __declspec(thread) scheduler * static_local = 0;
+#else
+	static __thread scheduler * static_local = 0;
+#endif
+	if ( ! static_local) static_local = new scheduler();
+	return * static_local;
 }
 
 void