--- boost/regex/v4/basic_regex.hpp
+++ boost/regex/v4/basic_regex.hpp
@@ -23,6 +23,8 @@
 #  include BOOST_ABI_PREFIX
 #endif
 
+#include <climits> // For CHAR_BIT ant UINT_MAX
+
 namespace boost{
 #ifdef BOOST_MSVC
 #pragma warning(push)
--- boost/regex/v4/basic_regex_creator.hpp
+++ boost/regex/v4/basic_regex_creator.hpp
@@ -24,6 +24,8 @@
 #  include BOOST_ABI_PREFIX
 #endif
 
+#include <climits> // For CHAR_BIT and UINT_MAX
+
 namespace boost{
 
 namespace re_detail{
--- boost/regex/v4/basic_regex_parser.hpp
+++ boost/regex/v4/basic_regex_parser.hpp
@@ -23,6 +23,8 @@
 #  include BOOST_ABI_PREFIX
 #endif
 
+#include <climits>
+
 namespace boost{
 namespace re_detail{
 
--- boost/regex/v4/cpp_regex_traits.hpp
+++ boost/regex/v4/cpp_regex_traits.hpp
@@ -41,6 +41,7 @@
 
 #include <istream>
 #include <ios>
+#include <climits>
 
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_PREFIX
--- boost/regex/v4/perl_matcher.hpp
+++ boost/regex/v4/perl_matcher.hpp
@@ -18,6 +18,8 @@
 #  include BOOST_ABI_PREFIX
 #endif
 
+#include <climits> // For CHAR_BIT
+
 namespace boost{
 namespace re_detail{
 
--- boost/regex/v4/regex_split.hpp
+++ boost/regex/v4/regex_split.hpp
@@ -21,6 +21,8 @@
 #ifndef BOOST_REGEX_SPLIT_HPP
 #define BOOST_REGEX_SPLIT_HPP
 
+#include <climits> // For UINT_MAX
+
 namespace boost{
 
 #ifdef BOOST_HAS_ABI_HEADERS
--- boost/regex/v4/states.hpp
+++ boost/regex/v4/states.hpp
@@ -23,6 +23,8 @@
 #  include BOOST_ABI_PREFIX
 #endif
 
+#include <climits> // For CHAR_BIT
+
 namespace boost{
 namespace re_detail{
 
--- boost/spirit/phoenix/operators.hpp
+++ boost/spirit/phoenix/operators.hpp
@@ -20,6 +20,8 @@
 #define CREF
 #endif
 
+#include <climits> // for INT_MAX
+
 #include <boost/spirit/phoenix/actor.hpp>
 #include <boost/spirit/phoenix/composite.hpp>
 #include <boost/config.hpp>
--- boost/test/test_tools.hpp
+++ boost/test/test_tools.hpp
@@ -45,6 +45,8 @@
 #include <cstddef>          // for std::size_t
 #include <iosfwd>
 
+#include <climits>   // For CHAR_BIT
+
 #include <boost/test/detail/suppress_warnings.hpp>
 
 //____________________________________________________________________________//
--- boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
+++ boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
@@ -16,6 +16,7 @@
 #include <string>
 #include <cstdio>
 #include <cstdarg>
+#include <cstring>
 #if defined(BOOST_SPIRIT_DEBUG)
 #include <iostream>
 #endif // defined(BOOST_SPIRIT_DEBUG)
--- boost/wave/util/flex_string.hpp
+++ boost/wave/util/flex_string.hpp
@@ -94,6 +94,7 @@
 #include <limits>
 #include <stdexcept>
 #include <cstddef>
+#include <cstring>
 
 // this must occur after all of the includes and before any code appears
 #ifdef BOOST_HAS_ABI_HEADERS