diff --git a/include/boost/cerrno.hpp b/include/boost/cerrno.hpp
index 6f26698..57278f5 100644
--- a/include/boost/cerrno.hpp
+++ b/include/boost/cerrno.hpp
@@ -7,8 +7,8 @@
 
 //  See library home page at http://www.boost.org/libs/system
 
-#ifndef BOOST_CERRNO_HPP
-#define BOOST_CERRNO_HPP
+#ifndef BOOST_SYSTEM_CERRNO_HPP
+#define BOOST_SYSTEM_CERRNO_HPP
 
 #include <cerrno>
 
diff --git a/include/boost/system/cygwin_error.hpp b/include/boost/system/cygwin_error.hpp
index ea3528b..4f91cf3 100644
--- a/include/boost/system/cygwin_error.hpp
+++ b/include/boost/system/cygwin_error.hpp
@@ -7,8 +7,8 @@
 
 //  See library home page at http://www.boost.org/libs/system
 
-#ifndef BOOST_CYGWIN_ERROR_HPP
-#define BOOST_CYGWIN_ERROR_HPP
+#ifndef BOOST_SYSTEM_CYGWIN_ERROR_HPP
+#define BOOST_SYSTEM_CYGWIN_ERROR_HPP
 
 //  This header is effectively empty for compiles on operating systems where
 //  it is not applicable.
@@ -53,4 +53,4 @@ namespace boost
 
 #endif  // __CYGWIN__
 
-#endif  // BOOST_CYGWIN_ERROR_HPP
+#endif  // BOOST_SYSTEM_CYGWIN_ERROR_HPP
diff --git a/include/boost/system/error_code.hpp b/include/boost/system/error_code.hpp
index d419f37..b6ff6e4 100644
--- a/include/boost/system/error_code.hpp
+++ b/include/boost/system/error_code.hpp
@@ -8,8 +8,8 @@
 
 //  See library home page at http://www.boost.org/libs/system
 
-#ifndef BOOST_ERROR_CODE_HPP
-#define BOOST_ERROR_CODE_HPP
+#ifndef BOOST_SYSTEM_ERROR_CODE_HPP
+#define BOOST_SYSTEM_ERROR_CODE_HPP
 
 #include <boost/system/config.hpp>
 #include <boost/cstdint.hpp>
@@ -39,8 +39,9 @@ namespace boost
   namespace system
   {
 
-    class error_code;
-    class error_condition;
+    class error_code;         // values defined by the operating system
+    class error_condition;    // portable generic values defined below, but ultimately
+                              // based on the POSIX standard
 
     //  "Concept" helpers  ---------------------------------------------------//
 
@@ -218,9 +219,9 @@ namespace boost
     inline const error_category &  get_system_category() { return system_category(); }
     inline const error_category &  get_generic_category() { return generic_category(); }
     inline const error_category &  get_posix_category() { return generic_category(); }
-    static const error_category &  posix_category = generic_category();
-    static const error_category &  errno_ecat     = generic_category();
-    static const error_category &  native_ecat    = system_category();
+    static const error_category &  posix_category BOOST_ATTRIBUTE_UNUSED = generic_category();
+    static const error_category &  errno_ecat     BOOST_ATTRIBUTE_UNUSED = generic_category();
+    static const error_category &  native_ecat    BOOST_ATTRIBUTE_UNUSED = system_category();
 # endif
 
     //  class error_condition  -----------------------------------------------//
@@ -515,6 +516,6 @@ namespace boost
 #   include <boost/system/detail/error_code.ipp>
 # endif
 
-#endif // BOOST_ERROR_CODE_HPP
+#endif // BOOST_SYSTEM_ERROR_CODE_HPP
 
 
diff --git a/include/boost/system/linux_error.hpp b/include/boost/system/linux_error.hpp
index 0eb22bf..0873a7c 100644
--- a/include/boost/system/linux_error.hpp
+++ b/include/boost/system/linux_error.hpp
@@ -7,8 +7,8 @@
 
 //  See library home page at http://www.boost.org/libs/system
 
-#ifndef BOOST_LINUX_ERROR_HPP
-#define BOOST_LINUX_ERROR_HPP
+#ifndef BOOST_SYSTEM_LINUX_ERROR_HPP
+#define BOOST_SYSTEM_LINUX_ERROR_HPP
 
 //  This header is effectively empty for compiles on operating systems where
 //  it is not applicable.
@@ -107,4 +107,4 @@ namespace boost
 
 #endif  // Linux
 
-#endif  // BOOST_LINUX_ERROR_HPP
+#endif  // BOOST_SYSTEM_LINUX_ERROR_HPP
diff --git a/include/boost/system/system_error.hpp b/include/boost/system/system_error.hpp
index b306aae..d98b4bc 100644
--- a/include/boost/system/system_error.hpp
+++ b/include/boost/system/system_error.hpp
@@ -5,8 +5,8 @@
 //  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)
 
-#ifndef BOOST_SYSTEM_ERROR_HPP
-#define BOOST_SYSTEM_ERROR_HPP
+#ifndef BOOST_SYSTEM_SYSTEM_ERROR_HPP
+#define BOOST_SYSTEM_SYSTEM_ERROR_HPP
 
 #include <string>
 #include <stdexcept>
@@ -79,6 +79,6 @@ namespace boost
   } // namespace system
 } // namespace boost
 
-#endif // BOOST_SYSTEM_ERROR_HPP
+#endif // BOOST_SYSTEM_SYSTEM_ERROR_HPP
 
 
diff --git a/include/boost/system/windows_error.hpp b/include/boost/system/windows_error.hpp
index 9d9d206..38d6284 100644
--- a/include/boost/system/windows_error.hpp
+++ b/include/boost/system/windows_error.hpp
@@ -7,8 +7,8 @@
 
 //  See library home page at http://www.boost.org/libs/system
 
-#ifndef BOOST_WINDOWS_ERROR_HPP
-#define BOOST_WINDOWS_ERROR_HPP
+#ifndef BOOST_SYSTEM_WINDOWS_ERROR_HPP
+#define BOOST_SYSTEM_WINDOWS_ERROR_HPP
 
 //  This header is effectively empty for compiles on operating systems where
 //  it is not applicable.
@@ -123,4 +123,4 @@ namespace boost
 
 #endif  // BOOST_WINDOWS_API
 
-#endif  // BOOST_WINDOWS_ERROR_HPP
+#endif  // BOOST_SYSTEM_WINDOWS_ERROR_HPP
diff --git a/test/system/common.props b/test/msvc/common.props
similarity index 100%
rename from test/system/common.props
rename to test/msvc/common.props
diff --git a/test/system/config_test/config_test.vcxproj b/test/msvc/config_test/config_test.vcxproj
similarity index 85%
rename from test/system/config_test/config_test.vcxproj
rename to test/msvc/config_test/config_test.vcxproj
index 783e989..396f312 100644
--- a/test/system/config_test/config_test.vcxproj
+++ b/test/msvc/config_test/config_test.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -82,6 +82,15 @@
   <ItemGroup>
     <ClCompile Include="..\..\config_test.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\include\boost\system\api_config.hpp" />
+    <ClInclude Include="..\..\..\include\boost\system\config.hpp" />
+    <ClInclude Include="..\..\..\include\boost\system\cygwin_error.hpp" />
+    <ClInclude Include="..\..\..\include\boost\system\error_code.hpp" />
+    <ClInclude Include="..\..\..\include\boost\system\linux_error.hpp" />
+    <ClInclude Include="..\..\..\include\boost\system\system_error.hpp" />
+    <ClInclude Include="..\..\..\include\boost\system\windows_error.hpp" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/test/system/error_code_test/error_code_test.vcxproj b/test/msvc/error_code_test/error_code_test.vcxproj
similarity index 96%
rename from test/system/error_code_test/error_code_test.vcxproj
rename to test/msvc/error_code_test/error_code_test.vcxproj
index 6fb7b81..12c91cd 100644
--- a/test/system/error_code_test/error_code_test.vcxproj
+++ b/test/msvc/error_code_test/error_code_test.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/test/system/header_only_test/header_only_test.vcxproj b/test/msvc/header_only_test/header_only_test.vcxproj
similarity index 96%
rename from test/system/header_only_test/header_only_test.vcxproj
rename to test/msvc/header_only_test/header_only_test.vcxproj
index d79b68e..199b23e 100644
--- a/test/system/header_only_test/header_only_test.vcxproj
+++ b/test/msvc/header_only_test/header_only_test.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/test/system/system-dll/system-dll.vcxproj b/test/msvc/system-dll/system-dll.vcxproj
similarity index 96%
rename from test/system/system-dll/system-dll.vcxproj
rename to test/msvc/system-dll/system-dll.vcxproj
index ef799d5..aca6f00 100644
--- a/test/system/system-dll/system-dll.vcxproj
+++ b/test/msvc/system-dll/system-dll.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -19,13 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/test/system/system.sln b/test/msvc/system.sln
similarity index 100%
rename from test/system/system.sln
rename to test/msvc/system.sln