Index: parameter/python.hpp
===================================================================
--- parameter/python.hpp	(Revision 42336)
+++ parameter/python.hpp	(Arbeitskopie)
@@ -63,6 +63,33 @@
           0,                                /* tp_as_buffer   */
           Py_TPFLAGS_DEFAULT,               /* tp_flags       */
           0,                                /* tp_doc         */
+          0,                                /* tp_traverse */
+          0,                                /* tp_clear */
+          0,                                /* tp_richcompare */
+          0,                                /* tp_weaklistoffset */
+          0,                                /* tp_iter */
+          0,                                /* tp_iternext */
+          0,                                /* tp_methods */
+          0,                                /* tp_members */
+          0,                                /* tp_getset */
+          0,                                /* tp_base */
+          0,                                /* tp_dict */
+          0,                                /* tp_descr_get */
+          0,                                /* tp_descr_set */
+          0,                                /* tp_dictoffset */
+          0,                                /* tp_init */
+          0,                                /* tp_alloc */
+          0,                                /* tp_new */
+          0,                                /* tp_free */
+          0,                                /* tp_is_gc */
+          0,                                /* tp_bases */
+          0,                                /* tp_mro */
+          0,                                /* tp_cache */
+          0,                                /* tp_subclasses */
+          0,                                /* tp_weaklist */
+#if PYTHON_API_VERSION >= 1012
+          0                                 /* tp_del */
+#endif
       };
 
       if (unspecified.ob_type == 0)
Index: parameter/macros.hpp
===================================================================
--- parameter/macros.hpp	(Revision 42336)
+++ parameter/macros.hpp	(Arbeitskopie)
@@ -15,6 +15,7 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/cat.hpp>
+#include <boost/detail/workaround.hpp>
 
 #define BOOST_PARAMETER_FUN_TEMPLATE_HEAD1(n) \
     template<BOOST_PP_ENUM_PARAMS(n, class T)>
Index: parameter/aux_/cast.hpp
===================================================================
--- parameter/aux_/cast.hpp	(Revision 42336)
+++ parameter/aux_/cast.hpp	(Arbeitskopie)
@@ -2,6 +2,8 @@
 // subject to the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/detail/workaround.hpp>
+
 #ifndef BOOST_PARAMETER_CAST_060902_HPP
 # define BOOST_PARAMETER_CAST_060902_HPP
 
Index: parameter/aux_/set.hpp
===================================================================
--- parameter/aux_/set.hpp	(Revision 42336)
+++ parameter/aux_/set.hpp	(Arbeitskopie)
@@ -5,6 +5,8 @@
 #ifndef BOOST_PARAMETER_SET_060912_HPP
 # define BOOST_PARAMETER_SET_060912_HPP
 
+#include <boost/detail/workaround.hpp>
+
 # if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) \
   && !BOOST_WORKAROUND(__GNUC__, < 3)
 #  include <boost/mpl/insert.hpp>
Index: parameter/aux_/python/invoker_iterate.hpp
===================================================================
--- parameter/aux_/python/invoker_iterate.hpp	(Revision 42336)
+++ parameter/aux_/python/invoker_iterate.hpp	(Arbeitskopie)
@@ -6,6 +6,7 @@
 #include <boost/preprocessor/dec.hpp>
 #include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/repetition/repeat_from_to.hpp>
+#include <boost/preprocessor/iteration/iterate.hpp> // BOOST_PP_ITERATION_FLAGS
 
 #define N BOOST_PP_ITERATION()
 
@@ -25,7 +26,9 @@
     >::type BOOST_PP_CAT(arg,n); \
     typedef typename BOOST_PP_CAT(spec,n)::keyword BOOST_PP_CAT(kw,n);
 
-#if BOOST_PP_ITERATION_FLAGS() == 1
+#if BOOST_PP_ITERATION_FLAGS() == 0
+#error "Can this happen?"
+#elif BOOST_PP_ITERATION_FLAGS() == 1
 template <class M, class R, class Args>
 struct invoker<N, M, R, Args>
 #elif BOOST_PP_ITERATION_FLAGS() == 2
Index: parameter/aux_/python/invoker.hpp
===================================================================
--- parameter/aux_/python/invoker.hpp	(Revision 42336)
+++ parameter/aux_/python/invoker.hpp	(Arbeitskopie)
@@ -8,6 +8,7 @@
 # include <boost/mpl/begin.hpp>
 # include <boost/mpl/next.hpp>
 # include <boost/mpl/deref.hpp>
+# include <boost/mpl/size.hpp>
 # include <boost/parameter/keyword.hpp>
 # include <boost/preprocessor/iteration/iterate.hpp>
 
Index: parameter/aux_/arg_list.hpp
===================================================================
--- parameter/aux_/arg_list.hpp	(Revision 42336)
+++ parameter/aux_/arg_list.hpp	(Arbeitskopie)
@@ -24,6 +24,7 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>
+#include <boost/preprocessor/repetition/enum_binary_params.hpp>
 #include <boost/preprocessor/facilities/intercept.hpp>
 
 namespace boost { namespace parameter { 
Index: parameter/aux_/default.hpp
===================================================================
--- parameter/aux_/default.hpp	(Revision 42336)
+++ parameter/aux_/default.hpp	(Arbeitskopie)
@@ -3,6 +3,8 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#include <boost/detail/workaround.hpp>
+
 #ifndef DEFAULT_050329_HPP
 #define DEFAULT_050329_HPP