diff --git a/include/boost/functional/detail/container_fwd.hpp b/include/boost/functional/detail/container_fwd.hpp
index 0ce86bf..d01420a 100644
--- a/include/boost/functional/detail/container_fwd.hpp
+++ b/include/boost/functional/detail/container_fwd.hpp
@@ -9,10 +9,10 @@
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
-#include <cstddef>
 
-#if (defined(__GLIBCXX__) && defined(_GLIBCXX_DEBUG)) || \
-    BOOST_WORKAROUND(__BORLANDC__, > 0x551)
+#if (defined(__GLIBCXX__) && defined(_GLIBCXX_DEBUG)) \
+    || BOOST_WORKAROUND(__BORLANDC__, > 0x551) \
+    || BOOST_WORKAROUND(__DMC__, BOOST_TESTED_AT(0x842))
 
 #include <deque>
 #include <list>
@@ -25,6 +25,8 @@
 
 #else
 
+#include <cstddef>
+
 #if !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION) && \
         defined(__STL_CONFIG_H)
 
diff --git a/include/boost/functional/detail/hash_float.hpp b/include/boost/functional/detail/hash_float.hpp
index 965ebf7..ecb48cd 100644
--- a/include/boost/functional/detail/hash_float.hpp
+++ b/include/boost/functional/detail/hash_float.hpp
@@ -20,7 +20,7 @@
 #include <boost/assert.hpp>
 #include <errno.h>
 
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+#if (defined(_WIN32) || defined(__WIN32__) || defined(WIN32)) && !defined(__DMC__)
 #  define BOOST_HASH_USE_FPCLASS
 #elif (defined(__GLIBCPP__) || defined(__GLIBCXX__)) \
     && (defined(__USE_ISOC99) || defined(_GLIBCXX_USE_C99_MATH))