From cddc55a6c41f848a084f55cb1e57582efdedab4a Mon Sep 17 00:00:00 2001
From: Andrey Semashev <andrey.semashev@gmail.com>
Date: Thu, 4 Sep 2014 23:39:44 +0400
Subject: [PATCH] Updated tests and jamfiles to reflect the changed testing
 headers location.

---
 core/test/Jamfile.v2                |  5 +++++
 core/test/arithmetic.cpp            |  2 +-
 core/test/aux_/largest_int.cpp      |  3 +--
 core/test/bitwise.cpp               |  2 +-
 core/test/bool.cpp                  |  2 +-
 core/test/comparison.cpp            |  2 +-
 core/test/eval_if.cpp               |  4 +---
 core/test/has_xxx.cpp               |  2 +-
 core/test/identity.cpp              |  2 +-
 core/test/if.cpp                    |  2 +-
 core/test/integral_wrapper_test.hpp |  2 +-
 core/test/logical.cpp               |  2 +-
 core/test/min_max.cpp               |  4 +---
 core/test/numeric_ops.cpp           |  2 +-
 core/test/print.cpp                 |  4 +---
 core/test/sizeof.cpp                |  2 +-
 core/test/test.hpp                  | 12 ++++++------
 core/test/test/assert.hpp           |  6 +++---
 core/test/test/data.hpp             |  6 +++---
 core/test/test/test_case.hpp        |  6 +++---
 test/Jamfile.v2                     |  5 +++++
 test/advance.cpp                    |  4 ++--
 test/always.cpp                     |  2 +-
 test/apply.cpp                      |  2 +-
 test/apply_wrap.cpp                 |  3 ++-
 test/as_sequence.cpp                |  2 +-
 test/at.cpp                         |  4 ++--
 test/aux_/msvc_is_class.cpp         |  4 ++--
 test/aux_/template_arity.cpp        |  2 +-
 test/back.cpp                       |  2 +-
 test/bind.cpp                       |  7 ++++---
 test/contains.cpp                   |  4 ++--
 test/copy.cpp                       |  2 +-
 test/copy_if.cpp                    |  2 +-
 test/count.cpp                      |  4 ++--
 test/count_if.cpp                   |  5 +++--
 test/deque.cpp                      |  7 +++----
 test/distance.cpp                   |  6 +++---
 test/empty.cpp                      |  2 +-
 test/empty_sequence.cpp             |  2 +-
 test/equal.cpp                      |  4 ++--
 test/erase.cpp                      |  4 ++--
 test/erase_range.cpp                |  4 ++--
 test/filter_view.cpp                |  2 +-
 test/find.cpp                       |  6 +++---
 test/find_if.cpp                    |  3 ++-
 test/fold.cpp                       |  2 +-
 test/front.cpp                      |  2 +-
 test/index_of.cpp                   |  2 +-
 test/inherit.cpp                    |  6 +++---
 test/insert.cpp                     |  4 ++--
 test/insert_range.cpp               |  2 +-
 test/is_placeholder.cpp             |  8 ++++----
 test/is_sequence.cpp                |  2 +-
 test/iterator_tags.cpp              |  2 +-
 test/joint_view.cpp                 |  7 +++----
 test/lambda.cpp                     |  5 ++---
 test/lambda_args.cpp                |  2 +-
 test/list.cpp                       |  7 +++----
 test/list_c.cpp                     |  6 +++---
 test/lower_bound.cpp                |  4 ++--
 test/map.cpp                        | 14 +++++++-------
 test/max_element.cpp                |  4 ++--
 test/multiset.cpp                   |  8 ++++----
 test/next.cpp                       |  2 +-
 test/pair_view.cpp                  | 14 +++++++-------
 test/partition.cpp                  |  3 ++-
 test/pop_front.cpp                  |  6 +++---
 test/push_back.cpp                  |  3 +--
 test/push_front.cpp                 | 10 +++++-----
 test/quote.cpp                      |  4 ++--
 test/range_c.cpp                    |  2 +-
 test/remove.cpp                     |  2 +-
 test/remove_if.cpp                  |  2 +-
 test/replace.cpp                    |  2 +-
 test/replace_if.cpp                 |  2 +-
 test/reverse.cpp                    |  2 +-
 test/same_as.cpp                    |  3 +--
 test/set.cpp                        | 16 ++++++++--------
 test/set_c.cpp                      |  7 +++----
 test/single_view.cpp                |  2 +-
 test/size.cpp                       |  4 ++--
 test/sort.cpp                       |  2 +-
 test/stable_partition.cpp           |  2 +-
 test/transform.cpp                  |  2 +-
 test/transform_view.cpp             |  2 +-
 test/unique.cpp                     |  2 +-
 test/unpack_args.cpp                |  3 ++-
 test/upper_bound.cpp                |  2 +-
 test/vector.cpp                     |  4 ++--
 test/vector_c.cpp                   |  4 ++--
 test/zip_view.cpp                   |  3 +--
 92 files changed, 183 insertions(+), 182 deletions(-)

diff --git a/core/test/Jamfile.v2 b/core/test/Jamfile.v2
index 9f16f2d..62bc2b2 100644
--- a/core/test/Jamfile.v2
+++ b/core/test/Jamfile.v2
@@ -11,6 +11,11 @@
 
 import testing ;
 
+project
+    : requirements
+        <include>.
+    ;
+
 compile aux_/largest_int.cpp ;
 
 compile arithmetic.cpp ;
diff --git a/core/test/arithmetic.cpp b/core/test/arithmetic.cpp
index 81a615f..925cbe3 100644
--- a/core/test/arithmetic.cpp
+++ b/core/test/arithmetic.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/mpl/arithmetic.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/core/test/aux_/largest_int.cpp b/core/test/aux_/largest_int.cpp
index 2dc4c9a..398fe7d 100644
--- a/core/test/aux_/largest_int.cpp
+++ b/core/test/aux_/largest_int.cpp
@@ -12,9 +12,8 @@
 // $Revision$
 
 #include <boost/mpl/aux_/largest_int.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
-
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/core/test/bitwise.cpp b/core/test/bitwise.cpp
index 8e6e32b..89e12a6 100644
--- a/core/test/bitwise.cpp
+++ b/core/test/bitwise.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/mpl/bitwise.hpp>
 #include <boost/mpl/integral_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 typedef integral_c<unsigned int, 0> _0;
 typedef integral_c<unsigned int, 1> _1;
diff --git a/core/test/bool.cpp b/core/test/bool.cpp
index a6fb44f..f45decb 100644
--- a/core/test/bool.cpp
+++ b/core/test/bool.cpp
@@ -12,8 +12,8 @@
 // $Revision$
 
 #include <boost/mpl/bool.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 #include <cassert>
 
diff --git a/core/test/comparison.cpp b/core/test/comparison.cpp
index a59a104..5cd8564 100644
--- a/core/test/comparison.cpp
+++ b/core/test/comparison.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/mpl/comparison.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 // make sure MSVC behaves nicely in presence of the following template
 template< typename T > struct value {};
diff --git a/core/test/eval_if.cpp b/core/test/eval_if.cpp
index e2b4332..2beca53 100644
--- a/core/test/eval_if.cpp
+++ b/core/test/eval_if.cpp
@@ -14,10 +14,8 @@
 #include <boost/mpl/eval_if.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/identity.hpp>
-
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/core/test/has_xxx.cpp b/core/test/has_xxx.cpp
index c466db2..ed27d64 100644
--- a/core/test/has_xxx.cpp
+++ b/core/test/has_xxx.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/mpl/has_xxx.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 BOOST_MPL_HAS_XXX_TRAIT_DEF(xxx)
 BOOST_MPL_HAS_XXX_TEMPLATE_NAMED_DEF(has_xxx_template, xxx, false)
diff --git a/core/test/identity.cpp b/core/test/identity.cpp
index e594de6..f171a43 100644
--- a/core/test/identity.cpp
+++ b/core/test/identity.cpp
@@ -13,8 +13,8 @@
 
 #include <boost/mpl/apply.hpp>
 #include <boost/mpl/identity.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/core/test/if.cpp b/core/test/if.cpp
index a10eb8c..0d377d9 100644
--- a/core/test/if.cpp
+++ b/core/test/if.cpp
@@ -13,8 +13,8 @@
 
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/bool.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/core/test/integral_wrapper_test.hpp b/core/test/integral_wrapper_test.hpp
index c7e3ff4..7526065 100644
--- a/core/test/integral_wrapper_test.hpp
+++ b/core/test/integral_wrapper_test.hpp
@@ -12,9 +12,9 @@
 // $Revision$
 
 #include <boost/mpl/next_prior.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 #include <cassert>
 
diff --git a/core/test/logical.cpp b/core/test/logical.cpp
index bea6b7a..5f7c67d 100644
--- a/core/test/logical.cpp
+++ b/core/test/logical.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/mpl/logical.hpp>
 #include <boost/mpl/bool.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 struct unknown;
 
diff --git a/core/test/min_max.cpp b/core/test/min_max.cpp
index bd6fc10..2778118 100644
--- a/core/test/min_max.cpp
+++ b/core/test/min_max.cpp
@@ -13,10 +13,8 @@
 
 #include <boost/mpl/min_max.hpp>
 #include <boost/mpl/int.hpp>
-
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
-
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/core/test/numeric_ops.cpp b/core/test/numeric_ops.cpp
index 453b4aa..cea1b8a 100644
--- a/core/test/numeric_ops.cpp
+++ b/core/test/numeric_ops.cpp
@@ -16,7 +16,7 @@
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/long.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 struct complex_tag : int_<10> {};
 
diff --git a/core/test/print.cpp b/core/test/print.cpp
index 12295df..74b538c 100644
--- a/core/test/print.cpp
+++ b/core/test/print.cpp
@@ -12,9 +12,7 @@
 // $Revision$
 
 #include <boost/mpl/print.hpp>
-
-#include <boost/mpl/aux_/test.hpp>
-
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/core/test/sizeof.cpp b/core/test/sizeof.cpp
index 21c0ce0..a5ed78a 100644
--- a/core/test/sizeof.cpp
+++ b/core/test/sizeof.cpp
@@ -12,7 +12,7 @@
 // $Revision$
 
 #include <boost/mpl/sizeof.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 struct my
 {
diff --git a/core/test/test.hpp b/core/test/test.hpp
index b08c28a..2d6bd30 100644
--- a/core/test/test.hpp
+++ b/core/test/test.hpp
@@ -1,6 +1,6 @@
 
-#ifndef BOOST_MPL_AUX_TEST_HPP_INCLUDED
-#define BOOST_MPL_AUX_TEST_HPP_INCLUDED
+#ifndef BOOST_MPL_TEST_TEST_HPP_INCLUDED
+#define BOOST_MPL_TEST_TEST_HPP_INCLUDED
 
 // Copyright Aleksey Gurtovoy 2002-2004
 //
@@ -14,9 +14,9 @@
 // $Date$
 // $Revision$
 
-#include <boost/mpl/aux_/test/test_case.hpp>
-#include <boost/mpl/aux_/test/data.hpp>
-#include <boost/mpl/aux_/test/assert.hpp>
+#include "test/test_case.hpp"
+#include "test/data.hpp"
+#include "test/assert.hpp"
 #include <boost/core/lightweight_test.hpp>
 
 int main()
@@ -27,4 +27,4 @@ int main()
 using namespace boost;
 using namespace mpl;
 
-#endif // BOOST_MPL_AUX_TEST_HPP_INCLUDED
+#endif // BOOST_MPL_TEST_TEST_HPP_INCLUDED
diff --git a/core/test/test/assert.hpp b/core/test/test/assert.hpp
index 3bd8ba0..2911836 100644
--- a/core/test/test/assert.hpp
+++ b/core/test/test/assert.hpp
@@ -1,6 +1,6 @@
 
-#ifndef BOOST_MPL_AUX_TEST_ASSERT_HPP_INCLUDED
-#define BOOST_MPL_AUX_TEST_ASSERT_HPP_INCLUDED
+#ifndef BOOST_MPL_TEST_TEST_ASSERT_HPP_INCLUDED
+#define BOOST_MPL_TEST_TEST_ASSERT_HPP_INCLUDED
 
 // Copyright Aleksey Gurtovoy 2002-2004
 //
@@ -26,4 +26,4 @@
     enum { BOOST_PP_CAT(instantiation_test, __LINE__) = sizeof( x ) } \
 /**/
 
-#endif // BOOST_MPL_AUX_TEST_ASSERT_HPP_INCLUDED
+#endif // BOOST_MPL_TEST_TEST_ASSERT_HPP_INCLUDED
diff --git a/core/test/test/data.hpp b/core/test/test/data.hpp
index 373e6c3..8b9dfa4 100644
--- a/core/test/test/data.hpp
+++ b/core/test/test/data.hpp
@@ -1,6 +1,6 @@
 
-#ifndef BOOST_MPL_AUX_TEST_DATA_HPP_INCLUDED
-#define BOOST_MPL_AUX_TEST_DATA_HPP_INCLUDED
+#ifndef BOOST_MPL_TEST_TEST_DATA_HPP_INCLUDED
+#define BOOST_MPL_TEST_TEST_DATA_HPP_INCLUDED
 
 // Copyright Aleksey Gurtovoy 2002-2004
 //
@@ -22,4 +22,4 @@ struct incomplete;
 class abstract { public: virtual ~abstract() = 0; };
 using boost::noncopyable;
 
-#endif // BOOST_MPL_AUX_TEST_DATA_HPP_INCLUDED
+#endif // BOOST_MPL_TEST_TEST_DATA_HPP_INCLUDED
diff --git a/core/test/test/test_case.hpp b/core/test/test/test_case.hpp
index b168a00..0327fd3 100644
--- a/core/test/test/test_case.hpp
+++ b/core/test/test/test_case.hpp
@@ -1,6 +1,6 @@
 
-#ifndef BOOST_MPL_AUX_TEST_TEST_CASE_HPP_INCLUDED
-#define BOOST_MPL_AUX_TEST_TEST_CASE_HPP_INCLUDED
+#ifndef BOOST_MPL_TEST_TEST_TEST_CASE_HPP_INCLUDED
+#define BOOST_MPL_TEST_TEST_TEST_CASE_HPP_INCLUDED
 
 // Copyright Aleksey Gurtovoy 2002-2004
 //
@@ -18,4 +18,4 @@
 
 #define MPL_TEST_CASE() void BOOST_PP_CAT(test,__LINE__)()
 
-#endif // BOOST_MPL_AUX_TEST_TEST_CASE_HPP_INCLUDED
+#endif // BOOST_MPL_TEST_TEST_TEST_CASE_HPP_INCLUDED
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 4bd0e5a..7082f06 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -11,6 +11,11 @@
 
 import testing ;
 
+project
+    : requirements
+        <include>../core/test
+    ;
+
 compile aux_/msvc_is_class.cpp ;
 compile aux_/template_arity.cpp ;
 compile aux_/preprocessor/is_seq.cpp ;
diff --git a/test/advance.cpp b/test/advance.cpp
index aa1ead4..7abb54d 100644
--- a/test/advance.cpp
+++ b/test/advance.cpp
@@ -13,10 +13,10 @@
 
 #include <boost/mpl/advance.hpp>
 #include <boost/mpl/iterator_tags.hpp>
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 template< int pos > struct iter
 {
     typedef mpl::bidirectional_iterator_tag category;
diff --git a/test/always.cpp b/test/always.cpp
index c879b97..4aedcc5 100644
--- a/test/always.cpp
+++ b/test/always.cpp
@@ -16,7 +16,7 @@
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/int.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/apply.cpp b/test/apply.cpp
index f0122d1..6a7903c 100644
--- a/test/apply.cpp
+++ b/test/apply.cpp
@@ -15,9 +15,9 @@
 #include <boost/mpl/lambda.hpp>
 #include <boost/mpl/plus.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 
 template< typename T > struct std_vector
diff --git a/test/apply_wrap.cpp b/test/apply_wrap.cpp
index 13625d0..0f82b1d 100644
--- a/test/apply_wrap.cpp
+++ b/test/apply_wrap.cpp
@@ -15,7 +15,6 @@
 #include <boost/mpl/limits/arity.hpp>
 #include <boost/mpl/aux_/preprocessor/params.hpp>
 #include <boost/mpl/aux_/preprocessor/enum.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #include <boost/preprocessor/repeat.hpp>
@@ -24,6 +23,8 @@
 #include <boost/preprocessor/if.hpp>
 #include <boost/preprocessor/cat.hpp>
 
+#include "test.hpp"
+
 #if !defined(BOOST_MPL_CFG_NO_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES)
 #   define APPLY_0_FUNC_DEF(i) \
     struct f0 \
diff --git a/test/as_sequence.cpp b/test/as_sequence.cpp
index 65edb5d..f01c006 100644
--- a/test/as_sequence.cpp
+++ b/test/as_sequence.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/mpl/as_sequence.hpp>
 #include <boost/mpl/vector.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/at.cpp b/test/at.cpp
index 850fa6f..bc7a1f0 100644
--- a/test/at.cpp
+++ b/test/at.cpp
@@ -13,8 +13,8 @@
 
 #include <boost/mpl/at.hpp>
 #include <boost/mpl/vector/vector10_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 template< typename Seq, int n > struct at_test
 {
@@ -26,7 +26,7 @@ template< typename Seq, int n > struct at_test
 MPL_TEST_CASE()
 {
     typedef vector10_c<int,9,8,7,6,5,4,3,2,1,0> numbers;
-    
+
     at_test< numbers, 0 >();
     at_test< numbers, 1 >();
     at_test< numbers, 2 >();
diff --git a/test/aux_/msvc_is_class.cpp b/test/aux_/msvc_is_class.cpp
index 6e5d49e..94c4022 100644
--- a/test/aux_/msvc_is_class.cpp
+++ b/test/aux_/msvc_is_class.cpp
@@ -17,7 +17,7 @@
 #if BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
 
 #include <boost/mpl/aux_/msvc_is_class.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 template< typename T > struct A { T x[0]; };
 
@@ -34,7 +34,7 @@ MPL_TEST_CASE()
     MPL_ASSERT_NOT(( aux::msvc_is_class< int[5] > ));
     MPL_ASSERT_NOT(( aux::msvc_is_class< void (*)() > ));
     MPL_ASSERT_NOT(( aux::msvc_is_class< int (*)(int, char) > ));
-    
+
     MPL_ASSERT(( aux::msvc_is_class< UDT > ));
     MPL_ASSERT(( aux::msvc_is_class< incomplete > ));
     MPL_ASSERT(( aux::msvc_is_class< abstract > ));
diff --git a/test/aux_/template_arity.cpp b/test/aux_/template_arity.cpp
index 22370d7..851242c 100644
--- a/test/aux_/template_arity.cpp
+++ b/test/aux_/template_arity.cpp
@@ -12,7 +12,7 @@
 // $Revision$
 
 #include <boost/mpl/aux_/template_arity.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 #if defined(BOOST_EXTENDED_TEMPLATE_PARAMETERS_MATCHING)
 
diff --git a/test/back.cpp b/test/back.cpp
index 84ae1e8..159503d 100644
--- a/test/back.cpp
+++ b/test/back.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/mpl/back.hpp>
 #include <boost/mpl/range_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 template< typename Seq, int value > struct back_test
 {
diff --git a/test/bind.cpp b/test/bind.cpp
index 2fe6af9..12b1d51 100644
--- a/test/bind.cpp
+++ b/test/bind.cpp
@@ -18,11 +18,12 @@
 #include <boost/mpl/next.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/apply_wrap.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_float.hpp>
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 namespace {
 
 struct f1
@@ -50,7 +51,7 @@ MPL_TEST_CASE() // basic argument binding
     typedef apply_wrap5< bind1<f1,_5>, void,void,void,void,int >::type r12;
     MPL_ASSERT(( boost::is_same<r11,int> ));
     MPL_ASSERT(( boost::is_same<r12,int> ));
-    
+
     typedef apply_wrap5< bind5<f5,_1,_2,_3,_4,_5>, void,void,void,void,int >::type r51;
     typedef apply_wrap5< bind5<f5,_5,_4,_3,_2,_1>, int,void,void,void,void >::type r52;
     MPL_ASSERT(( boost::is_same<r51,int> ));
@@ -83,7 +84,7 @@ MPL_TEST_CASE() // if_ evaluation
     typedef bind3< quote3<if_>, _1, bind1< quote1<next>, _2>, _3 > f;
     typedef apply_wrap3< f,true_,int_<0>,int >::type r1;
     typedef apply_wrap3< f,false_,int,int_<0> >::type r2;
-    
+
     MPL_ASSERT(( boost::is_same<r1,int_<1> > ));
     MPL_ASSERT(( boost::is_same<r2,int_<0> > ));
 }
diff --git a/test/contains.cpp b/test/contains.cpp
index 1452a38..47fe6a0 100644
--- a/test/contains.cpp
+++ b/test/contains.cpp
@@ -13,10 +13,10 @@
 
 #include <boost/mpl/contains.hpp>
 #include <boost/mpl/vector.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
-{    
+{
     typedef vector<int,char,long,short,char,long,double,long>::type types;
 
     MPL_ASSERT(( contains< types,short > ));
diff --git a/test/copy.cpp b/test/copy.cpp
index a776f55..40d379d 100644
--- a/test/copy.cpp
+++ b/test/copy.cpp
@@ -34,7 +34,7 @@
 #include <boost/mpl/pop_back_fwd.hpp>
 #include <boost/mpl/back_fwd.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/copy_if.cpp b/test/copy_if.cpp
index 698b4d7..2446b27 100644
--- a/test/copy_if.cpp
+++ b/test/copy_if.cpp
@@ -22,7 +22,7 @@
 #include <boost/mpl/size.hpp>
 #include <boost/type_traits/is_float.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/count.cpp b/test/count.cpp
index 7d96fee..54c6d17 100644
--- a/test/count.cpp
+++ b/test/count.cpp
@@ -16,7 +16,7 @@
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/vector_c.hpp>
 #include <boost/mpl/integral_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
@@ -28,7 +28,7 @@ MPL_TEST_CASE()
     MPL_ASSERT_RELATION( (count<types,long>::value), ==, 3 );
     MPL_ASSERT_RELATION( (count<types,unsigned>::value), ==, 0 );
 }
-    
+
 MPL_TEST_CASE()
 {
     typedef vector_c<int,1,0,5,1,7,5,0,5> values;
diff --git a/test/count_if.cpp b/test/count_if.cpp
index 598ffee..2022db2 100644
--- a/test/count_if.cpp
+++ b/test/count_if.cpp
@@ -16,16 +16,17 @@
 #include <boost/mpl/vector_c.hpp>
 #include <boost/mpl/comparison.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_float.hpp>
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 MPL_TEST_CASE()
 {
     typedef vector<int,char&,long,short,char&,long,double,long> types;
     typedef vector_c<int,1,0,5,1,7,5,0,5> values;
-    
+
     MPL_ASSERT_RELATION( (count_if< types, boost::is_float<_> >::value), ==, 1 );
     MPL_ASSERT_RELATION( (count_if< types, boost::is_same<_,char&> >::value), ==, 2 );
     MPL_ASSERT_RELATION( (count_if< types, boost::is_same<_,void*> >::value), ==, 0 );
diff --git a/test/deque.cpp b/test/deque.cpp
index c133260..51518d5 100644
--- a/test/deque.cpp
+++ b/test/deque.cpp
@@ -21,9 +21,8 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/empty.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
@@ -54,11 +53,11 @@ MPL_TEST_CASE()
 MPL_TEST_CASE()
 {
     typedef deque<char,long> d2;
-    
+
     typedef begin<d2>::type i1;
     typedef next<i1>::type  i2;
     typedef next<i2>::type  i3;
-    
+
     MPL_ASSERT(( boost::is_same<deref<i1>::type,char> ));
     MPL_ASSERT(( boost::is_same<deref<i2>::type,long> ));
     MPL_ASSERT(( boost::is_same< i3, end<d2>::type > ));
diff --git a/test/distance.cpp b/test/distance.cpp
index 879dd53..9f3ada0 100644
--- a/test/distance.cpp
+++ b/test/distance.cpp
@@ -15,7 +15,7 @@
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/range_c.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()
@@ -23,7 +23,7 @@ MPL_TEST_CASE()
     typedef list<char,short,int,long>::type list;
     typedef begin<list>::type first;
     typedef end<list>::type last;
-    
+
     MPL_ASSERT_RELATION( (mpl::distance<first,last>::value), ==, 4 );
 }
 
@@ -32,6 +32,6 @@ MPL_TEST_CASE()
     typedef range_c<int,0,10>::type range;
     typedef begin<range>::type first;
     typedef end<range>::type last;
-    
+
     MPL_ASSERT_RELATION( (mpl::distance<first,last>::value), ==, 10 );
 }
diff --git a/test/empty.cpp b/test/empty.cpp
index 7e73b36..dc6ed69 100644
--- a/test/empty.cpp
+++ b/test/empty.cpp
@@ -14,7 +14,7 @@
 #include <boost/mpl/empty.hpp>
 
 #include <boost/mpl/list/list10.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/empty_sequence.cpp b/test/empty_sequence.cpp
index a9501cc..6296354 100644
--- a/test/empty_sequence.cpp
+++ b/test/empty_sequence.cpp
@@ -17,10 +17,10 @@
 #include <boost/mpl/distance.hpp>
 #include <boost/mpl/advance.hpp>
 #include <boost/mpl/begin_end.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/add_pointer.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/equal.cpp b/test/equal.cpp
index 19390ef..54dbaaf 100644
--- a/test/equal.cpp
+++ b/test/equal.cpp
@@ -14,7 +14,7 @@
 #include <boost/mpl/equal.hpp>
 
 #include <boost/mpl/list.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
@@ -22,7 +22,7 @@ MPL_TEST_CASE()
     typedef list<int,float,long,double,char,long,double,float> list2;
     typedef list<int,float,long,double,char,long,double,short> list3;
     typedef list<int,float,long,double,char,long,double> list4;
-    
+
     MPL_ASSERT(( equal<list1,list2> ));
     MPL_ASSERT(( equal<list2,list1> ));
     MPL_ASSERT_NOT(( equal<list2,list3> ));
diff --git a/test/erase.cpp b/test/erase.cpp
index 6c90b90..5d4f312 100644
--- a/test/erase.cpp
+++ b/test/erase.cpp
@@ -18,15 +18,15 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/integral_c.hpp>
 #include <boost/mpl/begin_end.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
     typedef list<int,char,long,short,char,long,double,long> types;
     typedef find<types,short>::type iter;
-    
+
     typedef erase<types, iter>::type result;
     MPL_ASSERT_RELATION( size<result>::value, ==, 7 );
 
diff --git a/test/erase_range.cpp b/test/erase_range.cpp
index b8f456d..0795863 100644
--- a/test/erase_range.cpp
+++ b/test/erase_range.cpp
@@ -16,8 +16,8 @@
 #include <boost/mpl/find.hpp>
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/begin_end.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
@@ -27,7 +27,7 @@ MPL_TEST_CASE()
     typedef find<types,double>::type iter2;
 
     typedef erase<types,iter1,iter2>::type result;
-    
+
     MPL_ASSERT_RELATION( size<result>::value, ==, 5 );
 
     typedef find<result,unsigned>::type iter;
diff --git a/test/filter_view.cpp b/test/filter_view.cpp
index 35210a5..05ee78d 100644
--- a/test/filter_view.cpp
+++ b/test/filter_view.cpp
@@ -18,10 +18,10 @@
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/sizeof.hpp>
 #include <boost/mpl/deref.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_float.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/find.cpp b/test/find.cpp
index 0a01599..0c5dd58 100644
--- a/test/find.cpp
+++ b/test/find.cpp
@@ -17,17 +17,17 @@
 #include <boost/mpl/distance.hpp>
 #include <boost/mpl/begin_end.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
-{    
+{
     typedef list<int,char,long,short,char,long,double,long>::type types;
     typedef list_c<int,1,0,5,1,7,5,0,5> values;
 
     typedef find<types, short>::type types_iter;
     typedef find< values, integral_c<int,7> >::type values_iter;
-   
+
     MPL_ASSERT(( is_same< deref<types_iter>::type, short> ));
     MPL_ASSERT_RELATION( deref<values_iter>::type::value, ==, 7 );
 
diff --git a/test/find_if.cpp b/test/find_if.cpp
index 0d0ce89..540b478 100644
--- a/test/find_if.cpp
+++ b/test/find_if.cpp
@@ -16,11 +16,12 @@
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/distance.hpp>
 #include <boost/mpl/size.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_float.hpp>
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 typedef vector<int,char,long,short,char,long,double,float,char>::type types;
 typedef begin<types>::type first_;
 
diff --git a/test/fold.cpp b/test/fold.cpp
index 48f4758..e37e355 100644
--- a/test/fold.cpp
+++ b/test/fold.cpp
@@ -27,7 +27,7 @@
 #include <boost/mpl/size.hpp>
 #include <boost/type_traits/is_float.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/front.cpp b/test/front.cpp
index b28dffe..35612ce 100644
--- a/test/front.cpp
+++ b/test/front.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/mpl/front.hpp>
 #include <boost/mpl/range_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 template< typename Seq, int value > struct front_test
 {
diff --git a/test/index_of.cpp b/test/index_of.cpp
index bffd321..ea960c4 100644
--- a/test/index_of.cpp
+++ b/test/index_of.cpp
@@ -15,7 +15,7 @@
 #include <boost/mpl/index_of.hpp>
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/void.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/inherit.cpp b/test/inherit.cpp
index 57f72c1..c293870 100644
--- a/test/inherit.cpp
+++ b/test/inherit.cpp
@@ -12,8 +12,8 @@
 // $Revision$
 
 #include <boost/mpl/inherit.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 struct her { typedef her herself; };
 struct my { typedef my myself; };
@@ -25,10 +25,10 @@ MPL_TEST_CASE()
     typedef inherit<her,my>::type her_my1;
     MPL_ASSERT(( is_same<her_my1::herself, her> ));
     MPL_ASSERT(( is_same<her_my1::myself, my> ));
-    
+
     typedef inherit<empty_base,her>::type her1;
     MPL_ASSERT(( is_same<her1, her> ));
-    
+
     typedef inherit<empty_base,her,empty_base,empty_base>::type her2;
     MPL_ASSERT(( is_same<her2, her> ));
 
diff --git a/test/insert.cpp b/test/insert.cpp
index f293cbb..51e9ed8 100644
--- a/test/insert.cpp
+++ b/test/insert.cpp
@@ -18,14 +18,14 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/range_c.hpp>
 #include <boost/mpl/equal.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
     typedef vector_c<int,0,1,3,4,5,6,7,8,9> numbers;
     typedef find< numbers,integral_c<int,3> >::type pos;
     typedef insert< numbers,pos,integral_c<int,2> >::type range;
-    
+
     MPL_ASSERT_RELATION( size<range>::value, ==, 10 );
     MPL_ASSERT(( equal< range,range_c<int,0,10> > ));
 }
diff --git a/test/insert_range.cpp b/test/insert_range.cpp
index 65e16fa..5a96744 100644
--- a/test/insert_range.cpp
+++ b/test/insert_range.cpp
@@ -19,7 +19,7 @@
 #include <boost/mpl/range_c.hpp>
 #include <boost/mpl/equal.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/is_placeholder.cpp b/test/is_placeholder.cpp
index b90b3a3..16be52a 100644
--- a/test/is_placeholder.cpp
+++ b/test/is_placeholder.cpp
@@ -13,12 +13,12 @@
 
 #include <boost/mpl/is_placeholder.hpp>
 #include <boost/mpl/placeholders.hpp>
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/preprocessor/repeat.hpp>
 #include <boost/preprocessor/inc.hpp>
 #include <boost/preprocessor/cat.hpp>
-    
+
+#include "test.hpp"
+
 #define AUX_IS_PLACEHOLDER_TEST(unused1, n, unused2) \
     { MPL_ASSERT(( is_placeholder< \
           BOOST_PP_CAT(_,BOOST_PP_INC(n)) \
@@ -33,7 +33,7 @@ MPL_TEST_CASE()
     MPL_ASSERT_NOT(( is_placeholder<abstract> ));
     MPL_ASSERT_NOT(( is_placeholder<noncopyable> ));
     MPL_ASSERT(( is_placeholder<_> ));
-    
+
     BOOST_PP_REPEAT(
           BOOST_MPL_LIMIT_METAFUNCTION_ARITY
         , AUX_IS_PLACEHOLDER_TEST
diff --git a/test/is_sequence.cpp b/test/is_sequence.cpp
index 1efa817..afc3cfb 100644
--- a/test/is_sequence.cpp
+++ b/test/is_sequence.cpp
@@ -16,7 +16,7 @@
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/range_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 template< typename T > struct std_vector
 {
diff --git a/test/iterator_tags.cpp b/test/iterator_tags.cpp
index 6840161..c1fec88 100644
--- a/test/iterator_tags.cpp
+++ b/test/iterator_tags.cpp
@@ -14,7 +14,7 @@
 #include <boost/mpl/iterator_tags.hpp>
 
 #include <boost/mpl/less.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/joint_view.cpp b/test/joint_view.cpp
index abc9051..0855c23 100644
--- a/test/joint_view.cpp
+++ b/test/joint_view.cpp
@@ -17,10 +17,9 @@
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/size.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/type_traits/is_same.hpp>
-
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
@@ -39,10 +38,10 @@ template< typename View > struct test_is_empty
 {
     typedef typename begin<View>::type first_;
     typedef typename end<View>::type last_;
-    
+
     MPL_ASSERT_RELATION( size<View>::value, ==, 0 );
     MPL_ASSERT(( is_same< first_,last_> ));
-    
+
     MPL_ASSERT_INSTANTIATION( View );
     MPL_ASSERT_INSTANTIATION( first_ );
     MPL_ASSERT_INSTANTIATION( last_ );
diff --git a/test/lambda.cpp b/test/lambda.cpp
index 22e6236..77b5ec0 100644
--- a/test/lambda.cpp
+++ b/test/lambda.cpp
@@ -20,10 +20,9 @@
 #include <boost/mpl/sizeof.hpp>
 #include <boost/mpl/apply.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_float.hpp>
+#include "test.hpp"
 
 struct my
 {
@@ -73,6 +72,6 @@ MPL_TEST_CASE()
     // bind <-> lambda interaction
     typedef lambda< less<_1,_2> >::type pred;
     typedef bind2< pred, _1, int_<4> > f;
-    
+
     MPL_ASSERT(( apply_wrap1< f,int_<3> > ));
 }
diff --git a/test/lambda_args.cpp b/test/lambda_args.cpp
index 0df6b86..2008304 100644
--- a/test/lambda_args.cpp
+++ b/test/lambda_args.cpp
@@ -13,11 +13,11 @@
 
 #include <boost/mpl/lambda.hpp>
 #include <boost/mpl/apply.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/mpl/aux_/config/gcc.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
 
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 typedef int UDT::* mem_ptr;
 typedef int (UDT::* mem_fun_ptr)();
diff --git a/test/list.cpp b/test/list.cpp
index 78da46f..fbb5022 100644
--- a/test/list.cpp
+++ b/test/list.cpp
@@ -18,9 +18,8 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/empty.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()
@@ -48,11 +47,11 @@ MPL_TEST_CASE()
 MPL_TEST_CASE()
 {
     typedef list2<char,long> l2;
-    
+
     typedef begin<l2>::type i1;
     typedef next<i1>::type  i2;
     typedef next<i2>::type  i3;
-    
+
     MPL_ASSERT(( is_same<deref<i1>::type,char> ));
     MPL_ASSERT(( is_same<deref<i2>::type,long> ));
     MPL_ASSERT(( is_same< i3, end<l2>::type > ));
diff --git a/test/list_c.cpp b/test/list_c.cpp
index 3d28058..93457c1 100644
--- a/test/list_c.cpp
+++ b/test/list_c.cpp
@@ -16,7 +16,7 @@
 #include <boost/mpl/size.hpp>
 #include <boost/static_assert.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 #include <boost/type_traits/is_same.hpp>
 
@@ -72,11 +72,11 @@ MPL_TEST_CASE()
     typedef list_c<unsigned,2,1> l2;
 
     MPL_ASSERT(( is_same< l2::value_type, unsigned > ));
-    
+
     typedef begin<l2>::type i1;
     typedef next<i1>::type  i2;
     typedef next<i2>::type  i3;
-    
+
     MPL_ASSERT_RELATION( deref<i1>::type::value, ==, 2 );
     MPL_ASSERT_RELATION( deref<i2>::type::value, ==, 1 );
     MPL_ASSERT(( is_same< i3, end<l2>::type > ));
diff --git a/test/lower_bound.cpp b/test/lower_bound.cpp
index 95be40d..2e9da14 100644
--- a/test/lower_bound.cpp
+++ b/test/lower_bound.cpp
@@ -16,13 +16,13 @@
 #include <boost/mpl/list_c.hpp>
 #include <boost/mpl/less.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
     typedef list_c<int,1,2,3,3,3,5,8> numbers;
     typedef lower_bound< numbers, int_<4> >::type iter;
-    
+
     MPL_ASSERT_RELATION( (mpl::distance< begin<numbers>::type,iter >::value), ==, 5 );
     MPL_ASSERT_RELATION( deref<iter>::type::value, ==, 5 );
 }
diff --git a/test/map.cpp b/test/map.cpp
index 17ad99d..53e920f 100644
--- a/test/map.cpp
+++ b/test/map.cpp
@@ -26,7 +26,7 @@
 #include <boost/mpl/begin_end.hpp>
 #include <boost/type_traits/is_same.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()
@@ -41,7 +41,7 @@ MPL_TEST_CASE()
     MPL_ASSERT_RELATION( size<m>::type::value, ==, 1 );
     MPL_ASSERT_NOT(( empty<m> ));
     MPL_ASSERT(( is_same< clear<m>::type,map0<> > ));
-    
+
     MPL_ASSERT(( is_same< at<m,int>::type,unsigned > ));
     MPL_ASSERT(( is_same< at<m,char>::type,void_ > ));
     MPL_ASSERT(( contains< m,mpl::pair<int,unsigned> > ));
@@ -50,7 +50,7 @@ MPL_TEST_CASE()
 
     MPL_ASSERT_NOT(( has_key<m,char>::type ));
     MPL_ASSERT(( has_key<m,int>::type ));
-    
+
     MPL_ASSERT_NOT(( is_same< order<m,int>::type, void_ > ));
     MPL_ASSERT(( is_same< order<m,char>::type,void_ > ));
 
@@ -126,7 +126,7 @@ MPL_TEST_CASE()
 MPL_TEST_CASE()
 {
     typedef map0<> m;
-    
+
     MPL_ASSERT_RELATION( size<m>::type::value, ==, 0 );
     MPL_ASSERT(( empty<m>::type ));
 
@@ -177,20 +177,20 @@ MPL_TEST_CASE()
 {
     typedef map< mpl::pair<int,int*> > map_of_1_pair;
     typedef begin<map_of_1_pair>::type iter_to_1_pair;
-    
+
     BOOST_MPL_ASSERT((
         is_same<
              deref<iter_to_1_pair>::type
            , mpl::pair<int,int*>
         >
     ));
-    
+
     typedef map<
         mpl::pair<int,int*>
       , mpl::pair<long,long*>
       , mpl::pair<char,char*>
     > mymap;
-    
+
     test<mymap>();
     test<mymap::type>();
 }
diff --git a/test/max_element.cpp b/test/max_element.cpp
index 65bb0f3..c4ac82c 100644
--- a/test/max_element.cpp
+++ b/test/max_element.cpp
@@ -14,13 +14,13 @@
 #include <boost/mpl/max_element.hpp>
 
 #include <boost/mpl/list_c.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
     typedef list_c<int,3,4,2,0,-5,8,-1,7>::type numbers;
     typedef max_element< numbers >::type iter;
     typedef deref<iter>::type max_value;
-    
+
     MPL_ASSERT_RELATION( max_value::value, ==, 8 );
 }
diff --git a/test/multiset.cpp b/test/multiset.cpp
index 8c31e3f..9455c88 100644
--- a/test/multiset.cpp
+++ b/test/multiset.cpp
@@ -16,7 +16,6 @@
 
 #include <boost/mpl/insert.hpp>
 #include <boost/mpl/count.hpp>
-#include <boost/mpl/aux_/test.hpp>
 
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/size.hpp>
@@ -24,6 +23,7 @@
 
 #include <boost/config.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 /*
 struct test_data1
@@ -93,16 +93,16 @@ void find_test()
 
 MPL_TEST_CASE()
 {
-    // agurt 11/jun/06: multiset does not implement iterators yet!    
+    // agurt 11/jun/06: multiset does not implement iterators yet!
     // typedef insert<multiset0<>, int>::type set_of_1_int;
     // typedef begin<set_of_1_int>::type iter_to_1_int;
     // BOOST_MPL_ASSERT(( is_same< deref<iter_to_1_int>::type, int > ));
-    
+
     typedef multiset0<> s0;
     typedef insert<s0,int>::type s1;
     typedef insert<s1,long>::type s2;
     typedef insert<s2,char>::type myset;
-    
+
     // find_test<myset>();
     // find_test<myset::type>();
 }
diff --git a/test/next.cpp b/test/next.cpp
index 3da997e..2681def 100644
--- a/test/next.cpp
+++ b/test/next.cpp
@@ -14,8 +14,8 @@
 #include <boost/mpl/next.hpp>
 #include <boost/mpl/prior.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/pair_view.cpp b/test/pair_view.cpp
index af2a0cc..a32f5c2 100644
--- a/test/pair_view.cpp
+++ b/test/pair_view.cpp
@@ -16,31 +16,31 @@
 #include <boost/mpl/vector/vector50_c.hpp>
 #include <boost/mpl/range_c.hpp>
 #include <boost/mpl/distance.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()
 {
     typedef range_c<int,0,10> r;
     typedef vector10_c<int,9,8,7,6,5,4,3,2,1,10> v;
-    
+
     typedef pair_view<r,v> view;
     typedef begin<view>::type first_;
     typedef end<view>::type last_;
 
     MPL_ASSERT(( is_same< first_::category, mpl::random_access_iterator_tag > ));
-    
+
     MPL_ASSERT(( is_same< advance_c<first_,0>::type, first_ > ));
     MPL_ASSERT(( is_same< advance_c<last_,0>::type, last_ > ));
     MPL_ASSERT(( is_same< advance_c<first_,10>::type, last_ > ));
     MPL_ASSERT(( is_same< advance_c<last_,-10>::type, first_ > ));
-    
+
     typedef advance_c<first_,5>::type iter;
-    
+
     MPL_ASSERT(( is_same< 
           deref<iter>::type
         , mpl::pair< integral_c<int,5>,integral_c<int,4> >
-        > )); 
-    
+        > ));
+
 }
diff --git a/test/partition.cpp b/test/partition.cpp
index 947c310..21901b9 100644
--- a/test/partition.cpp
+++ b/test/partition.cpp
@@ -19,7 +19,8 @@
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/modulus.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
+
+#include "test.hpp"
 
 template< typename N > struct is_odd
     : modulus< N, int_<2> > 
diff --git a/test/pop_front.cpp b/test/pop_front.cpp
index 70fe120..b8fde2d 100644
--- a/test/pop_front.cpp
+++ b/test/pop_front.cpp
@@ -15,8 +15,8 @@
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/front.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
@@ -27,11 +27,11 @@ MPL_TEST_CASE()
     typedef pop_front<types1>::type result1;
     typedef pop_front<types2>::type result2;
     typedef pop_front<types3>::type result3;
-    
+
     MPL_ASSERT_RELATION( size<result1>::value, ==, 0 );
     MPL_ASSERT_RELATION( size<result2>::value, ==, 1 );
     MPL_ASSERT_RELATION( size<result3>::value, ==, 2 );
-    
+
     MPL_ASSERT(( is_same< front<result2>::type, long > ));
     MPL_ASSERT(( is_same< front<result3>::type, int > ));
 }
diff --git a/test/push_back.cpp b/test/push_back.cpp
index 1e75cad..0e10090 100644
--- a/test/push_back.cpp
+++ b/test/push_back.cpp
@@ -13,9 +13,8 @@
 
 #include <boost/mpl/push_back.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 struct no_push_back_tag {};
 
diff --git a/test/push_front.cpp b/test/push_front.cpp
index 3307824..33db1e2 100644
--- a/test/push_front.cpp
+++ b/test/push_front.cpp
@@ -18,10 +18,10 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/front.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 struct no_push_front_tag {};
 
 struct no_push_front
@@ -34,15 +34,15 @@ MPL_TEST_CASE()
     typedef push_front<list0<>,long>::type res1;
     typedef push_front<list1<long>,int>::type res2;
     typedef push_front<list2<int,long>,char>::type res3;
-    
+
     MPL_ASSERT_RELATION( size<res1>::value, ==, 1 );
     MPL_ASSERT_RELATION( size<res2>::value, ==, 2 );
     MPL_ASSERT_RELATION( size<res3>::value, ==, 3 );
-    
+
     MPL_ASSERT(( is_same< front<res1>::type, long > ));
     MPL_ASSERT(( is_same< front<res2>::type, int > ));
     MPL_ASSERT(( is_same< front<res3>::type, char > ));
-    
+
     MPL_ASSERT(( has_push_front< list0<> > ));
     MPL_ASSERT(( has_push_front< list1<long> > ));
 
diff --git a/test/quote.cpp b/test/quote.cpp
index 45e97f8..f57e178 100644
--- a/test/quote.cpp
+++ b/test/quote.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/mpl/quote.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 template< typename T > struct f1
 {
@@ -36,7 +36,7 @@ MPL_TEST_CASE()
 {
     typedef quote1<f1>::apply<int>::type t1;
     typedef quote5<f5>::apply<char,short,int,long,float>::type t5;
-    
+
     MPL_ASSERT(( boost::is_same< t1, int > ));
     MPL_ASSERT(( boost::is_same< t5, f5<char,short,int,long,float> > ));
 }
diff --git a/test/range_c.cpp b/test/range_c.cpp
index 7241bbe..04a6056 100644
--- a/test/range_c.cpp
+++ b/test/range_c.cpp
@@ -18,8 +18,8 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/front.hpp>
 #include <boost/mpl/back.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/remove.cpp b/test/remove.cpp
index 6147b08..3ebe148 100644
--- a/test/remove.cpp
+++ b/test/remove.cpp
@@ -16,7 +16,7 @@
 #include <boost/mpl/vector/vector10.hpp>
 #include <boost/mpl/equal.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()
diff --git a/test/remove_if.cpp b/test/remove_if.cpp
index bf9d0ea..93b4a61 100644
--- a/test/remove_if.cpp
+++ b/test/remove_if.cpp
@@ -23,7 +23,7 @@
 #include <boost/mpl/size.hpp>
 #include <boost/type_traits/is_float.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/replace.cpp b/test/replace.cpp
index 4b3005b..2c42ffa 100644
--- a/test/replace.cpp
+++ b/test/replace.cpp
@@ -16,7 +16,7 @@
 
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/equal.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/replace_if.cpp b/test/replace_if.cpp
index 4fc690d..c8a7228 100644
--- a/test/replace_if.cpp
+++ b/test/replace_if.cpp
@@ -21,7 +21,7 @@
 #include <boost/mpl/greater.hpp>
 #include <boost/mpl/equal_to.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/reverse.cpp b/test/reverse.cpp
index 69b4a43..a5f9c1b 100644
--- a/test/reverse.cpp
+++ b/test/reverse.cpp
@@ -19,7 +19,7 @@
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/at.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/same_as.cpp b/test/same_as.cpp
index 41a7c57..03da8eb 100644
--- a/test/same_as.cpp
+++ b/test/same_as.cpp
@@ -12,9 +12,8 @@
 // $Revision$
 
 #include <boost/mpl/same_as.hpp>
-
 #include <boost/mpl/apply.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/set.cpp b/test/set.cpp
index fac17ae..976dd30 100644
--- a/test/set.cpp
+++ b/test/set.cpp
@@ -29,10 +29,10 @@
 #include <boost/mpl/empty.hpp>
 #include <boost/mpl/begin_end.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 // Use templates for testing so that GCC will show us the actual types involved
 
 template< typename s >
@@ -40,7 +40,7 @@ void empty_set_test()
 {
     MPL_ASSERT_RELATION( size<s>::value, ==, 0 );
     MPL_ASSERT(( empty<s> ));
-    
+
     MPL_ASSERT(( is_same< BOOST_DEDUCED_TYPENAME clear<s>::type, set0<> > ));
     MPL_ASSERT(( is_same< BOOST_DEDUCED_TYPENAME at<s,int>::type, void_ > ));
     MPL_ASSERT(( is_same< BOOST_DEDUCED_TYPENAME at<s,char>::type, void_ > ));
@@ -56,7 +56,7 @@ void empty_set_test()
     MPL_ASSERT(( is_same< o1, void_ > ));
     MPL_ASSERT(( is_same< o2, void_ > ));
     MPL_ASSERT(( is_same< o3, void_ > ));
-    
+
     typedef BOOST_DEDUCED_TYPENAME begin<s>::type first;
     typedef BOOST_DEDUCED_TYPENAME end<s>::type last;
 
@@ -70,7 +70,7 @@ void int_set_test()
 {
     MPL_ASSERT_RELATION( size<s>::value, ==, 1 );
     MPL_ASSERT_NOT(( empty<s> ));
-    
+
     MPL_ASSERT(( is_same< BOOST_DEDUCED_TYPENAME clear<s>::type, set0<> > ));
     MPL_ASSERT(( is_same< BOOST_DEDUCED_TYPENAME at<s,int>::type, int > ));
     MPL_ASSERT(( is_same< BOOST_DEDUCED_TYPENAME at<s,char>::type, void_ > ));
@@ -86,7 +86,7 @@ void int_set_test()
     MPL_ASSERT_NOT(( is_same< o1, void_ > ));
     MPL_ASSERT(( is_same< o2, void_ > ));
     MPL_ASSERT(( is_same< o3, void_ > ));
-    
+
     typedef BOOST_DEDUCED_TYPENAME begin<s>::type first;
     typedef BOOST_DEDUCED_TYPENAME end<s>::type last;
 
@@ -186,7 +186,7 @@ void basic_set_test()
     int_set_test< BOOST_DEDUCED_TYPENAME erase_key< 
           BOOST_DEDUCED_TYPENAME erase_key<S3,char>::type
         , long
-        >::type >();    
+        >::type >();
 
     int_char_set_test<S2>();
     int_char_set_test< BOOST_DEDUCED_TYPENAME insert<
@@ -206,7 +206,7 @@ void basic_set_test()
         , int
         >::type >();
 
-    int_char_long_set_test< BOOST_DEDUCED_TYPENAME insert<          
+    int_char_long_set_test< BOOST_DEDUCED_TYPENAME insert<
           BOOST_DEDUCED_TYPENAME insert<S1,long>::type
         , char
         >::type >();
diff --git a/test/set_c.cpp b/test/set_c.cpp
index 0c54c94..cbb7d72 100644
--- a/test/set_c.cpp
+++ b/test/set_c.cpp
@@ -16,9 +16,8 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/begin_end.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 namespace test { namespace {
 #if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)
@@ -70,7 +69,7 @@ MPL_TEST_CASE()
     typedef begin<s2>::type first2;
     typedef end<s2>::type last2;
     MPL_ASSERT_RELATION( (distance<first2, last2>::value), ==, 1 );
-    
+
     typedef begin<s3>::type first3;
     typedef end<s3>::type last3;
     MPL_ASSERT_RELATION( (distance<first3, last3>::value), ==, 2 );
@@ -97,7 +96,7 @@ MPL_TEST_CASE()
     MPL_ASSERT(( is_same< test::at_c<s1,'z'>::type, void_ > ));
     MPL_ASSERT(( is_same< test::at_c<s2,'k'>::type, void_ > ));
 #endif
-    
+
     typedef begin<s1>::type first1;
     typedef end<s1>::type last1;
     MPL_ASSERT_RELATION( (distance<first1, last1>::value), ==, 1 );
diff --git a/test/single_view.cpp b/test/single_view.cpp
index d860fa5..a97898b 100644
--- a/test/single_view.cpp
+++ b/test/single_view.cpp
@@ -15,8 +15,8 @@
 #include <boost/mpl/advance.hpp>
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/begin_end.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/size.cpp b/test/size.cpp
index 0c80711..cd815df 100644
--- a/test/size.cpp
+++ b/test/size.cpp
@@ -14,13 +14,13 @@
 #include <boost/mpl/size.hpp>
 
 #include <boost/mpl/list.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
     typedef list<> empty_list;
     typedef list<char,short,int,long> list;
-    
+
     MPL_ASSERT_RELATION( size<empty_list>::value, ==, 0 );
     MPL_ASSERT_RELATION( size<list>::value, ==, 4 );
 }
diff --git a/test/sort.cpp b/test/sort.cpp
index e461f70..db062f9 100644
--- a/test/sort.cpp
+++ b/test/sort.cpp
@@ -14,7 +14,7 @@
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/equal_to.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/stable_partition.cpp b/test/stable_partition.cpp
index e72d453..04447c7 100644
--- a/test/stable_partition.cpp
+++ b/test/stable_partition.cpp
@@ -18,7 +18,7 @@
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/comparison.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 typedef vector_c<int,3,4,0,-5,8,-1,7>::type numbers;
 typedef vector_c<int,0,-5,-1>::type manual_first;
diff --git a/test/transform.cpp b/test/transform.cpp
index 274e36f..c9b6a07 100644
--- a/test/transform.cpp
+++ b/test/transform.cpp
@@ -19,13 +19,13 @@
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/plus.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/mpl/aux_/config/gcc.hpp>
 #include <boost/mpl/aux_/config/workaround.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/add_pointer.hpp>
 
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/transform_view.cpp b/test/transform_view.cpp
index bc1fbcf..f3e7db2 100644
--- a/test/transform_view.cpp
+++ b/test/transform_view.cpp
@@ -16,7 +16,7 @@
 #include <boost/mpl/max_element.hpp>
 #include <boost/mpl/list.hpp>
 #include <boost/mpl/sizeof.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()
diff --git a/test/unique.cpp b/test/unique.cpp
index 2e1baa7..4e7f474 100644
--- a/test/unique.cpp
+++ b/test/unique.cpp
@@ -17,7 +17,7 @@
 #include <boost/mpl/equal.hpp>
 #include <boost/type_traits/is_same.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/unpack_args.cpp b/test/unpack_args.cpp
index d506535..dc62160 100644
--- a/test/unpack_args.cpp
+++ b/test/unpack_args.cpp
@@ -14,9 +14,10 @@
 #include <boost/mpl/unpack_args.hpp>
 
 #include <boost/mpl/vector/vector10.hpp>
-#include <boost/mpl/aux_/test.hpp>
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 MPL_TEST_CASE()
 {
     MPL_ASSERT(( apply1< 
diff --git a/test/upper_bound.cpp b/test/upper_bound.cpp
index 7d6ea3b..401f380 100644
--- a/test/upper_bound.cpp
+++ b/test/upper_bound.cpp
@@ -17,7 +17,7 @@
 #include <boost/mpl/list_c.hpp>
 #include <boost/mpl/less.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/mpl/aux_/test.hpp>
+#include "test.hpp"
 
 MPL_TEST_CASE()
 {
diff --git a/test/vector.cpp b/test/vector.cpp
index 8632399..50bd70f 100644
--- a/test/vector.cpp
+++ b/test/vector.cpp
@@ -23,10 +23,10 @@
 #include <boost/mpl/size.hpp>
 #include <boost/mpl/empty.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 
 MPL_TEST_CASE()
 {
diff --git a/test/vector_c.cpp b/test/vector_c.cpp
index 49afa9f..3606574 100644
--- a/test/vector_c.cpp
+++ b/test/vector_c.cpp
@@ -15,10 +15,10 @@
 #include <boost/mpl/front.hpp>
 #include <boost/mpl/size.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
 
+#include "test.hpp"
+
 #if !BOOST_WORKAROUND(BOOST_MSVC, <=1200)
 MPL_TEST_CASE()
 {
diff --git a/test/zip_view.cpp b/test/zip_view.cpp
index a8d9b03..ba971fb 100644
--- a/test/zip_view.cpp
+++ b/test/zip_view.cpp
@@ -23,9 +23,8 @@
 #include <boost/mpl/unpack_args.hpp>
 #include <boost/mpl/math/is_even.hpp>
 
-#include <boost/mpl/aux_/test.hpp>
-
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
 
 
 MPL_TEST_CASE()