diff --git a/include/boost/detail/endian.hpp b/include/boost/detail/endian.hpp
index 6394d92..6936dba 100644
--- a/include/boost/detail/endian.hpp
+++ b/include/boost/detail/endian.hpp
@@ -42,10 +42,10 @@
 #  error Unknown machine endianness detected.
 # endif
 # define BOOST_BYTE_ORDER __BYTE_ORDER
-#elif defined(_BIG_ENDIAN) && !defined(_LITTLE_ENDIAN)
+#elif defined(_BIG_ENDIAN)
 # define BOOST_BIG_ENDIAN
 # define BOOST_BYTE_ORDER 4321
-#elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
+#elif defined(_LITTLE_ENDIAN)
 # define BOOST_LITTLE_ENDIAN
 # define BOOST_BYTE_ORDER 1234
 #elif defined(__sparc) || defined(__sparc__) \
diff --git a/include/boost/detail/is_incrementable.hpp b/include/boost/detail/is_incrementable.hpp
index 1c8fd57..cb7d7a7 100644
--- a/include/boost/detail/is_incrementable.hpp
+++ b/include/boost/detail/is_incrementable.hpp
@@ -63,12 +63,7 @@ namespace is_incrementable_
   tag operator,(tag,int);  
 #  define BOOST_comma(a,b) (a,b)
 # endif 
-
-# if defined(BOOST_MSVC)
-#  pragma warning(push)
-#  pragma warning(disable:4913) // Warning about operator,
-# endif 
-
+  
   // two check overloads help us identify which operator++ was picked
   char (& check(tag) )[2];
   
@@ -97,11 +92,6 @@ namespace is_incrementable_
         , value = sizeof(is_incrementable_::check(BOOST_comma(x++,0))) == 1
       );
   };
-
-# if defined(BOOST_MSVC)
-#  pragma warning(pop)
-# endif 
-
 }
 
 # undef BOOST_comma
diff --git a/include/boost/detail/utf8_codecvt_facet.hpp b/include/boost/detail/utf8_codecvt_facet.hpp
index 13c8346..ac7e7bf 100644
--- a/include/boost/detail/utf8_codecvt_facet.hpp
+++ b/include/boost/detail/utf8_codecvt_facet.hpp
@@ -79,16 +79,25 @@
 // specialized on those types for this to work.
 
 #include <locale>
-#include <cwchar>  // for mbstate_t
-#include <cstddef> // for std::size_t
+// for mbstate_t
+#include <wchar.h>
+// for std::size_t
+#include <cstddef>
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
 
-#if defined(BOOST_NO_STDC_NAMESPACE)
-    using ::codecvt;
-    using ::mbstate_t;
-#endif
+namespace std {
+    #if defined(__LIBCOMO__)
+        using ::mbstate_t;
+    #elif defined(BOOST_DINKUMWARE_STDLIB) && !defined(__BORLANDC__)
+        using ::mbstate_t;
+    #elif defined(__SGI_STL_PORT)
+    #elif defined(BOOST_NO_STDC_NAMESPACE)
+        using ::mbstate_t;
+        using ::codecvt;
+    #endif
+} // namespace std
 
 #if !defined(__MSL_CPP__) && !defined(__LIBCOMO__)
     #define BOOST_CODECVT_DO_LENGTH_CONST const