diff --git a/include/boost/config/compiler/comeau.hpp b/include/boost/config/compiler/comeau.hpp
index b0ae863b..590e0802 100644
--- a/include/boost/config/compiler/comeau.hpp
+++ b/include/boost/config/compiler/comeau.hpp
@@ -27,14 +27,6 @@
 #     endif
 #  endif
 
-#if (__COMO_VERSION__ <= 4303) || !defined(BOOST_STRICT_CONFIG)
-#  define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
-#endif
-
-#ifdef _WIN32
-#  define BOOST_NO_SWPRINTF
-#endif
-
 // Void returns don't work when emulating VC 6 (Peter Dimov)
 
 #  if defined(_MSC_VER) && (_MSC_VER == 1200)
@@ -43,6 +35,15 @@
 
 #endif  // version 4245
 
+#if (__COMO_VERSION__ <= 4303) || !defined(BOOST_STRICT_CONFIG)
+
+#ifdef _WIN32
+#  define BOOST_NO_SWPRINTF
+#endif
+
+#  define BOOST_FUNCTION_SCOPE_USING_DECLARATION_BREAKS_ADL
+#endif // Version 4303
+
 //
 // enable __int64 support in VC emulation mode
 //
diff --git a/include/boost/config/stdlib/libcomo.hpp b/include/boost/config/stdlib/libcomo.hpp
index 3ec438db..3de143d3 100644
--- a/include/boost/config/stdlib/libcomo.hpp
+++ b/include/boost/config/stdlib/libcomo.hpp
@@ -24,6 +24,11 @@
 #  define BOOST_NO_STD_WSTREAMBUF
 #endif
 
+#if __LIBCOMO_VERSION__ >= 31
+#  define BOOST_HAS_HASH
+#  define BOOST_HAS_SLIST
+#endif
+
 //
 // Intrinsic type_traits support.
 // The SGI STL has it's own __type_traits class, which