Index: recursive_mutex.hpp
===================================================================
--- recursive_mutex.hpp	(revision 58325)
+++ recursive_mutex.hpp	(working copy)
@@ -11,7 +11,7 @@
 
 
 #include <boost/utility.hpp>
-#include "basic_recursive_mutex.hpp"
+#include <boost/thread/win32/basic_recursive_mutex.hpp>
 #include <boost/thread/exceptions.hpp>
 #include <boost/thread/locks.hpp>
 
Index: basic_recursive_mutex.hpp
===================================================================
--- basic_recursive_mutex.hpp	(revision 58325)
+++ basic_recursive_mutex.hpp	(working copy)
@@ -9,8 +9,8 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include "thread_primitives.hpp"
-#include "basic_timed_mutex.hpp"
+#include <boost/thread/win32/thread_primitives.hpp>
+#include <boost/thread/win32/basic_timed_mutex.hpp>
 
 #include <boost/config/abi_prefix.hpp>
 
Index: condition_variable.hpp
===================================================================
--- condition_variable.hpp	(revision 58325)
+++ condition_variable.hpp	(working copy)
@@ -6,13 +6,13 @@
 // (C) Copyright 2007-8 Anthony Williams
 
 #include <boost/thread/mutex.hpp>
-#include "thread_primitives.hpp"
+#include <boost/thread/win32/thread_primitives.hpp>
 #include <limits.h>
 #include <boost/assert.hpp>
 #include <algorithm>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/thread_time.hpp>
-#include "interlocked_read.hpp"
+#include <boost/thread/win32/interlocked_read.hpp>
 #include <boost/thread/xtime.hpp>
 #include <vector>
 #include <boost/intrusive_ptr.hpp>
Index: thread_heap_alloc.hpp
===================================================================
--- thread_heap_alloc.hpp	(revision 58325)
+++ thread_heap_alloc.hpp	(working copy)
@@ -5,7 +5,7 @@
 #ifndef THREAD_HEAP_ALLOC_HPP
 #define THREAD_HEAP_ALLOC_HPP
 #include <new>
-#include "thread_primitives.hpp"
+#include <boost/thread/win32/thread_primitives.hpp>
 #include <stdexcept>
 #include <boost/assert.hpp>
 #include <boost/throw_exception.hpp>
Index: thread_data.hpp
===================================================================
--- thread_data.hpp	(revision 58325)
+++ thread_data.hpp	(working copy)
@@ -1,5 +1,5 @@
-#ifndef BOOST_THREAD_PTHREAD_THREAD_DATA_HPP
-#define BOOST_THREAD_PTHREAD_THREAD_DATA_HPP
+#ifndef BOOST_THREAD_WIN32_THREAD_DATA_HPP
+#define BOOST_THREAD_WIN32_THREAD_DATA_HPP
 // 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)
@@ -8,8 +8,8 @@
 #include <boost/thread/detail/config.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/thread/thread_time.hpp>
-#include "thread_primitives.hpp"
-#include "thread_heap_alloc.hpp"
+#include <boost/thread/win32/thread_primitives.hpp>
+#include <boost/thread/win32/thread_heap_alloc.hpp>
 
 #include <boost/config/abi_prefix.hpp>
 
Index: mutex.hpp
===================================================================
--- mutex.hpp	(revision 58325)
+++ mutex.hpp	(working copy)
@@ -5,7 +5,7 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include "basic_timed_mutex.hpp"
+#include <boost/thread/win32/basic_timed_mutex.hpp>
 #include <boost/utility.hpp>
 #include <boost/thread/exceptions.hpp>
 #include <boost/thread/locks.hpp>
Index: basic_timed_mutex.hpp
===================================================================
--- basic_timed_mutex.hpp	(revision 58325)
+++ basic_timed_mutex.hpp	(working copy)
@@ -10,8 +10,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/assert.hpp>
-#include "thread_primitives.hpp"
-#include "interlocked_read.hpp"
+#include <boost/thread/win32/thread_primitives.hpp>
+#include <boost/thread/win32/interlocked_read.hpp>
 #include <boost/thread/thread_time.hpp>
 #include <boost/thread/xtime.hpp>
 #include <boost/detail/interlocked.hpp>