diff --git a/include/boost/detail/container_fwd.hpp b/include/boost/detail/container_fwd.hpp
index 7211134..01820ae 100644
--- a/include/boost/detail/container_fwd.hpp
+++ b/include/boost/detail/container_fwd.hpp
@@ -63,8 +63,7 @@
 #  elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
      // Dinkumware Library (this has to appear after any possible replacement
      // libraries)
-     //
-     // Works fine.
+#    define BOOST_CONTAINER_FWD_COMPLEX_STRUCT
 #  else
 #    define BOOST_DETAIL_NO_CONTAINER_FWD
 #  endif
@@ -117,7 +116,11 @@ namespace std
     template <class charT> struct char_traits;
 #endif
 
+#if defined(BOOST_CONTAINER_FWD_COMPLEX_STRUCT)
+    template <class T> struct complex;
+#else
     template <class T> class complex;
+#endif
 
 #if !defined(BOOST_CONTAINER_FWD_BAD_DEQUE)
     template <class T, class Allocator> class deque;
diff --git a/test/container_fwd/Jamfile b/test/container_fwd/Jamfile
index b39d447..ab55bc2 100644
--- a/test/container_fwd/Jamfile
+++ b/test/container_fwd/Jamfile
@@ -11,6 +11,7 @@ project detail/test/container_fwd
         <toolset>intel:<warnings>on
         <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion"
         <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion"
+        <toolset>clang:<cxxflags>"-pedantic -Wextra -Wmismatched-tags"
         <warnings-as-errors>on
   ;