diff --git a/include/boost/system/detail/error_code.ipp b/include/boost/system/detail/error_code.ipp
index 99d0892..35481f5 100644
--- a/include/boost/system/detail/error_code.ipp
+++ b/include/boost/system/detail/error_code.ipp
@@ -21,9 +21,9 @@
 #include <cstring> // for strerror/strerror_r
 
 # if defined( BOOST_WINDOWS_API )
-#   include <boost/detail/winapi/error_codes.hpp>
-#   include <boost/detail/winapi/error_handling.hpp>
-#   include <boost/detail/winapi/character_code_conversion.hpp>
+#   include <boost/winapi/error_codes.hpp>
+#   include <boost/winapi/error_handling.hpp>
+#   include <boost/winapi/character_code_conversion.hpp>
 #   if !BOOST_PLAT_WINDOWS_RUNTIME
 #     include <boost/system/detail/local_free_on_destruction.hpp>
 #   endif
@@ -186,7 +186,7 @@ namespace
 
 # if defined(BOOST_WINDOWS_API)
 
-    using namespace boost::detail::winapi; // for error codes
+    using namespace boost::winapi; // for error codes
 
 # endif
 
@@ -382,13 +382,13 @@ namespace
     std::wstring buf(128, wchar_t());
     for (;;)
     {
-        boost::detail::winapi::DWORD_ retval = boost::detail::winapi::FormatMessageW(
-            boost::detail::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ |
-            boost::detail::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_,
+        boost::winapi::DWORD_ retval = boost::winapi::FormatMessageW(
+            boost::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ |
+            boost::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_,
             NULL,
             ev,
-            boost::detail::winapi::MAKELANGID_(boost::detail::winapi::LANG_NEUTRAL_,
-            boost::detail::winapi::SUBLANG_DEFAULT_), // Default language
+            boost::winapi::MAKELANGID_(boost::winapi::LANG_NEUTRAL_,
+            boost::winapi::SUBLANG_DEFAULT_), // Default language
             &buf[0],
             static_cast<DWORD>(buf.size()),
             NULL
@@ -399,8 +399,8 @@ namespace
             buf.resize(retval);
             break;
         }
-        else if (boost::detail::winapi::GetLastError() !=
-          boost::detail::winapi::ERROR_INSUFFICIENT_BUFFER_)
+        else if (boost::winapi::GetLastError() !=
+          boost::winapi::ERROR_INSUFFICIENT_BUFFER_)
         {
             return std::string("Unknown error");
         }
@@ -411,9 +411,9 @@ namespace
     }
     
     int num_chars = (buf.size() + 1) * 2;
-    boost::detail::winapi::LPSTR_ narrow_buffer =
-      (boost::detail::winapi::LPSTR_)_alloca(num_chars);
-    if (boost::detail::winapi::WideCharToMultiByte(boost::detail::winapi::CP_ACP_, 0,
+    boost::winapi::LPSTR_ narrow_buffer =
+      (boost::winapi::LPSTR_)_alloca(num_chars);
+    if (boost::winapi::WideCharToMultiByte(boost::winapi::CP_ACP_, 0,
       buf.c_str(), -1, narrow_buffer, num_chars, NULL, NULL) == 0)
     {
         return std::string("Unknown error");
@@ -421,16 +421,16 @@ namespace
 
     std::string str( narrow_buffer );
 #else
-    boost::detail::winapi::LPVOID_ lpMsgBuf = 0;
-    boost::detail::winapi::DWORD_ retval = boost::detail::winapi::FormatMessageA(
-        boost::detail::winapi::FORMAT_MESSAGE_ALLOCATE_BUFFER_ |
-        boost::detail::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ |
-        boost::detail::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_,
+    boost::winapi::LPVOID_ lpMsgBuf = 0;
+    boost::winapi::DWORD_ retval = boost::winapi::FormatMessageA(
+        boost::winapi::FORMAT_MESSAGE_ALLOCATE_BUFFER_ |
+        boost::winapi::FORMAT_MESSAGE_FROM_SYSTEM_ |
+        boost::winapi::FORMAT_MESSAGE_IGNORE_INSERTS_,
         NULL,
         ev,
-        boost::detail::winapi::MAKELANGID_(boost::detail::winapi::LANG_NEUTRAL_,
-        boost::detail::winapi::SUBLANG_DEFAULT_), // Default language
-        (boost::detail::winapi::LPSTR_) &lpMsgBuf,
+        boost::winapi::MAKELANGID_(boost::winapi::LANG_NEUTRAL_,
+        boost::winapi::SUBLANG_DEFAULT_), // Default language
+        (boost::winapi::LPSTR_) &lpMsgBuf,
         0,
         NULL
     );
@@ -438,7 +438,7 @@ namespace
     if (retval == 0)
         return std::string("Unknown error");
 
-    std::string str(static_cast<boost::detail::winapi::LPCSTR_>(lpMsgBuf));
+    std::string str(static_cast<boost::winapi::LPCSTR_>(lpMsgBuf));
 # endif
     while ( str.size()
       && (str[str.size()-1] == '\n' || str[str.size()-1] == '\r') )
diff --git a/include/boost/system/detail/local_free_on_destruction.hpp b/include/boost/system/detail/local_free_on_destruction.hpp
index 25f879b..9016e74 100644
--- a/include/boost/system/detail/local_free_on_destruction.hpp
+++ b/include/boost/system/detail/local_free_on_destruction.hpp
@@ -12,7 +12,7 @@
 #ifndef BOOST_SYSTEM_LOCAL_FREE_ON_EXIT_HPP
 #define BOOST_SYSTEM_LOCAL_FREE_ON_EXIT_HPP
 
-#include <boost/detail/winapi/local_memory.hpp>
+#include <boost/winapi/local_memory.hpp>
 
 namespace boost {
 namespace system {
@@ -26,7 +26,7 @@ public:
 
   ~local_free_on_destruction()
   {
-    boost::detail::winapi::LocalFree(p_);
+    boost::winapi::LocalFree(p_);
   }
 
 private:
diff --git a/include/boost/system/windows_error.hpp b/include/boost/system/windows_error.hpp
index c6e0aad..983436f 100644
--- a/include/boost/system/windows_error.hpp
+++ b/include/boost/system/windows_error.hpp
@@ -28,7 +28,7 @@
 //#include <winerror.h>
 //#endif
 
-#include <boost/detail/winapi/error_codes.hpp>
+#include <boost/winapi/error_codes.hpp>
 
 namespace boost
 {
@@ -47,59 +47,59 @@ namespace boost
       {
         success = 0,
         // These names and values are based on Windows winerror.h
-        invalid_function = boost::detail::winapi::ERROR_INVALID_FUNCTION_,
-        file_not_found = boost::detail::winapi::ERROR_FILE_NOT_FOUND_,
-        path_not_found = boost::detail::winapi::ERROR_PATH_NOT_FOUND_,
-        too_many_open_files = boost::detail::winapi::ERROR_TOO_MANY_OPEN_FILES_,
-        access_denied = boost::detail::winapi::ERROR_ACCESS_DENIED_,
-        invalid_handle = boost::detail::winapi::ERROR_INVALID_HANDLE_,
-        arena_trashed = boost::detail::winapi::ERROR_ARENA_TRASHED_,
-        not_enough_memory = boost::detail::winapi::ERROR_NOT_ENOUGH_MEMORY_,
-        invalid_block = boost::detail::winapi::ERROR_INVALID_BLOCK_,
-        bad_environment = boost::detail::winapi::ERROR_BAD_ENVIRONMENT_,
-        bad_format = boost::detail::winapi::ERROR_BAD_FORMAT_,
-        invalid_access = boost::detail::winapi::ERROR_INVALID_ACCESS_,
-        outofmemory = boost::detail::winapi::ERROR_OUTOFMEMORY_,
-        invalid_drive = boost::detail::winapi::ERROR_INVALID_DRIVE_,
-        current_directory = boost::detail::winapi::ERROR_CURRENT_DIRECTORY_,
-        not_same_device = boost::detail::winapi::ERROR_NOT_SAME_DEVICE_,
-        no_more_files = boost::detail::winapi::ERROR_NO_MORE_FILES_,
-        write_protect = boost::detail::winapi::ERROR_WRITE_PROTECT_,
-        bad_unit = boost::detail::winapi::ERROR_BAD_UNIT_,
-        not_ready = boost::detail::winapi::ERROR_NOT_READY_,
-        bad_command = boost::detail::winapi::ERROR_BAD_COMMAND_,
-        crc = boost::detail::winapi::ERROR_CRC_,
-        bad_length = boost::detail::winapi::ERROR_BAD_LENGTH_,
-        seek = boost::detail::winapi::ERROR_SEEK_,
-        not_dos_disk = boost::detail::winapi::ERROR_NOT_DOS_DISK_,
-        sector_not_found = boost::detail::winapi::ERROR_SECTOR_NOT_FOUND_,
-        out_of_paper = boost::detail::winapi::ERROR_OUT_OF_PAPER_,
-        write_fault = boost::detail::winapi::ERROR_WRITE_FAULT_,
-        read_fault = boost::detail::winapi::ERROR_READ_FAULT_,
-        gen_failure = boost::detail::winapi::ERROR_GEN_FAILURE_,
-        sharing_violation = boost::detail::winapi::ERROR_SHARING_VIOLATION_,
-        lock_violation = boost::detail::winapi::ERROR_LOCK_VIOLATION_,
-        wrong_disk = boost::detail::winapi::ERROR_WRONG_DISK_,
-        sharing_buffer_exceeded = boost::detail::winapi::ERROR_SHARING_BUFFER_EXCEEDED_,
-        handle_eof = boost::detail::winapi::ERROR_HANDLE_EOF_,
-        handle_disk_full= boost::detail::winapi::ERROR_HANDLE_DISK_FULL_,
-        rem_not_list = boost::detail::winapi::ERROR_REM_NOT_LIST_,
-        dup_name = boost::detail::winapi::ERROR_DUP_NAME_,
-        bad_net_path = boost::detail::winapi::ERROR_BAD_NETPATH_,
-        network_busy = boost::detail::winapi::ERROR_NETWORK_BUSY_,
+        invalid_function = boost::winapi::ERROR_INVALID_FUNCTION_,
+        file_not_found = boost::winapi::ERROR_FILE_NOT_FOUND_,
+        path_not_found = boost::winapi::ERROR_PATH_NOT_FOUND_,
+        too_many_open_files = boost::winapi::ERROR_TOO_MANY_OPEN_FILES_,
+        access_denied = boost::winapi::ERROR_ACCESS_DENIED_,
+        invalid_handle = boost::winapi::ERROR_INVALID_HANDLE_,
+        arena_trashed = boost::winapi::ERROR_ARENA_TRASHED_,
+        not_enough_memory = boost::winapi::ERROR_NOT_ENOUGH_MEMORY_,
+        invalid_block = boost::winapi::ERROR_INVALID_BLOCK_,
+        bad_environment = boost::winapi::ERROR_BAD_ENVIRONMENT_,
+        bad_format = boost::winapi::ERROR_BAD_FORMAT_,
+        invalid_access = boost::winapi::ERROR_INVALID_ACCESS_,
+        outofmemory = boost::winapi::ERROR_OUTOFMEMORY_,
+        invalid_drive = boost::winapi::ERROR_INVALID_DRIVE_,
+        current_directory = boost::winapi::ERROR_CURRENT_DIRECTORY_,
+        not_same_device = boost::winapi::ERROR_NOT_SAME_DEVICE_,
+        no_more_files = boost::winapi::ERROR_NO_MORE_FILES_,
+        write_protect = boost::winapi::ERROR_WRITE_PROTECT_,
+        bad_unit = boost::winapi::ERROR_BAD_UNIT_,
+        not_ready = boost::winapi::ERROR_NOT_READY_,
+        bad_command = boost::winapi::ERROR_BAD_COMMAND_,
+        crc = boost::winapi::ERROR_CRC_,
+        bad_length = boost::winapi::ERROR_BAD_LENGTH_,
+        seek = boost::winapi::ERROR_SEEK_,
+        not_dos_disk = boost::winapi::ERROR_NOT_DOS_DISK_,
+        sector_not_found = boost::winapi::ERROR_SECTOR_NOT_FOUND_,
+        out_of_paper = boost::winapi::ERROR_OUT_OF_PAPER_,
+        write_fault = boost::winapi::ERROR_WRITE_FAULT_,
+        read_fault = boost::winapi::ERROR_READ_FAULT_,
+        gen_failure = boost::winapi::ERROR_GEN_FAILURE_,
+        sharing_violation = boost::winapi::ERROR_SHARING_VIOLATION_,
+        lock_violation = boost::winapi::ERROR_LOCK_VIOLATION_,
+        wrong_disk = boost::winapi::ERROR_WRONG_DISK_,
+        sharing_buffer_exceeded = boost::winapi::ERROR_SHARING_BUFFER_EXCEEDED_,
+        handle_eof = boost::winapi::ERROR_HANDLE_EOF_,
+        handle_disk_full= boost::winapi::ERROR_HANDLE_DISK_FULL_,
+        rem_not_list = boost::winapi::ERROR_REM_NOT_LIST_,
+        dup_name = boost::winapi::ERROR_DUP_NAME_,
+        bad_net_path = boost::winapi::ERROR_BAD_NETPATH_,
+        network_busy = boost::winapi::ERROR_NETWORK_BUSY_,
         // ...
-        file_exists = boost::detail::winapi::ERROR_FILE_EXISTS_,
-        cannot_make = boost::detail::winapi::ERROR_CANNOT_MAKE_,
+        file_exists = boost::winapi::ERROR_FILE_EXISTS_,
+        cannot_make = boost::winapi::ERROR_CANNOT_MAKE_,
         // ...
-        broken_pipe = boost::detail::winapi::ERROR_BROKEN_PIPE_,
-        open_failed = boost::detail::winapi::ERROR_OPEN_FAILED_,
-        buffer_overflow = boost::detail::winapi::ERROR_BUFFER_OVERFLOW_,
-        disk_full= boost::detail::winapi::ERROR_DISK_FULL_,
+        broken_pipe = boost::winapi::ERROR_BROKEN_PIPE_,
+        open_failed = boost::winapi::ERROR_OPEN_FAILED_,
+        buffer_overflow = boost::winapi::ERROR_BUFFER_OVERFLOW_,
+        disk_full= boost::winapi::ERROR_DISK_FULL_,
         // ...
-        lock_failed = boost::detail::winapi::ERROR_LOCK_FAILED_,
-        busy = boost::detail::winapi::ERROR_BUSY_,
-        cancel_violation = boost::detail::winapi::ERROR_CANCEL_VIOLATION_,
-        already_exists = boost::detail::winapi::ERROR_ALREADY_EXISTS_
+        lock_failed = boost::winapi::ERROR_LOCK_FAILED_,
+        busy = boost::winapi::ERROR_BUSY_,
+        cancel_violation = boost::winapi::ERROR_CANCEL_VIOLATION_,
+        already_exists = boost::winapi::ERROR_ALREADY_EXISTS_
         // ...
 
         // TODO: add more Windows errors