diff -Naurp boost_1_34_1-orig/boost/date_time/date_facet.hpp boost_1_34_1/boost/date_time/date_facet.hpp
--- boost_1_34_1-orig/boost/date_time/date_facet.hpp	2005-09-05 15:10:50.000000000 -0600
+++ boost_1_34_1/boost/date_time/date_facet.hpp	2009-03-20 22:51:10.000000000 -0600
@@ -429,7 +429,7 @@ namespace boost { namespace date_time {
     typedef std::basic_string<CharT> string_type;
     typedef CharT                    char_type;
     typedef boost::date_time::period_parser<date_type, CharT>  period_parser_type;
-    typedef special_values_parser<date_type,CharT> special_values_parser_type; 
+    typedef boost::date_time::special_values_parser<date_type,CharT> special_values_parser_type;
     typedef std::vector<std::basic_string<CharT> > input_collection_type;
     typedef format_date_parser<date_type, CharT> format_date_parser_type;
     // date_generators stuff goes here
diff -Naurp boost_1_34_1-orig/boost/date_time/tz_db_base.hpp boost_1_34_1/boost/date_time/tz_db_base.hpp
--- boost_1_34_1-orig/boost/date_time/tz_db_base.hpp	2005-10-23 14:15:06.000000000 -0600
+++ boost_1_34_1/boost/date_time/tz_db_base.hpp	2009-03-20 22:52:10.000000000 -0600
@@ -158,7 +158,7 @@ namespace boost {
       typedef typename time_zone_type::base_type time_zone_base_type;
       typedef typename time_zone_type::time_duration_type time_duration_type;
       typedef time_zone_names_base<char_type> time_zone_names;
-      typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
+      typedef boost::date_time::dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
       typedef std::basic_string<char_type> string_type;
 
       //! Constructs an empty database
diff -Naurp boost_1_34_1-orig/boost/pending/relaxed_heap.hpp boost_1_34_1/boost/pending/relaxed_heap.hpp
--- boost_1_34_1-orig/boost/pending/relaxed_heap.hpp	2005-12-07 20:56:25.000000000 -0600
+++ boost_1_34_1/boost/pending/relaxed_heap.hpp	2009-03-20 22:31:12.000000000 -0600
@@ -9,6 +9,7 @@
 #ifndef BOOST_RELAXED_HEAP_HEADER
 #define BOOST_RELAXED_HEAP_HEADER
 
+#include <climits>
 #include <functional>
 #include <boost/property_map.hpp>
 #include <boost/optional.hpp>
diff -Naurp boost_1_34_1-orig/boost/python/detail/def_helper.hpp boost_1_34_1/boost/python/detail/def_helper.hpp
--- boost_1_34_1-orig/boost/python/detail/def_helper.hpp	2004-09-15 19:00:28.000000000 -0600
+++ boost_1_34_1/boost/python/detail/def_helper.hpp	2009-03-20 22:40:40.000000000 -0600
@@ -155,7 +155,7 @@ namespace detail
           , T3 const&
           , T4 const&
           , default_call_policies
-          , keywords<0>
+          , boost::python::detail::keywords<0>
           , char const*
           , void(not_specified::*)()   // A function pointer type which is never an
                                        // appropriate default implementation
diff -Naurp boost_1_34_1-orig/boost/spirit/phoenix/operators.hpp boost_1_34_1/boost/spirit/phoenix/operators.hpp
--- boost_1_34_1-orig/boost/spirit/phoenix/operators.hpp	2006-08-25 10:27:30.000000000 -0600
+++ boost_1_34_1/boost/spirit/phoenix/operators.hpp	2009-03-20 22:43:05.000000000 -0600
@@ -24,6 +24,7 @@
 #include <boost/spirit/phoenix/composite.hpp>
 #include <boost/config.hpp>
 #include <boost/mpl/if.hpp>
+#include <climits>
 
 ///////////////////////////////////////////////////////////////////////////////
 namespace phoenix {
diff -Naurp boost_1_34_1-orig/boost/test/test_tools.hpp boost_1_34_1/boost/test/test_tools.hpp
--- boost_1_34_1-orig/boost/test/test_tools.hpp	2007-02-22 11:57:29.000000000 -0600
+++ boost_1_34_1/boost/test/test_tools.hpp	2009-03-20 22:39:25.000000000 -0600
@@ -44,6 +44,7 @@
 // STL
 #include <cstddef>          // for std::size_t
 #include <iosfwd>
+#include <climits>
 
 #include <boost/test/detail/suppress_warnings.hpp>
 
diff -Naurp boost_1_34_1-orig/boost/wave/util/flex_string.hpp boost_1_34_1/boost/wave/util/flex_string.hpp
--- boost_1_34_1-orig/boost/wave/util/flex_string.hpp	2006-04-25 11:21:01.000000000 -0600
+++ boost_1_34_1/boost/wave/util/flex_string.hpp	2009-03-20 22:47:16.000000000 -0600
@@ -94,6 +94,7 @@ class StoragePolicy
 #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
diff -Naurp boost_1_34_1-orig/libs/spirit/test/numerics_tests.cpp boost_1_34_1/libs/spirit/test/numerics_tests.cpp
--- boost_1_34_1-orig/libs/spirit/test/numerics_tests.cpp	2006-02-28 16:56:32.000000000 -0600
+++ boost_1_34_1/libs/spirit/test/numerics_tests.cpp	2009-03-20 22:48:10.000000000 -0600
@@ -11,6 +11,7 @@
 #include <boost/spirit/actor/assign_actor.hpp>
 #include <iostream>
 #include <boost/detail/lightweight_test.hpp>
+#include <climits>
 
 using namespace std;
 using namespace boost::spirit;
diff -Naurp boost_1_34_1-orig/boost/archive/polymorphic_iarchive.hpp boost_1_34_1/boost/archive/polymorphic_iarchive.hpp
--- boost_1_34_1-orig/boost/archive/polymorphic_iarchive.hpp	2005-12-11 00:12:51.000000000 -0600
+++ boost_1_34_1/boost/archive/polymorphic_iarchive.hpp	2009-03-20 23:17:07.000000000 -0600
@@ -33,6 +33,8 @@ namespace std{
 #include <boost/archive/detail/interface_iarchive.hpp>
 #include <boost/serialization/nvp.hpp>
 
+#include <climits>
+
 // determine if its necessary to handle (u)int64_t specifically
 // i.e. that its not a synonym for (unsigned) long
 // if there is no 64 bit int or if its the same as a long
diff -Naurp boost_1_34_1-orig/boost/archive/polymorphic_oarchive.hpp boost_1_34_1/boost/archive/polymorphic_oarchive.hpp
--- boost_1_34_1-orig/boost/archive/polymorphic_oarchive.hpp	2006-02-11 23:43:06.000000000 -0600
+++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp	2009-03-20 23:20:37.000000000 -0600
@@ -32,6 +32,8 @@ namespace std{
 #include <boost/archive/detail/interface_oarchive.hpp>
 #include <boost/serialization/nvp.hpp>
 
+#include <climits>
+
 // determine if its necessary to handle (u)int64_t specifically
 // i.e. that its not a synonym for (unsigned) long
 // if there is no 64 bit int or if its the same as a long
diff -Naurp boost_1_34_1-orig/boost/regex/v4/basic_regex_creator.hpp boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp
--- boost_1_34_1-orig/boost/regex/v4/basic_regex_creator.hpp	2006-07-16 10:06:38.000000000 -0600
+++ boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp	2009-03-20 23:09:47.000000000 -0600
@@ -24,6 +24,8 @@
 #  include BOOST_ABI_PREFIX
 #endif
 
+#include <climits>
+
 namespace boost{
 
 namespace re_detail{
diff -Naurp boost_1_34_1-orig/boost/regex/v4/basic_regex.hpp boost_1_34_1/boost/regex/v4/basic_regex.hpp
--- boost_1_34_1-orig/boost/regex/v4/basic_regex.hpp	2007-06-05 11:28:18.000000000 -0600
+++ boost_1_34_1/boost/regex/v4/basic_regex.hpp	2009-03-20 23:10:46.000000000 -0600
@@ -23,6 +23,8 @@
 #  include BOOST_ABI_PREFIX
 #endif
 
+#include <climits>
+
 namespace boost{
 #ifdef BOOST_MSVC
 #pragma warning(push)
diff -Naurp boost_1_34_1-orig/boost/regex/v4/basic_regex_parser.hpp boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp
--- boost_1_34_1-orig/boost/regex/v4/basic_regex_parser.hpp	2009-03-20 23:06:11.000000000 -0600
+++ boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp	2009-03-20 23:11:43.000000000 -0600
@@ -23,6 +23,8 @@
 #  include BOOST_ABI_PREFIX
 #endif
 
+#include <climits>
+
 namespace boost{
 namespace re_detail{
 
diff -Naurp boost_1_34_1-orig/boost/regex/v4/perl_matcher.hpp boost_1_34_1/boost/regex/v4/perl_matcher.hpp
--- boost_1_34_1-orig/boost/regex/v4/perl_matcher.hpp	2006-10-18 06:55:30.000000000 -0600
+++ boost_1_34_1/boost/regex/v4/perl_matcher.hpp	2009-03-20 23:12:33.000000000 -0600
@@ -18,6 +18,8 @@
 #  include BOOST_ABI_PREFIX
 #endif
 
+#include <climits>
+
 namespace boost{
 namespace re_detail{
 
diff -Naurp boost_1_34_1-orig/boost/regex/v4/regex_split.hpp boost_1_34_1/boost/regex/v4/regex_split.hpp
--- boost_1_34_1-orig/boost/regex/v4/regex_split.hpp	2005-01-21 11:22:38.000000000 -0600
+++ boost_1_34_1/boost/regex/v4/regex_split.hpp	2009-03-20 23:13:01.000000000 -0600
@@ -21,6 +21,8 @@
 #ifndef BOOST_REGEX_SPLIT_HPP
 #define BOOST_REGEX_SPLIT_HPP
 
+#include <climits>
+
 namespace boost{
 
 #ifdef BOOST_HAS_ABI_HEADERS
diff -Naurp boost_1_34_1-orig/boost/regex/v4/states.hpp boost_1_34_1/boost/regex/v4/states.hpp
--- boost_1_34_1-orig/boost/regex/v4/states.hpp	2005-09-20 06:01:25.000000000 -0600
+++ boost_1_34_1/boost/regex/v4/states.hpp	2009-03-20 23:13:34.000000000 -0600
@@ -23,6 +23,8 @@
 #  include BOOST_ABI_PREFIX
 #endif
 
+#include <climits>
+
 namespace boost{
 namespace re_detail{
 
diff -Naurp boost_1_34_1-orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
--- boost_1_34_1-orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp	2006-12-20 10:38:24.000000000 -0600
+++ boost_1_34_1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp	2009-03-20 23:15:53.000000000 -0600
@@ -16,6 +16,7 @@
 #include <string>
 #include <cstdio>
 #include <cstdarg>
+#include <cstring>
 #if defined(BOOST_SPIRIT_DEBUG)
 #include <iostream>
 #endif // defined(BOOST_SPIRIT_DEBUG)
diff -Naurp boost_1_34_1-orig/boost/xpressive/detail/core/state.hpp boost_1_34_1/boost/xpressive/detail/core/state.hpp
--- boost_1_34_1-orig/boost/xpressive/detail/core/state.hpp	2007-06-04 13:16:45.000000000 -0600
+++ boost_1_34_1/boost/xpressive/detail/core/state.hpp	2009-03-21 17:17:25.000000000 -0600
@@ -90,12 +90,12 @@ struct state_type
   : noncopyable
 {
     typedef core_access<BidiIter> access;
-    typedef match_context<BidiIter> match_context;
-    typedef results_extras<BidiIter> results_extras;
-    typedef regex_impl<BidiIter> regex_impl;
-    typedef matchable<BidiIter> matchable;
-    typedef match_results<BidiIter> match_results;
-    typedef sub_match_impl<BidiIter> sub_match_impl;
+    typedef detail::match_context<BidiIter> match_context;
+    typedef detail::results_extras<BidiIter> results_extras;
+    typedef detail::regex_impl<BidiIter> regex_impl;
+    typedef detail::matchable<BidiIter> matchable;
+    typedef xpressive::match_results<BidiIter> match_results;
+    typedef detail::sub_match_impl<BidiIter> sub_match_impl;
 
     BidiIter cur_;
     sub_match_impl *sub_matches_;
diff -Naurp boost_1_34_1-orig/boost/xpressive/detail/dynamic/parser.hpp boost_1_34_1/boost/xpressive/detail/dynamic/parser.hpp
--- boost_1_34_1-orig/boost/xpressive/detail/dynamic/parser.hpp	2005-11-26 11:12:25.000000000 -0600
+++ boost_1_34_1/boost/xpressive/detail/dynamic/parser.hpp	2009-03-21 17:10:31.000000000 -0600
@@ -227,7 +227,7 @@ inline sequence<BidiIter> make_charset_x
     if(optimize)
     {
         typedef basic_chset<char_type> charset_type;
-        charset_type charset(chset.basic_chset());
+        charset_type charset(chset.base());
         if(icase)
         {
             charset_matcher<Traits, true, charset_type> matcher(charset);
@@ -243,7 +243,7 @@ inline sequence<BidiIter> make_charset_x
     }
 
     // special case to make [[:digit:]] fast
-    else if(chset.basic_chset().empty() && chset.posix_no().empty())
+    else if(chset.base().empty() && chset.posix_no().empty())
     {
         BOOST_ASSERT(0 != chset.posix_yes());
         posix_charset_matcher<Traits> matcher(chset.posix_yes(), chset.is_inverted());
diff -Naurp boost_1_34_1-orig/boost/xpressive/detail/utility/chset/chset.hpp boost_1_34_1/boost/xpressive/detail/utility/chset/chset.hpp
--- boost_1_34_1-orig/boost/xpressive/detail/utility/chset/chset.hpp	2005-11-26 11:12:25.000000000 -0600
+++ boost_1_34_1/boost/xpressive/detail/utility/chset/chset.hpp	2009-03-21 17:09:03.000000000 -0600
@@ -44,7 +44,7 @@ struct compound_charset
 
     ///////////////////////////////////////////////////////////////////////////////
     // accessors
-    basic_chset<char_type> const &basic_chset() const
+    basic_chset<char_type> const &base() const
     {
         return *this;
     }
diff -Naurp boost_1_34_1-orig/boost/mpl/zip_view.hpp boost_1_34_1/boost/mpl/zip_view.hpp
--- boost_1_34_1-orig/boost/mpl/zip_view.hpp	2004-09-02 09:40:42.000000000 -0600
+++ boost_1_34_1/boost/mpl/zip_view.hpp	2009-03-21 17:31:36.000000000 -0600
@@ -37,7 +37,7 @@ struct zip_iterator
     typedef zip_iterator<
           typename transform1<
                 IteratorSeq
-              , next<_1>
+              , mpl::next<_1>
             >::type
         > next;
 };
@@ -48,8 +48,8 @@ template<
 struct zip_view
 {
  private:
-    typedef typename transform1< Sequences, begin<_1> >::type first_ones_;
-    typedef typename transform1< Sequences, end<_1> >::type last_ones_;
+    typedef typename transform1< Sequences, mpl::begin<_1> >::type first_ones_;
+    typedef typename transform1< Sequences, mpl::end<_1> >::type last_ones_;
     
  public:
     typedef nested_begin_end_tag tag;
diff -Naurp boost_1_34_1-orig/boost/spirit/tree/impl/tree_to_xml.ipp boost_1_34_1/boost/spirit/tree/impl/tree_to_xml.ipp
--- boost_1_34_1-orig/boost/spirit/tree/impl/tree_to_xml.ipp	2006-12-02 12:13:23.000000000 -0600
+++ boost_1_34_1/boost/spirit/tree/impl/tree_to_xml.ipp	2009-03-21 17:37:15.000000000 -0600
@@ -13,6 +13,7 @@
 
 #include <cstdio>
 #include <cstdarg>
+#include <cstring>
 #include <locale>
 
 #include <map>
diff -Naurp boost_1_34_1-orig/libs/regex/example/snippets/regex_match_example.cpp boost_1_34_1/libs/regex/example/snippets/regex_match_example.cpp
--- boost_1_34_1-orig/libs/regex/example/snippets/regex_match_example.cpp	2005-01-21 11:26:02.000000000 -0600
+++ boost_1_34_1/libs/regex/example/snippets/regex_match_example.cpp	2009-03-21 17:34:55.000000000 -0600
@@ -65,7 +65,7 @@ istream& getline(istream& is, std::strin
 }
 #endif
 
-int main(int argc)
+int main(int argc, const char*[])
 {
    std::string in, out;
    do
diff -Naurp boost_1_34_1-orig/libs/regex/example/snippets/regex_split_example_1.cpp boost_1_34_1/libs/regex/example/snippets/regex_split_example_1.cpp
--- boost_1_34_1-orig/libs/regex/example/snippets/regex_split_example_1.cpp	2005-01-21 11:26:02.000000000 -0600
+++ boost_1_34_1/libs/regex/example/snippets/regex_split_example_1.cpp	2009-03-21 17:35:14.000000000 -0600
@@ -47,7 +47,7 @@ istream& getline(istream& is, std::strin
 #endif
 
 
-int main(int argc)
+int main(int argc, const char*[])
 {
    string s;
    list<string> l;
diff -Naurp boost_1_34_1-orig/libs/regex/example/snippets/regex_token_iterator_eg_1.cpp boost_1_34_1/libs/regex/example/snippets/regex_token_iterator_eg_1.cpp
--- boost_1_34_1-orig/libs/regex/example/snippets/regex_token_iterator_eg_1.cpp	2005-01-21 11:26:02.000000000 -0600
+++ boost_1_34_1/libs/regex/example/snippets/regex_token_iterator_eg_1.cpp	2009-03-21 17:35:42.000000000 -0600
@@ -40,7 +40,7 @@ istream& getline(istream& is, std::strin
 #endif
 
 
-int main(int argc)
+int main(int argc, const char*[])
 {
    string s;
    do{
diff -Naurp boost_1_34_1-orig/libs/spirit/test/ast_calc_tests.cpp boost_1_34_1/libs/spirit/test/ast_calc_tests.cpp
--- boost_1_34_1-orig/libs/spirit/test/ast_calc_tests.cpp	2006-02-28 16:56:32.000000000 -0600
+++ boost_1_34_1/libs/spirit/test/ast_calc_tests.cpp	2009-03-21 17:37:38.000000000 -0600
@@ -13,6 +13,7 @@
 #include <boost/spirit/tree/tree_to_xml.hpp>
 #include <boost/detail/workaround.hpp>
 
+#include <cstdlib>
 #include <iostream>
 #include <stack>
 #include <functional>