Index: boost/archive/impl/basic_xml_grammar.hpp
===================================================================
--- boost/archive/impl/basic_xml_grammar.hpp	(revision 49379)
+++ boost/archive/impl/basic_xml_grammar.hpp	(working copy)
@@ -65,11 +65,7 @@
 #endif
 
 // spirit stuff
-#if (defined __BORLANDC__) && (__BORLANDC__ < 0x593) \
-|| (defined _MSC_VER) && #if (_MSC_VER <= 1300) 
-#else
-#include <boost/spirit/classic_chset.hpp>
-#endif
+#include <boost/spirit/include/classic_chset.hpp>
 
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
 #undef arg
Index: libs/serialization/src/basic_xml_grammar.ipp
===================================================================
--- libs/serialization/src/basic_xml_grammar.ipp	(revision 49379)
+++ libs/serialization/src/basic_xml_grammar.ipp	(working copy)
@@ -17,16 +17,9 @@
 #include <boost/config.hpp> // BOOST_DEDUCED_TYPENAME
 
 // spirit stuff
-#if (defined __BORLANDC__) && (__BORLANDC__ < 0x593) \
-|| (defined _MSC_VER) && #if (_MSC_VER <= 1300) 
-#include <boost/spirit/core/composite/operators.hpp>
-#include <boost/spirit/core/composite/actions.hpp>
-#include <boost/spirit/core/primitives/numerics.hpp>
-#else
-#include <boost/spirit/classic_operators.hpp>
-#include <boost/spirit/classic_actions.hpp>
-#include <boost/spirit/classic_numerics.hpp>
-#endif
+#include <boost/spirit/include/classic_operators.hpp>
+#include <boost/spirit/include/classic_actions.hpp>
+#include <boost/spirit/include/classic_numerics.hpp>
 
 // for head_iterator test
 //#include <boost/bind.hpp>