diff --git a/boost/mpl/advance.hpp b/boost/mpl/advance.hpp
index fd327dd..90d1b74 100644
--- a/boost/mpl/advance.hpp
+++ b/boost/mpl/advance.hpp
@@ -25,7 +25,6 @@
 #include <boost/mpl/aux_/advance_backward.hpp>
 #include <boost/mpl/aux_/value_wknd.hpp>
 #include <boost/mpl/aux_/na_spec.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 
 namespace boost { namespace mpl {
 
diff --git a/boost/mpl/apply.hpp b/boost/mpl/apply.hpp
index 5d51b23..5f3dbd9 100644
--- a/boost/mpl/apply.hpp
+++ b/boost/mpl/apply.hpp
@@ -44,7 +44,6 @@
 #   include <boost/mpl/aux_/preprocessor/enum.hpp>
 #   include <boost/mpl/aux_/config/lambda.hpp>
 #   include <boost/mpl/aux_/config/dtp.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 #   include <boost/mpl/aux_/config/msvc.hpp>
 #   include <boost/mpl/aux_/config/workaround.hpp>
 
diff --git a/boost/mpl/apply_fwd.hpp b/boost/mpl/apply_fwd.hpp
index 4393870..2587085 100644
--- a/boost/mpl/apply_fwd.hpp
+++ b/boost/mpl/apply_fwd.hpp
@@ -36,7 +36,6 @@
 #   include <boost/mpl/aux_/preprocessor/params.hpp>
 #   include <boost/mpl/aux_/preprocessor/default_params.hpp>
 #   include <boost/mpl/aux_/config/ctps.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 
 #   include <boost/preprocessor/comma_if.hpp>
 #   include <boost/preprocessor/iterate.hpp>
diff --git a/boost/mpl/arg.hpp b/boost/mpl/arg.hpp
index f51adfa..301e02c 100644
--- a/boost/mpl/arg.hpp
+++ b/boost/mpl/arg.hpp
@@ -43,7 +43,6 @@
 #   include <boost/mpl/aux_/preprocessor/params.hpp>
 #   include <boost/mpl/aux_/config/lambda.hpp>
 #   include <boost/mpl/aux_/config/dtp.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 
 #   include <boost/preprocessor/iterate.hpp>
 #   include <boost/preprocessor/inc.hpp>
diff --git a/boost/mpl/arg_fwd.hpp b/boost/mpl/arg_fwd.hpp
index eada6a8..36461b9 100644
--- a/boost/mpl/arg_fwd.hpp
+++ b/boost/mpl/arg_fwd.hpp
@@ -16,7 +16,6 @@
 // $Revision$
 
 #include <boost/mpl/aux_/adl_barrier.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
 
diff --git a/boost/mpl/assert.hpp b/boost/mpl/assert.hpp
index 29aeba4..53a6a50 100644
--- a/boost/mpl/assert.hpp
+++ b/boost/mpl/assert.hpp
@@ -21,7 +21,6 @@
 #include <boost/mpl/aux_/na.hpp>
 #include <boost/mpl/aux_/adl_barrier.hpp>
 
-#include <boost/mpl/aux_/config/nttp.hpp>
 #include <boost/mpl/aux_/config/dtp.hpp>
 #include <boost/mpl/aux_/config/gcc.hpp>
 #include <boost/mpl/aux_/config/msvc.hpp>
diff --git a/boost/mpl/at.hpp b/boost/mpl/at.hpp
index 863db80..3500daf 100644
--- a/boost/mpl/at.hpp
+++ b/boost/mpl/at.hpp
@@ -20,7 +20,6 @@
 #include <boost/mpl/sequence_tag.hpp>
 #include <boost/mpl/aux_/na_spec.hpp>
 #include <boost/mpl/aux_/lambda_support.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 
 namespace boost { namespace mpl {
 
diff --git a/boost/mpl/aux_/advance_backward.hpp b/boost/mpl/aux_/advance_backward.hpp
index b3bc0aa..ab7650e 100644
--- a/boost/mpl/aux_/advance_backward.hpp
+++ b/boost/mpl/aux_/advance_backward.hpp
@@ -34,7 +34,6 @@
 #else
 
 #   include <boost/mpl/limits/unrolling.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 
 #   include <boost/preprocessor/iterate.hpp>
 #   include <boost/preprocessor/cat.hpp>
diff --git a/boost/mpl/aux_/advance_forward.hpp b/boost/mpl/aux_/advance_forward.hpp
index 6bf1168..f38b750 100644
--- a/boost/mpl/aux_/advance_forward.hpp
+++ b/boost/mpl/aux_/advance_forward.hpp
@@ -34,7 +34,6 @@
 #else
 
 #   include <boost/mpl/limits/unrolling.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 
 #   include <boost/preprocessor/iterate.hpp>
 #   include <boost/preprocessor/cat.hpp>
diff --git a/boost/mpl/aux_/arity.hpp b/boost/mpl/aux_/arity.hpp
index 3ba03ee..fa199fd 100644
--- a/boost/mpl/aux_/arity.hpp
+++ b/boost/mpl/aux_/arity.hpp
@@ -18,7 +18,6 @@
 
 #if defined(BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES)
 
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 #   include <boost/mpl/aux_/config/static_constant.hpp>
 
 namespace boost { namespace mpl { namespace aux {
diff --git a/boost/mpl/aux_/fold_impl_body.hpp b/boost/mpl/aux_/fold_impl_body.hpp
index affd79a..bb936a2 100644
--- a/boost/mpl/aux_/fold_impl_body.hpp
+++ b/boost/mpl/aux_/fold_impl_body.hpp
@@ -19,7 +19,6 @@
 #   include <boost/mpl/aux_/preprocessor/repeat.hpp>
 #   include <boost/mpl/aux_/config/workaround.hpp>
 #   include <boost/mpl/aux_/config/ctps.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 
 #   include <boost/preprocessor/iterate.hpp>
 #   include <boost/preprocessor/dec.hpp>
diff --git a/boost/mpl/aux_/integral_wrapper.hpp b/boost/mpl/aux_/integral_wrapper.hpp
index 16d58cc..a97844a 100644
--- a/boost/mpl/aux_/integral_wrapper.hpp
+++ b/boost/mpl/aux_/integral_wrapper.hpp
@@ -15,7 +15,6 @@
 
 #include <boost/mpl/integral_c_tag.hpp>
 #include <boost/mpl/aux_/static_cast.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 #include <boost/mpl/aux_/config/static_constant.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
 
diff --git a/boost/mpl/aux_/na_spec.hpp b/boost/mpl/aux_/na_spec.hpp
index 3f9acfc..b8b2ccb 100644
--- a/boost/mpl/aux_/na_spec.hpp
+++ b/boost/mpl/aux_/na_spec.hpp
@@ -28,7 +28,6 @@
 #include <boost/mpl/aux_/preprocessor/def_params_tail.hpp>
 #include <boost/mpl/aux_/lambda_arity_param.hpp>
 #include <boost/mpl/aux_/config/dtp.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 #include <boost/mpl/aux_/config/ttp.hpp>
 #include <boost/mpl/aux_/config/lambda.hpp>
 #include <boost/mpl/aux_/config/overload_resolution.hpp>
diff --git a/boost/mpl/aux_/nttp_decl.hpp b/boost/mpl/aux_/nttp_decl.hpp
deleted file mode 100644
index 600901c..0000000
--- a/boost/mpl/aux_/nttp_decl.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-
-#ifndef BOOST_MPL_AUX_NTTP_DECL_HPP_INCLUDED
-#define BOOST_MPL_AUX_NTTP_DECL_HPP_INCLUDED
-
-// Copyright Aleksey Gurtovoy 2001-2004
-//
-// Distributed under 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)
-//
-// See http://www.boost.org/libs/mpl for documentation.
-
-// $Id$
-// $Date$
-// $Revision$
-
-#include <boost/mpl/aux_/config/nttp.hpp>
-
-// Obsolete. Remove.
-#   define BOOST_MPL_AUX_NTTP_DECL(T, x) T x /**/
-
-#endif // BOOST_MPL_AUX_NTTP_DECL_HPP_INCLUDED
diff --git a/boost/mpl/aux_/numeric_op.hpp b/boost/mpl/aux_/numeric_op.hpp
index c4d92e5..d490d2d 100644
--- a/boost/mpl/aux_/numeric_op.hpp
+++ b/boost/mpl/aux_/numeric_op.hpp
@@ -27,7 +27,6 @@
 #   include <boost/mpl/aux_/na_spec.hpp>
 #   include <boost/mpl/aux_/lambda_support.hpp>
 #   include <boost/mpl/aux_/value_wknd.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 #endif
 
 #include <boost/mpl/aux_/config/static_constant.hpp>
diff --git a/boost/mpl/aux_/reverse_fold_impl_body.hpp b/boost/mpl/aux_/reverse_fold_impl_body.hpp
index f90a518..5c99c69 100644
--- a/boost/mpl/aux_/reverse_fold_impl_body.hpp
+++ b/boost/mpl/aux_/reverse_fold_impl_body.hpp
@@ -18,7 +18,6 @@
 #   include <boost/mpl/limits/unrolling.hpp>
 #   include <boost/mpl/aux_/preprocessor/repeat.hpp>
 #   include <boost/mpl/aux_/config/ctps.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 
 #   include <boost/preprocessor/arithmetic/sub.hpp>
 #   include <boost/preprocessor/iterate.hpp>
diff --git a/boost/mpl/aux_/sequence_wrapper.hpp b/boost/mpl/aux_/sequence_wrapper.hpp
index 5fcb3de..740ab16 100644
--- a/boost/mpl/aux_/sequence_wrapper.hpp
+++ b/boost/mpl/aux_/sequence_wrapper.hpp
@@ -19,7 +19,6 @@
 
 #   include <boost/mpl/aux_/config/ctps.hpp>
 #   include <boost/mpl/aux_/config/static_constant.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 
 #   include <boost/preprocessor/arithmetic/sub.hpp>
 #   include <boost/preprocessor/tuple/elem.hpp>
diff --git a/boost/mpl/aux_/single_element_iter.hpp b/boost/mpl/aux_/single_element_iter.hpp
index ead81f6..432c47b 100644
--- a/boost/mpl/aux_/single_element_iter.hpp
+++ b/boost/mpl/aux_/single_element_iter.hpp
@@ -20,7 +20,6 @@
 #include <boost/mpl/next_prior.hpp>
 #include <boost/mpl/deref.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 #include <boost/mpl/aux_/value_wknd.hpp>
 #include <boost/mpl/aux_/config/ctps.hpp>
 
diff --git a/boost/mpl/aux_/template_arity.hpp b/boost/mpl/aux_/template_arity.hpp
index 7e42c95..a878ff7 100644
--- a/boost/mpl/aux_/template_arity.hpp
+++ b/boost/mpl/aux_/template_arity.hpp
@@ -51,7 +51,6 @@
 #   include <boost/mpl/aux_/preprocessor/range.hpp>
 #   include <boost/mpl/aux_/preprocessor/repeat.hpp>
 #   include <boost/mpl/aux_/preprocessor/params.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 
 #   include <boost/preprocessor/seq/fold_left.hpp>
 #   include <boost/preprocessor/comma_if.hpp>
diff --git a/boost/mpl/aux_/yes_no.hpp b/boost/mpl/aux_/yes_no.hpp
index f448cda..37662b6 100644
--- a/boost/mpl/aux_/yes_no.hpp
+++ b/boost/mpl/aux_/yes_no.hpp
@@ -14,7 +14,6 @@
 // $Date$
 // $Revision$
 
-#include <boost/mpl/aux_/nttp_decl.hpp>
 #include <boost/mpl/aux_/config/arrays.hpp>
 #include <boost/mpl/aux_/config/msvc.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
diff --git a/boost/mpl/bind.hpp b/boost/mpl/bind.hpp
index 730ac46..56769ad 100644
--- a/boost/mpl/bind.hpp
+++ b/boost/mpl/bind.hpp
@@ -63,7 +63,6 @@
 #   include <boost/mpl/aux_/config/ctps.hpp>
 #   include <boost/mpl/aux_/config/ttp.hpp>
 #   include <boost/mpl/aux_/config/dtp.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 
 #   include <boost/preprocessor/iterate.hpp>
 #   include <boost/preprocessor/comma_if.hpp>
diff --git a/boost/mpl/char_fwd.hpp b/boost/mpl/char_fwd.hpp
index 709d0d6..01a6ae9 100644
--- a/boost/mpl/char_fwd.hpp
+++ b/boost/mpl/char_fwd.hpp
@@ -15,7 +15,6 @@
 // $Revision: 24874 $
 
 #include <boost/mpl/aux_/adl_barrier.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
 
diff --git a/boost/mpl/int_fwd.hpp b/boost/mpl/int_fwd.hpp
index 7f80925..a73c457 100644
--- a/boost/mpl/int_fwd.hpp
+++ b/boost/mpl/int_fwd.hpp
@@ -15,7 +15,6 @@
 // $Revision$
 
 #include <boost/mpl/aux_/adl_barrier.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
 
diff --git a/boost/mpl/is_placeholder.hpp b/boost/mpl/is_placeholder.hpp
index c8d7acb..533397d 100644
--- a/boost/mpl/is_placeholder.hpp
+++ b/boost/mpl/is_placeholder.hpp
@@ -18,7 +18,6 @@
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/aux_/yes_no.hpp>
 #include <boost/mpl/aux_/type_wrapper.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 #include <boost/mpl/aux_/config/ctps.hpp>
 #include <boost/mpl/aux_/config/static_constant.hpp>
 
diff --git a/boost/mpl/list_c.hpp b/boost/mpl/list_c.hpp
index 6c01fc6..514b021 100644
--- a/boost/mpl/list_c.hpp
+++ b/boost/mpl/list_c.hpp
@@ -16,7 +16,6 @@
 
 #if !defined(BOOST_MPL_PREPROCESSING_MODE)
 #   include <boost/mpl/limits/list.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 #   include <boost/mpl/aux_/config/preprocessor.hpp>
 
 #   include <boost/preprocessor/inc.hpp>
diff --git a/boost/mpl/long_fwd.hpp b/boost/mpl/long_fwd.hpp
index 47e3d6b..b93a765 100644
--- a/boost/mpl/long_fwd.hpp
+++ b/boost/mpl/long_fwd.hpp
@@ -15,7 +15,6 @@
 // $Revision$
 
 #include <boost/mpl/aux_/adl_barrier.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 
 BOOST_MPL_AUX_ADL_BARRIER_NAMESPACE_OPEN
 
diff --git a/boost/mpl/map/aux_/iterator.hpp b/boost/mpl/map/aux_/iterator.hpp
index e7e9597..af99f15 100644
--- a/boost/mpl/map/aux_/iterator.hpp
+++ b/boost/mpl/map/aux_/iterator.hpp
@@ -24,7 +24,6 @@
 #include <boost/mpl/deref.hpp>
 #include <boost/mpl/long.hpp>
 #include <boost/mpl/void.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 #include <boost/mpl/aux_/config/ctps.hpp>
 
 namespace boost { namespace mpl {
diff --git a/boost/mpl/not.hpp b/boost/mpl/not.hpp
index 9ef92e5..e62cf7c 100644
--- a/boost/mpl/not.hpp
+++ b/boost/mpl/not.hpp
@@ -15,7 +15,6 @@
 // $Revision$
 
 #include <boost/mpl/bool.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 #include <boost/mpl/aux_/nested_type_wknd.hpp>
 #include <boost/mpl/aux_/na_spec.hpp>
 #include <boost/mpl/aux_/lambda_support.hpp>
diff --git a/boost/mpl/placeholders.hpp b/boost/mpl/placeholders.hpp
index df0373c..f383bb1 100644
--- a/boost/mpl/placeholders.hpp
+++ b/boost/mpl/placeholders.hpp
@@ -44,7 +44,6 @@
 
 #else
 
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 #   include <boost/mpl/limits/arity.hpp>
 #   include <boost/preprocessor/iterate.hpp>
 #   include <boost/preprocessor/cat.hpp>
diff --git a/boost/mpl/protect.hpp b/boost/mpl/protect.hpp
index 31af7f1..7917ac8 100644
--- a/boost/mpl/protect.hpp
+++ b/boost/mpl/protect.hpp
@@ -17,7 +17,6 @@
 
 #include <boost/mpl/aux_/arity.hpp>
 #include <boost/mpl/aux_/config/dtp.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 #include <boost/mpl/aux_/na_spec.hpp>
 
 namespace boost { namespace mpl {
diff --git a/boost/mpl/set_c.hpp b/boost/mpl/set_c.hpp
index c0f8e37..7ae9e1a 100644
--- a/boost/mpl/set_c.hpp
+++ b/boost/mpl/set_c.hpp
@@ -16,7 +16,6 @@
 
 #if !defined(BOOST_MPL_PREPROCESSING_MODE)
 #   include <boost/mpl/limits/set.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 #   include <boost/mpl/aux_/config/preprocessor.hpp>
 
 #   include <boost/preprocessor/inc.hpp>
diff --git a/boost/mpl/unpack_args.hpp b/boost/mpl/unpack_args.hpp
index a56080d..a56f3f6 100644
--- a/boost/mpl/unpack_args.hpp
+++ b/boost/mpl/unpack_args.hpp
@@ -22,7 +22,6 @@
 #   include <boost/mpl/apply.hpp>
 #   include <boost/mpl/at.hpp>
 #   include <boost/mpl/size.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 #   include <boost/mpl/aux_/lambda_spec.hpp>
 #endif
 
diff --git a/boost/mpl/vector/aux_/at.hpp b/boost/mpl/vector/aux_/at.hpp
index 1965e9c..b1802cc 100644
--- a/boost/mpl/vector/aux_/at.hpp
+++ b/boost/mpl/vector/aux_/at.hpp
@@ -18,7 +18,6 @@
 #include <boost/mpl/vector/aux_/tag.hpp>
 #include <boost/mpl/long.hpp>
 #include <boost/mpl/void.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 #include <boost/mpl/aux_/type_wrapper.hpp>
 #include <boost/mpl/aux_/value_wknd.hpp>
 #include <boost/mpl/aux_/config/typeof.hpp>
diff --git a/boost/mpl/vector/aux_/front.hpp b/boost/mpl/vector/aux_/front.hpp
index 678607a..257de50 100644
--- a/boost/mpl/vector/aux_/front.hpp
+++ b/boost/mpl/vector/aux_/front.hpp
@@ -17,7 +17,6 @@
 #include <boost/mpl/front_fwd.hpp>
 #include <boost/mpl/vector/aux_/at.hpp>
 #include <boost/mpl/vector/aux_/tag.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 #include <boost/mpl/aux_/config/typeof.hpp>
 #include <boost/mpl/aux_/config/ctps.hpp>
 
diff --git a/boost/mpl/vector/aux_/iterator.hpp b/boost/mpl/vector/aux_/iterator.hpp
index 18e9aa2..cc67ecd 100644
--- a/boost/mpl/vector/aux_/iterator.hpp
+++ b/boost/mpl/vector/aux_/iterator.hpp
@@ -22,7 +22,6 @@
 #include <boost/mpl/distance_fwd.hpp>
 #include <boost/mpl/next.hpp>
 #include <boost/mpl/prior.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 #include <boost/mpl/aux_/value_wknd.hpp>
 #include <boost/mpl/aux_/config/ctps.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
diff --git a/boost/mpl/vector/aux_/tag.hpp b/boost/mpl/vector/aux_/tag.hpp
index 2be0bfd..74fe31c 100644
--- a/boost/mpl/vector/aux_/tag.hpp
+++ b/boost/mpl/vector/aux_/tag.hpp
@@ -15,7 +15,6 @@
 // $Revision$
 
 #include <boost/mpl/aux_/config/typeof.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 
 namespace boost { namespace mpl { namespace aux {
 
diff --git a/boost/mpl/vector_c.hpp b/boost/mpl/vector_c.hpp
index 316ce65..939b878 100644
--- a/boost/mpl/vector_c.hpp
+++ b/boost/mpl/vector_c.hpp
@@ -16,7 +16,6 @@
 
 #if !defined(BOOST_MPL_PREPROCESSING_MODE)
 #   include <boost/mpl/limits/vector.hpp>
-#   include <boost/mpl/aux_/nttp_decl.hpp>
 #   include <boost/mpl/aux_/config/preprocessor.hpp>
 
 #   include <boost/preprocessor/inc.hpp>
diff --git a/boost/serialization/level.hpp b/boost/serialization/level.hpp
index c38ada5..68305d2 100644
--- a/boost/serialization/level.hpp
+++ b/boost/serialization/level.hpp
@@ -29,7 +29,6 @@
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/integral_c.hpp>
 #include <boost/mpl/integral_c_tag.hpp>
-#include <boost/mpl/aux_/nttp_decl.hpp>
 
 #include <boost/serialization/level_enum.hpp>
 
@@ -94,7 +93,7 @@ struct implementation_level :
 {
 };
 
-template<class T, BOOST_MPL_AUX_NTTP_DECL(int, L) >
+template<class T, int L>
 inline bool operator>=(implementation_level< T > t, enum level_type l)
 {
     return t.value >= (int)l;