diff --git a/boost/endian/detail/cover_operators.hpp b/boost/endian/detail/cover_operators.hpp
index 2d63ac4..9d0b2f8 100644
--- a/boost/endian/detail/cover_operators.hpp
+++ b/boost/endian/detail/cover_operators.hpp
@@ -1,4 +1,4 @@
-//  boost/integer/cover_operators.hpp ----------------------------------------//
+//  boost/endian/detail/cover_operators.hpp ----------------------------------//
 
 //  Copyright Darin Adler 2000
 //  Copyright Beman Dawes 2008
diff --git a/boost/endian/types.hpp b/boost/endian/types.hpp
index 91a389f..8876025 100644
--- a/boost/endian/types.hpp
+++ b/boost/endian/types.hpp
@@ -1,4 +1,4 @@
-//  Boost endian.hpp header file -------------------------------------------------------//
+//  boost/endian/types.hpp  ------------------------------------------------------------//
 
 //  (C) Copyright Darin Adler 2000
 //  (C) Copyright Beman Dawes 2006, 2009
@@ -33,7 +33,7 @@
 #include <boost/detail/endian.hpp>
 #define BOOST_MINIMAL_INTEGER_COVER_OPERATORS
 #define BOOST_NO_IO_COVER_OPERATORS
-#include <boost/endian/cover_operators.hpp>
+#include <boost/endian/detail/cover_operators.hpp>
 #undef  BOOST_NO_IO_COVER_OPERATORS
 #undef  BOOST_MINIMAL_INTEGER_COVER_OPERATORS
 #include <boost/type_traits/is_signed.hpp>
diff --git a/libs/endian/example/endian_example.cpp b/libs/endian/example/endian_example.cpp
index 23da48a..b252434 100644
--- a/libs/endian/example/endian_example.cpp
+++ b/libs/endian/example/endian_example.cpp
@@ -15,7 +15,7 @@
 
 #include <iostream>
 #include <cstdio>
-#include <boost/endian/integers.hpp>
+#include <boost/endian/types.hpp>
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/detail/lightweight_main.hpp>
 
diff --git a/libs/endian/example/endian_hello_world.cpp b/libs/endian/example/endian_hello_world.cpp
index 9482071..69429ed 100644
--- a/libs/endian/example/endian_hello_world.cpp
+++ b/libs/endian/example/endian_hello_world.cpp
@@ -9,8 +9,8 @@
 
 #include <boost/endian/detail/disable_warnings.hpp>
 
-#include <boost/endian/integers.hpp>
-#include <boost/binary_stream.hpp>
+#include <boost/endian/types.hpp>
+#include <boost/io/detail/bin_manip.hpp>
 #include <iostream>
 
 using namespace boost;
diff --git a/libs/endian/test/Jamfile.v2 b/libs/endian/test/Jamfile.v2
index 601561d..366b6ae 100644
--- a/libs/endian/test/Jamfile.v2
+++ b/libs/endian/test/Jamfile.v2
@@ -11,7 +11,7 @@
    
    test-suite "endian"
        :
-         [ run binary_stream_test.cpp ]
+         [ run ../../io/test/bin_manip_test.cpp ]
          [ run endian_test.cpp ]
          [ run endian_operations_test.cpp
             :  :  : <toolset>gcc:<cxxflags>-Wno-sign-compare ]
diff --git a/libs/endian/test/endian-in-sandbox/binary_stream_example/binary_stream_example.vcxproj b/libs/endian/test/endian-in-sandbox/binary_stream_example/binary_stream_example.vcxproj
index b17f084..769e0ae 100644
--- a/libs/endian/test/endian-in-sandbox/binary_stream_example/binary_stream_example.vcxproj
+++ b/libs/endian/test/endian-in-sandbox/binary_stream_example/binary_stream_example.vcxproj
@@ -10,10 +10,14 @@
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\io\example\bin_manip_example.cpp" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{06736C67-6305-4A9F-8D10-850FD0CE907D}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>binary_stream_example</RootNamespace>
+    <ProjectName>bin_manip_example</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -75,9 +79,6 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\example\binary_stream_example.cpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/libs/endian/test/endian-in-sandbox/binary_stream_test/binary_stream_test.vcxproj b/libs/endian/test/endian-in-sandbox/binary_stream_test/binary_stream_test.vcxproj
index 35e43da..f4fca44 100644
--- a/libs/endian/test/endian-in-sandbox/binary_stream_test/binary_stream_test.vcxproj
+++ b/libs/endian/test/endian-in-sandbox/binary_stream_test/binary_stream_test.vcxproj
@@ -10,6 +10,9 @@
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\io\test\bin_manip_test.cpp" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1382D085-FF3F-4573-8709-E10D3D74D620}</ProjectGuid>
     <RootNamespace>binary_stream_test</RootNamespace>
@@ -84,9 +87,6 @@
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\binary_stream_test.cpp" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/libs/endian/test/endian_in_union_test.cpp b/libs/endian/test/endian_in_union_test.cpp
index bebebed..71e04ca 100644
--- a/libs/endian/test/endian_in_union_test.cpp
+++ b/libs/endian/test/endian_in_union_test.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/endian/detail/disable_warnings.hpp>
 
-#include <boost/endian/integers.hpp>
+#include <boost/endian/types.hpp>
 #include <boost/detail/lightweight_main.hpp>
 #include <cassert>
 
diff --git a/libs/endian/test/endian_operations_test.cpp b/libs/endian/test/endian_operations_test.cpp
index 25914c9..94ce9bf 100644
--- a/libs/endian/test/endian_operations_test.cpp
+++ b/libs/endian/test/endian_operations_test.cpp
@@ -28,7 +28,7 @@
 # pragma warning( disable : 4389 )  // signed/unsigned mismatch
 #endif
 
-#include <boost/endian/integers.hpp>
+#include <boost/endian/types.hpp>
 #include <boost/detail/lightweight_main.hpp>
 #include <cassert>
 #include <iostream>
diff --git a/libs/endian/test/endian_test.cpp b/libs/endian/test/endian_test.cpp
index 2dc71b7..20ff0e6 100644
--- a/libs/endian/test/endian_test.cpp
+++ b/libs/endian/test/endian_test.cpp
@@ -18,7 +18,7 @@
 
 #include <boost/endian/detail/disable_warnings.hpp>
 
-#include <boost/endian/integers.hpp>
+#include <boost/endian/types.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/progress.hpp>
 #include <boost/detail/lightweight_main.hpp>