diff --git a/include/boost/detail/container_fwd.hpp b/include/boost/detail/container_fwd.hpp
index b7e3a71..f54dedb 100644
--- a/include/boost/detail/container_fwd.hpp
+++ b/include/boost/detail/container_fwd.hpp
@@ -19,7 +19,7 @@
 #define BOOST_HASH_CHAR_TRAITS char_traits
 #endif
 
-#if (defined(__GLIBCXX__) && defined(_GLIBCXX_DEBUG)) \
+#if ((defined(__GLIBCPP__) || defined(__GLIBCXX__)) && defined(_GLIBCXX_DEBUG)) \
     || BOOST_WORKAROUND(__BORLANDC__, > 0x551) \
     || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x842)) \
     || (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))