diff --git a/test/add_const_test.cpp b/test/add_const_test.cpp
index b91535b..41fe75f 100644
--- a/test/add_const_test.cpp
+++ b/test/add_const_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/add_const.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(add_const_test_1, ::tt::add_const, const, const)
 BOOST_DECL_TRANSFORM_TEST(add_const_test_2, ::tt::add_const, volatile, volatile const)
diff --git a/test/add_cv_test.cpp b/test/add_cv_test.cpp
index c1f4353..c1a2702 100644
--- a/test/add_cv_test.cpp
+++ b/test/add_cv_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/add_cv.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(add_cv_test_1, ::tt::add_cv, const, const volatile)
 BOOST_DECL_TRANSFORM_TEST(add_cv_test_2, ::tt::add_cv, volatile, volatile const)
diff --git a/test/add_lvalue_reference_test.cpp b/test/add_lvalue_reference_test.cpp
index 0dd1af1..3a695c9 100644
--- a/test/add_lvalue_reference_test.cpp
+++ b/test/add_lvalue_reference_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/add_lvalue_reference.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(add_lvalue_reference_test_1, ::tt::add_lvalue_reference, const, const&)
 BOOST_DECL_TRANSFORM_TEST(add_lvalue_reference_test_2, ::tt::add_lvalue_reference, volatile, volatile&)
diff --git a/test/add_pointer_test.cpp b/test/add_pointer_test.cpp
index 3b52eda..3a97445 100644
--- a/test/add_pointer_test.cpp
+++ b/test/add_pointer_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/add_pointer.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(add_pointer_test_1, ::tt::add_pointer, const, const*)
 BOOST_DECL_TRANSFORM_TEST(add_pointer_test_2, ::tt::add_pointer, volatile, volatile*)
diff --git a/test/add_reference_test.cpp b/test/add_reference_test.cpp
index 35cf76c..368181b 100644
--- a/test/add_reference_test.cpp
+++ b/test/add_reference_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/add_reference.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(add_reference_test_1, ::tt::add_reference, const, const&)
 BOOST_DECL_TRANSFORM_TEST(add_reference_test_2, ::tt::add_reference, volatile, volatile&)
diff --git a/test/add_rvalue_reference_test.cpp b/test/add_rvalue_reference_test.cpp
index caa2869..ae0d75c 100644
--- a/test/add_rvalue_reference_test.cpp
+++ b/test/add_rvalue_reference_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "../../type_traits/test/test.hpp"
-#include "../../type_traits/test/check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/add_rvalue_reference.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
 
diff --git a/test/add_volatile_test.cpp b/test/add_volatile_test.cpp
index cc9aeed..d0c416c 100644
--- a/test/add_volatile_test.cpp
+++ b/test/add_volatile_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/add_volatile.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(add_volatile_test_1, ::tt::add_volatile, const, const volatile)
 BOOST_DECL_TRANSFORM_TEST(add_volatile_test_2, ::tt::add_volatile, volatile, volatile)
diff --git a/test/aligned_storage_a2_test.cpp b/test/aligned_storage_a2_test.cpp
index 229f402..f2a49ad 100644
--- a/test/aligned_storage_a2_test.cpp
+++ b/test/aligned_storage_a2_test.cpp
@@ -8,8 +8,6 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #  include <boost/type_traits/type_with_alignment.hpp> // max_align and long_long_type
@@ -18,6 +16,8 @@
 #  include <boost/type_traits/aligned_storage.hpp>
 #  include <boost/type_traits/is_pod.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 template <class T>
 union must_be_pod
diff --git a/test/aligned_storage_empy_test.cpp b/test/aligned_storage_empy_test.cpp
index 536b06d..3e19a37 100644
--- a/test/aligned_storage_empy_test.cpp
+++ b/test/aligned_storage_empy_test.cpp
@@ -4,8 +4,6 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #  include <boost/type_traits/type_with_alignment.hpp> // max_align and long_long_type
@@ -14,6 +12,8 @@
 #  include <boost/type_traits/aligned_storage.hpp>
 #  include <boost/type_traits/is_pod.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 
 namespace
diff --git a/test/aligned_storage_test.cpp b/test/aligned_storage_test.cpp
index 496ae2c..517a402 100644
--- a/test/aligned_storage_test.cpp
+++ b/test/aligned_storage_test.cpp
@@ -4,8 +4,6 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #  include <boost/type_traits/type_with_alignment.hpp> // max_align and long_long_type
@@ -14,6 +12,8 @@
 #  include <boost/type_traits/aligned_storage.hpp>
 #  include <boost/type_traits/is_pod.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 template <class T>
 union must_be_pod
diff --git a/test/alignment_of_a2_test.cpp b/test/alignment_of_a2_test.cpp
index fe6b66e..42f0fe3 100644
--- a/test/alignment_of_a2_test.cpp
+++ b/test/alignment_of_a2_test.cpp
@@ -8,13 +8,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/alignment_of.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 //
 // Need to defined some member functions for empty_UDT,
diff --git a/test/alignment_of_test.cpp b/test/alignment_of_test.cpp
index 7faaf84..5f92d07 100644
--- a/test/alignment_of_test.cpp
+++ b/test/alignment_of_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/alignment_of.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 //
 // Need to defined some member function for empty_UDT,
diff --git a/test/common_type_2_test.cpp b/test/common_type_2_test.cpp
index 114b4c2..84e81a2 100644
--- a/test/common_type_2_test.cpp
+++ b/test/common_type_2_test.cpp
@@ -7,13 +7,13 @@
 
 #define BOOST_COMMON_TYPE_DONT_USE_TYPEOF 1
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/common_type.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 #include <iostream>
 
 #ifdef BOOST_INTEL
diff --git a/test/common_type_3_test.cpp b/test/common_type_3_test.cpp
index fd228b8..7472304 100644
--- a/test/common_type_3_test.cpp
+++ b/test/common_type_3_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/common_type.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 #include <iostream>
 
 TT_TEST_BEGIN(common_type_3)
diff --git a/test/common_type_4_test.cpp b/test/common_type_4_test.cpp
index 3a6659f..d046b6a 100644
--- a/test/common_type_4_test.cpp
+++ b/test/common_type_4_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/common_type.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 #include <iostream>
 
 TT_TEST_BEGIN(common_type_4)
diff --git a/test/common_type_5_test.cpp b/test/common_type_5_test.cpp
index 0a0e237..6009372 100644
--- a/test/common_type_5_test.cpp
+++ b/test/common_type_5_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/common_type.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 #include <iostream>
 
 template<class T> struct X
diff --git a/test/common_type_6_test.cpp b/test/common_type_6_test.cpp
index e5ad774..7e6b323 100644
--- a/test/common_type_6_test.cpp
+++ b/test/common_type_6_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/common_type.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 #include <iostream>
 
 struct X {};
diff --git a/test/common_type_sfinae2_test.cpp b/test/common_type_sfinae2_test.cpp
index 2e585cf..8cc9730 100644
--- a/test/common_type_sfinae2_test.cpp
+++ b/test/common_type_sfinae2_test.cpp
@@ -4,14 +4,14 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/common_type.hpp>
 #  include <boost/type_traits/integral_constant.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 #include <iostream>
 
 typedef char(&s1)[1];
diff --git a/test/common_type_sfinae_test.cpp b/test/common_type_sfinae_test.cpp
index 55aa3fe..a88be83 100644
--- a/test/common_type_sfinae_test.cpp
+++ b/test/common_type_sfinae_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/common_type.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 #include <iostream>
 
 struct X {};
diff --git a/test/common_type_test.cpp b/test/common_type_test.cpp
index 3695a46..a01d1ba 100644
--- a/test/common_type_test.cpp
+++ b/test/common_type_test.cpp
@@ -5,13 +5,13 @@
 //  Distributed under the Boost Software License, Version 1.0.
 //  See http://www.boost.org/LICENSE_1_0.txt
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/common_type.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 #include <iostream>
 
 #ifdef BOOST_INTEL
diff --git a/test/conditional_test.cpp b/test/conditional_test.cpp
index 1cc3534..3afc398 100644
--- a/test/conditional_test.cpp
+++ b/test/conditional_test.cpp
@@ -4,14 +4,14 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/conditional.hpp>
 #endif
 #include <boost/type_traits/is_same.hpp>
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(conditional)
 
diff --git a/test/copy_cv_test.cpp b/test/copy_cv_test.cpp
index 2f4f281..6c5ec3e 100644
--- a/test/copy_cv_test.cpp
+++ b/test/copy_cv_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/copy_cv.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 #include <iostream>
 
 TT_TEST_BEGIN(copy_cv)
diff --git a/test/cxx14_aliases_test.cpp b/test/cxx14_aliases_test.cpp
index 3f7d6ab..4159398 100644
--- a/test/cxx14_aliases_test.cpp
+++ b/test/cxx14_aliases_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 #include <iostream>
 
 TT_TEST_BEGIN(cxx14_aliases_test)
diff --git a/test/decay_test.cpp b/test/decay_test.cpp
index cf22e15..71c11ec 100644
--- a/test/decay_test.cpp
+++ b/test/decay_test.cpp
@@ -4,15 +4,15 @@
 //  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 "test.hpp"
-#include "check_type.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/decay.hpp>
 #  include <boost/type_traits/is_same.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
+#include "check_integral_constant.hpp"
 #include <iostream>
 #include <string>
 #include <utility>
diff --git a/test/extent_test.cpp b/test/extent_test.cpp
index 007896c..d8f4d7c 100644
--- a/test/extent_test.cpp
+++ b/test/extent_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/extent.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(extent)
 
diff --git a/test/function_traits_test.cpp b/test/function_traits_test.cpp
index f08e810..01f712a 100644
--- a/test/function_traits_test.cpp
+++ b/test/function_traits_test.cpp
@@ -4,14 +4,14 @@
 //  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 "test.hpp"
-#include "check_type.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/function_traits.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
+#include "check_integral_constant.hpp"
 
 typedef void(pf_zero1)();
 typedef int(pf_zero2)();
diff --git a/test/has_binary_classes0_test.cpp b/test/has_binary_classes0_test.cpp
index a0aa635..1c6978b 100644
--- a/test/has_binary_classes0_test.cpp
+++ b/test/has_binary_classes0_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_binary_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_binary_classes1_test.cpp b/test/has_binary_classes1_test.cpp
index 136e3b8..636e622 100644
--- a/test/has_binary_classes1_test.cpp
+++ b/test/has_binary_classes1_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_binary_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_binary_classes2_test.cpp b/test/has_binary_classes2_test.cpp
index 4ce7f0b..ed681fd 100644
--- a/test/has_binary_classes2_test.cpp
+++ b/test/has_binary_classes2_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_binary_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_binary_classes3_test.cpp b/test/has_binary_classes3_test.cpp
index bf9355e..5013454 100644
--- a/test/has_binary_classes3_test.cpp
+++ b/test/has_binary_classes3_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_binary_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_binary_classes4_test.cpp b/test/has_binary_classes4_test.cpp
index 50b8688..49c6c54 100644
--- a/test/has_binary_classes4_test.cpp
+++ b/test/has_binary_classes4_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_binary_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_binary_classes5_test.cpp b/test/has_binary_classes5_test.cpp
index ffed104..0169888 100644
--- a/test/has_binary_classes5_test.cpp
+++ b/test/has_binary_classes5_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_binary_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_binary_classes6_test.cpp b/test/has_binary_classes6_test.cpp
index c9f67ab..d09aa68 100644
--- a/test/has_binary_classes6_test.cpp
+++ b/test/has_binary_classes6_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_binary_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_binary_classes7_test.cpp b/test/has_binary_classes7_test.cpp
index 25802d2..1792b74 100644
--- a/test/has_binary_classes7_test.cpp
+++ b/test/has_binary_classes7_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_binary_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_binary_classes8_test.cpp b/test/has_binary_classes8_test.cpp
index c1eac81..30d85ca 100644
--- a/test/has_binary_classes8_test.cpp
+++ b/test/has_binary_classes8_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_binary_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_binary_classes9_test.cpp b/test/has_binary_classes9_test.cpp
index 3f9d639..420bda1 100644
--- a/test/has_binary_classes9_test.cpp
+++ b/test/has_binary_classes9_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_binary_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_bit_and_assign_test.cpp b/test/has_bit_and_assign_test.cpp
index 3be7994..13e2ee2 100644
--- a/test/has_bit_and_assign_test.cpp
+++ b/test/has_bit_and_assign_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_bit_and_assign.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_bit_and_assign
 #define BOOST_TT_TRAIT_OP &=
diff --git a/test/has_bit_and_test.cpp b/test/has_bit_and_test.cpp
index 4a2cfe6..7daac17 100644
--- a/test/has_bit_and_test.cpp
+++ b/test/has_bit_and_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_bit_and.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_bit_and
 #define BOOST_TT_TRAIT_OP &
diff --git a/test/has_bit_or_assign_test.cpp b/test/has_bit_or_assign_test.cpp
index ffacf90..c1baaa0 100644
--- a/test/has_bit_or_assign_test.cpp
+++ b/test/has_bit_or_assign_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_bit_or_assign.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_bit_or_assign
 #define BOOST_TT_TRAIT_OP |=
diff --git a/test/has_bit_or_test.cpp b/test/has_bit_or_test.cpp
index 8418e11..2c50a68 100644
--- a/test/has_bit_or_test.cpp
+++ b/test/has_bit_or_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_bit_or.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_bit_or
 #define BOOST_TT_TRAIT_OP |
diff --git a/test/has_bit_xor_assign_test.cpp b/test/has_bit_xor_assign_test.cpp
index 49301c5..cfedbfc 100644
--- a/test/has_bit_xor_assign_test.cpp
+++ b/test/has_bit_xor_assign_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_bit_xor_assign.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_bit_xor_assign
 #define BOOST_TT_TRAIT_OP ^=
diff --git a/test/has_bit_xor_test.cpp b/test/has_bit_xor_test.cpp
index 659afc5..6df2296 100644
--- a/test/has_bit_xor_test.cpp
+++ b/test/has_bit_xor_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_bit_xor.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_bit_xor
 #define BOOST_TT_TRAIT_OP ^
diff --git a/test/has_complement_test.cpp b/test/has_complement_test.cpp
index 627f7c5..f761ac4 100644
--- a/test/has_complement_test.cpp
+++ b/test/has_complement_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_complement.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_complement
 #define BOOST_TT_TRAIT_OP ~
diff --git a/test/has_dereference_test.cpp b/test/has_dereference_test.cpp
index 52ca780..21aaa05 100644
--- a/test/has_dereference_test.cpp
+++ b/test/has_dereference_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_dereference.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_dereference
 #define BOOST_TT_TRAIT_OP *
diff --git a/test/has_divides_assign_test.cpp b/test/has_divides_assign_test.cpp
index 5b9565b..9c8938b 100644
--- a/test/has_divides_assign_test.cpp
+++ b/test/has_divides_assign_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_divides_assign.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_divides_assign
 #define BOOST_TT_TRAIT_OP /=
diff --git a/test/has_divides_test.cpp b/test/has_divides_test.cpp
index bdc129c..ca409c6 100644
--- a/test/has_divides_test.cpp
+++ b/test/has_divides_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_divides.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_divides
 #define BOOST_TT_TRAIT_OP /
diff --git a/test/has_equal_to_test.cpp b/test/has_equal_to_test.cpp
index 65a0ff2..d987065 100644
--- a/test/has_equal_to_test.cpp
+++ b/test/has_equal_to_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_equal_to.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_equal_to
 #define BOOST_TT_TRAIT_OP ==
diff --git a/test/has_greater_equal_test.cpp b/test/has_greater_equal_test.cpp
index f3d9d33..835daf1 100644
--- a/test/has_greater_equal_test.cpp
+++ b/test/has_greater_equal_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_greater_equal.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_greater_equal
 #define BOOST_TT_TRAIT_OP >=
diff --git a/test/has_greater_test.cpp b/test/has_greater_test.cpp
index 3082765..bdaf46e 100644
--- a/test/has_greater_test.cpp
+++ b/test/has_greater_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_greater.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_greater
 #define BOOST_TT_TRAIT_OP >
diff --git a/test/has_left_shift_assign_test.cpp b/test/has_left_shift_assign_test.cpp
index 50de829..cdf2229 100644
--- a/test/has_left_shift_assign_test.cpp
+++ b/test/has_left_shift_assign_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_left_shift_assign.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_left_shift_assign
 #define BOOST_TT_TRAIT_OP <<=
diff --git a/test/has_left_shift_test.cpp b/test/has_left_shift_test.cpp
index 556267c..8dc6979 100644
--- a/test/has_left_shift_test.cpp
+++ b/test/has_left_shift_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_left_shift.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_left_shift
 #define BOOST_TT_TRAIT_OP <<
diff --git a/test/has_less_equal_test.cpp b/test/has_less_equal_test.cpp
index b5b8d5e..2165787 100644
--- a/test/has_less_equal_test.cpp
+++ b/test/has_less_equal_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_less_equal.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_less_equal
 #define BOOST_TT_TRAIT_OP <=
diff --git a/test/has_less_test.cpp b/test/has_less_test.cpp
index 12ff5b7..0be6b05 100644
--- a/test/has_less_test.cpp
+++ b/test/has_less_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_less.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_less
 #define BOOST_TT_TRAIT_OP <
diff --git a/test/has_logical_and_test.cpp b/test/has_logical_and_test.cpp
index 9c9eade..310d2ed 100644
--- a/test/has_logical_and_test.cpp
+++ b/test/has_logical_and_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_logical_and.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_logical_and
 #define BOOST_TT_TRAIT_OP &&
diff --git a/test/has_logical_not_test.cpp b/test/has_logical_not_test.cpp
index fdb467b..a1f7543 100644
--- a/test/has_logical_not_test.cpp
+++ b/test/has_logical_not_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_logical_not.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_logical_not
 #define BOOST_TT_TRAIT_OP !
diff --git a/test/has_logical_or_test.cpp b/test/has_logical_or_test.cpp
index ff9b103..a344889 100644
--- a/test/has_logical_or_test.cpp
+++ b/test/has_logical_or_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_logical_or.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_logical_or
 #define BOOST_TT_TRAIT_OP ||
diff --git a/test/has_minus_assign_test.cpp b/test/has_minus_assign_test.cpp
index a758d2d..4120ce9 100644
--- a/test/has_minus_assign_test.cpp
+++ b/test/has_minus_assign_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_minus_assign.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_minus_assign
 #define BOOST_TT_TRAIT_OP -=
diff --git a/test/has_minus_test.cpp b/test/has_minus_test.cpp
index 01772f7..9b9722e 100644
--- a/test/has_minus_test.cpp
+++ b/test/has_minus_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_minus.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_minus
 #define BOOST_TT_TRAIT_OP -
diff --git a/test/has_modulus_assign_test.cpp b/test/has_modulus_assign_test.cpp
index bf96200..bd36c0a 100644
--- a/test/has_modulus_assign_test.cpp
+++ b/test/has_modulus_assign_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_modulus_assign.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_modulus_assign
 #define BOOST_TT_TRAIT_OP %=
diff --git a/test/has_modulus_test.cpp b/test/has_modulus_test.cpp
index ab697ea..64706cb 100644
--- a/test/has_modulus_test.cpp
+++ b/test/has_modulus_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_modulus.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_modulus
 #define BOOST_TT_TRAIT_OP %
diff --git a/test/has_multiplies_assign_test.cpp b/test/has_multiplies_assign_test.cpp
index 852ec01..ded333d 100644
--- a/test/has_multiplies_assign_test.cpp
+++ b/test/has_multiplies_assign_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_multiplies_assign.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_multiplies_assign
 #define BOOST_TT_TRAIT_OP *=
diff --git a/test/has_multiplies_test.cpp b/test/has_multiplies_test.cpp
index 89316ad..a3565eb 100644
--- a/test/has_multiplies_test.cpp
+++ b/test/has_multiplies_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_multiplies.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_multiplies
 #define BOOST_TT_TRAIT_OP *
diff --git a/test/has_negate_test.cpp b/test/has_negate_test.cpp
index baa0e88..fc7be4a 100644
--- a/test/has_negate_test.cpp
+++ b/test/has_negate_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_negate.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_negate
 #define BOOST_TT_TRAIT_OP -
diff --git a/test/has_not_equal_to_test.cpp b/test/has_not_equal_to_test.cpp
index 17462ab..7864c6f 100644
--- a/test/has_not_equal_to_test.cpp
+++ b/test/has_not_equal_to_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_not_equal_to.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_not_equal_to
 #define BOOST_TT_TRAIT_OP !=
diff --git a/test/has_nothrow_assign_test.cpp b/test/has_nothrow_assign_test.cpp
index 421e91d..a1e8e1f 100644
--- a/test/has_nothrow_assign_test.cpp
+++ b/test/has_nothrow_assign_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_nothrow_assign.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
 
diff --git a/test/has_nothrow_constr_test.cpp b/test/has_nothrow_constr_test.cpp
index 0697276..47c0b88 100644
--- a/test/has_nothrow_constr_test.cpp
+++ b/test/has_nothrow_constr_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_nothrow_constructor.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 class bug11324_base
 {
diff --git a/test/has_nothrow_copy_test.cpp b/test/has_nothrow_copy_test.cpp
index 68680bc..a06a70a 100644
--- a/test/has_nothrow_copy_test.cpp
+++ b/test/has_nothrow_copy_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_nothrow_copy.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 struct non_copy
 {
diff --git a/test/has_nothrow_destructor_test.cpp b/test/has_nothrow_destructor_test.cpp
index 74f31bf..30d23a7 100644
--- a/test/has_nothrow_destructor_test.cpp
+++ b/test/has_nothrow_destructor_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_nothrow_destructor.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #ifdef BOOST_MSVC
 #pragma warning(disable:4290) // exception spec ignored
diff --git a/test/has_operator_new_test.cpp b/test/has_operator_new_test.cpp
index 22d54c6..8b584c3 100644
--- a/test/has_operator_new_test.cpp
+++ b/test/has_operator_new_test.cpp
@@ -3,9 +3,9 @@
 //  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/type_traits/has_new_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-#include <boost/type_traits/has_new_operator.hpp>
 
 #ifdef BOOST_INTEL
 //  remark #1720: function "class_with_new_op::operator new" has no corresponding member operator delete (to be called if an exception is thrown during initialization of an allocated object)
diff --git a/test/has_plus_assign_test.cpp b/test/has_plus_assign_test.cpp
index d66c394..488cefd 100644
--- a/test/has_plus_assign_test.cpp
+++ b/test/has_plus_assign_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_plus_assign.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_plus_assign
 #define BOOST_TT_TRAIT_OP +=
diff --git a/test/has_plus_test.cpp b/test/has_plus_test.cpp
index af07263..6804eb5 100644
--- a/test/has_plus_test.cpp
+++ b/test/has_plus_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_plus.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_plus
 #define BOOST_TT_TRAIT_OP +
diff --git a/test/has_post_decrement_test.cpp b/test/has_post_decrement_test.cpp
index bae2c62..36e556d 100644
--- a/test/has_post_decrement_test.cpp
+++ b/test/has_post_decrement_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_post_decrement.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_post_decrement
 #define BOOST_TT_TRAIT_OP --
diff --git a/test/has_post_increment_test.cpp b/test/has_post_increment_test.cpp
index f96e884..c15c6d3 100644
--- a/test/has_post_increment_test.cpp
+++ b/test/has_post_increment_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_post_increment.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_post_increment
 #define BOOST_TT_TRAIT_OP ++
diff --git a/test/has_postfix_classes0_test.cpp b/test/has_postfix_classes0_test.cpp
index d3affa1..e529f52 100644
--- a/test/has_postfix_classes0_test.cpp
+++ b/test/has_postfix_classes0_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_postfix_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_postfix_classes1_test.cpp b/test/has_postfix_classes1_test.cpp
index 0d0ab8a..aafdd65 100644
--- a/test/has_postfix_classes1_test.cpp
+++ b/test/has_postfix_classes1_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_postfix_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_postfix_classes2_test.cpp b/test/has_postfix_classes2_test.cpp
index aa01ecb..8363b77 100644
--- a/test/has_postfix_classes2_test.cpp
+++ b/test/has_postfix_classes2_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_postfix_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_postfix_classes3_test.cpp b/test/has_postfix_classes3_test.cpp
index e007069..6b58e4f 100644
--- a/test/has_postfix_classes3_test.cpp
+++ b/test/has_postfix_classes3_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_postfix_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_pre_decrement_test.cpp b/test/has_pre_decrement_test.cpp
index e02d781..f65961e 100644
--- a/test/has_pre_decrement_test.cpp
+++ b/test/has_pre_decrement_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_pre_decrement.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_pre_decrement
 #define BOOST_TT_TRAIT_OP --
diff --git a/test/has_pre_increment_test.cpp b/test/has_pre_increment_test.cpp
index deeb9fe..80c56a5 100644
--- a/test/has_pre_increment_test.cpp
+++ b/test/has_pre_increment_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_pre_increment.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_pre_increment
 #define BOOST_TT_TRAIT_OP ++
diff --git a/test/has_prefix_classes0_test.cpp b/test/has_prefix_classes0_test.cpp
index 130c630..0943a4a 100644
--- a/test/has_prefix_classes0_test.cpp
+++ b/test/has_prefix_classes0_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_prefix_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_prefix_classes1_test.cpp b/test/has_prefix_classes1_test.cpp
index 959ccc0..bdd1f59 100644
--- a/test/has_prefix_classes1_test.cpp
+++ b/test/has_prefix_classes1_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_prefix_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_prefix_classes2_test.cpp b/test/has_prefix_classes2_test.cpp
index 6bd716b..993b70d 100644
--- a/test/has_prefix_classes2_test.cpp
+++ b/test/has_prefix_classes2_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_prefix_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_prefix_classes3_test.cpp b/test/has_prefix_classes3_test.cpp
index 06b56d6..9039999 100644
--- a/test/has_prefix_classes3_test.cpp
+++ b/test/has_prefix_classes3_test.cpp
@@ -3,10 +3,9 @@
 //  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/type_traits/has_operator.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-
-#include <boost/type_traits/has_operator.hpp>
 #include "has_prefix_classes.hpp"
 
 TT_TEST_BEGIN(BOOST_TT_TRAIT_NAME)
diff --git a/test/has_right_shift_assign_test.cpp b/test/has_right_shift_assign_test.cpp
index 1dbf91e..ddae521 100644
--- a/test/has_right_shift_assign_test.cpp
+++ b/test/has_right_shift_assign_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_right_shift_assign.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_right_shift_assign
 #define BOOST_TT_TRAIT_OP >>=
diff --git a/test/has_right_shift_test.cpp b/test/has_right_shift_test.cpp
index 584c971..ff6a4da 100644
--- a/test/has_right_shift_test.cpp
+++ b/test/has_right_shift_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_right_shift.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_right_shift
 #define BOOST_TT_TRAIT_OP >>
diff --git a/test/has_trivial_assign_test.cpp b/test/has_trivial_assign_test.cpp
index c5e40a3..983dacf 100644
--- a/test/has_trivial_assign_test.cpp
+++ b/test/has_trivial_assign_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_trivial_assign.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 struct non_assignable
 {
diff --git a/test/has_trivial_constr_test.cpp b/test/has_trivial_constr_test.cpp
index 16a4e8a..9328b51 100644
--- a/test/has_trivial_constr_test.cpp
+++ b/test/has_trivial_constr_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_trivial_constructor.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 
 class bug11324_base
diff --git a/test/has_trivial_copy_test.cpp b/test/has_trivial_copy_test.cpp
index 043f76e..c0cf827 100644
--- a/test/has_trivial_copy_test.cpp
+++ b/test/has_trivial_copy_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_trivial_copy.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
 
diff --git a/test/has_trivial_destructor_test.cpp b/test/has_trivial_destructor_test.cpp
index 3792004..0ec5251 100644
--- a/test/has_trivial_destructor_test.cpp
+++ b/test/has_trivial_destructor_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_trivial_destructor.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
 
diff --git a/test/has_trivial_move_assign_test.cpp b/test/has_trivial_move_assign_test.cpp
index 242c92f..aa27bb4 100644
--- a/test/has_trivial_move_assign_test.cpp
+++ b/test/has_trivial_move_assign_test.cpp
@@ -5,13 +5,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_trivial_move_assign.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
 
diff --git a/test/has_trivial_move_constructor_test.cpp b/test/has_trivial_move_constructor_test.cpp
index fe227f4..a2e71e2 100644
--- a/test/has_trivial_move_constructor_test.cpp
+++ b/test/has_trivial_move_constructor_test.cpp
@@ -5,13 +5,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_trivial_move_constructor.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
 
diff --git a/test/has_unary_minus_test.cpp b/test/has_unary_minus_test.cpp
index 94ac223..5481a16 100644
--- a/test/has_unary_minus_test.cpp
+++ b/test/has_unary_minus_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_unary_minus.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_unary_minus
 #define BOOST_TT_TRAIT_OP -
diff --git a/test/has_unary_plus_test.cpp b/test/has_unary_plus_test.cpp
index 208b43c..416c01a 100644
--- a/test/has_unary_plus_test.cpp
+++ b/test/has_unary_plus_test.cpp
@@ -3,14 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_unary_plus.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #define BOOST_TT_TRAIT_NAME has_unary_plus
 #define BOOST_TT_TRAIT_OP +
diff --git a/test/has_virtual_destructor_test.cpp b/test/has_virtual_destructor_test.cpp
index 5f03ac5..cc47eec 100644
--- a/test/has_virtual_destructor_test.cpp
+++ b/test/has_virtual_destructor_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/has_virtual_destructor.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #include <iostream>
 #include <stdexcept>
diff --git a/test/is_abstract_test.cpp b/test/is_abstract_test.cpp
index d82d5ec..9afe655 100644
--- a/test/is_abstract_test.cpp
+++ b/test/is_abstract_test.cpp
@@ -5,13 +5,13 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_abstract.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #ifdef BOOST_MSVC
 #pragma warning(disable: 4505)
diff --git a/test/is_arithmetic_test.cpp b/test/is_arithmetic_test.cpp
index 9192dfc..6f0618d 100644
--- a/test/is_arithmetic_test.cpp
+++ b/test/is_arithmetic_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_arithmetic.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_arithmetic)
 
diff --git a/test/is_array_test.cpp b/test/is_array_test.cpp
index cd89c9f..9f2858d 100644
--- a/test/is_array_test.cpp
+++ b/test/is_array_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_array.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 struct convertible_to_pointer
 {
diff --git a/test/is_assignable_test.cpp b/test/is_assignable_test.cpp
index 8a13ca2..5eb2e7a 100644
--- a/test/is_assignable_test.cpp
+++ b/test/is_assignable_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_assignable.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #ifndef BOOST_NO_CXX11_DELETED_FUNCTIONS
 
diff --git a/test/is_base_and_derived_test.cpp b/test/is_base_and_derived_test.cpp
index 38e8fa3..2f6ec17 100644
--- a/test/is_base_and_derived_test.cpp
+++ b/test/is_base_and_derived_test.cpp
@@ -5,13 +5,13 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_base_and_derived.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 //
 // Additional tests added for VC7.1 bug, 2005/04/21
diff --git a/test/is_base_of_test.cpp b/test/is_base_of_test.cpp
index 86c5754..9350efe 100644
--- a/test/is_base_of_test.cpp
+++ b/test/is_base_of_test.cpp
@@ -5,13 +5,13 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_base_of.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 
 
diff --git a/test/is_class_test.cpp b/test/is_class_test.cpp
index 3c67d5f..53f0ece 100644
--- a/test/is_class_test.cpp
+++ b/test/is_class_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_class.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 #include <iostream>
 
 TT_TEST_BEGIN(is_class)
diff --git a/test/is_complex_test.cpp b/test/is_complex_test.cpp
index 2d0c2e8..b764ca1 100644
--- a/test/is_complex_test.cpp
+++ b/test/is_complex_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_complex.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 #include <iostream>
 
 struct bad_struct
diff --git a/test/is_compound_test.cpp b/test/is_compound_test.cpp
index a5b40fd..6d8c5bd 100644
--- a/test/is_compound_test.cpp
+++ b/test/is_compound_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_compound.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_compound)
 
diff --git a/test/is_const_test.cpp b/test/is_const_test.cpp
index 3280ea4..59b8214 100644
--- a/test/is_const_test.cpp
+++ b/test/is_const_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_const.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_const)
 
diff --git a/test/is_constructible_test.cpp b/test/is_constructible_test.cpp
index 8bcd7ab..b607390 100644
--- a/test/is_constructible_test.cpp
+++ b/test/is_constructible_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_constructible.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 
 struct non_copy_constructible
diff --git a/test/is_convertible_test.cpp b/test/is_convertible_test.cpp
index 22b3201..8b33c03 100644
--- a/test/is_convertible_test.cpp
+++ b/test/is_convertible_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_convertible.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 #include <boost/utility/enable_if.hpp>
 
 
diff --git a/test/is_copy_assignable_test.cpp b/test/is_copy_assignable_test.cpp
index d61628f..286d1a2 100644
--- a/test/is_copy_assignable_test.cpp
+++ b/test/is_copy_assignable_test.cpp
@@ -4,15 +4,14 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //#define TEST_STD
-#include "test.hpp"
-#include "check_integral_constant.hpp"
 
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_copy_assignable.hpp>
 #endif
-
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #include <boost/move/core.hpp>
 
diff --git a/test/is_copy_constructible_test.cpp b/test/is_copy_constructible_test.cpp
index 844f479..a176adb 100644
--- a/test/is_copy_constructible_test.cpp
+++ b/test/is_copy_constructible_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_copy_constructible.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #include <boost/move/core.hpp>
 
diff --git a/test/is_default_constr_test.cpp b/test/is_default_constr_test.cpp
index 3780403..9992d4a 100644
--- a/test/is_default_constr_test.cpp
+++ b/test/is_default_constr_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_default_constructible.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 class bug11324_base
 {
diff --git a/test/is_destructible_test.cpp b/test/is_destructible_test.cpp
index cdf81ef..290f1ae 100644
--- a/test/is_destructible_test.cpp
+++ b/test/is_destructible_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_destructible.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #if !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
 
diff --git a/test/is_empty_test.cpp b/test/is_empty_test.cpp
index a398c3c..1e95ea4 100644
--- a/test/is_empty_test.cpp
+++ b/test/is_empty_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_empty.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 struct non_default_constructable_UDT
 {
diff --git a/test/is_enum_test.cpp b/test/is_enum_test.cpp
index 624d523..89e59e0 100644
--- a/test/is_enum_test.cpp
+++ b/test/is_enum_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_enum.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #ifndef BOOST_NO_CXX11_SCOPED_ENUMS
 
diff --git a/test/is_final_test.cpp b/test/is_final_test.cpp
index 40ad226..16f4ea3 100644
--- a/test/is_final_test.cpp
+++ b/test/is_final_test.cpp
@@ -5,13 +5,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_final.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 #include <iostream>
 
 TT_TEST_BEGIN(is_final)
diff --git a/test/is_float_test.cpp b/test/is_float_test.cpp
index 5cd8865..9100a28 100644
--- a/test/is_float_test.cpp
+++ b/test/is_float_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_float.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_float)
 
diff --git a/test/is_floating_point_test.cpp b/test/is_floating_point_test.cpp
index 15fec14..c9b15b0 100644
--- a/test/is_floating_point_test.cpp
+++ b/test/is_floating_point_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_floating_point.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_floating_point)
 
diff --git a/test/is_function_test.cpp b/test/is_function_test.cpp
index 67cdca7..f689b93 100644
--- a/test/is_function_test.cpp
+++ b/test/is_function_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_function.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_function)
 
diff --git a/test/is_fundamental_test.cpp b/test/is_fundamental_test.cpp
index 0b33444..342859f 100644
--- a/test/is_fundamental_test.cpp
+++ b/test/is_fundamental_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_fundamental.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_fundamental)
 
diff --git a/test/is_integral_test.cpp b/test/is_integral_test.cpp
index 3eff19a..8cbc403 100644
--- a/test/is_integral_test.cpp
+++ b/test/is_integral_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_integral.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_integral)
 
diff --git a/test/is_lvalue_reference_test.cpp b/test/is_lvalue_reference_test.cpp
index a14b9f6..a1d21e2 100644
--- a/test/is_lvalue_reference_test.cpp
+++ b/test/is_lvalue_reference_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_lvalue_reference.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_lvalue_reference)
 
diff --git a/test/is_member_func_test.cpp b/test/is_member_func_test.cpp
index 4d39892..ad75771 100644
--- a/test/is_member_func_test.cpp
+++ b/test/is_member_func_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_member_function_pointer.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_member_function_pointer)
 
diff --git a/test/is_member_obj_test.cpp b/test/is_member_obj_test.cpp
index 3307120..f8b74fa 100644
--- a/test/is_member_obj_test.cpp
+++ b/test/is_member_obj_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_member_object_pointer.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 typedef const double (UDT::*mp2) ;
 
diff --git a/test/is_member_pointer_test.cpp b/test/is_member_pointer_test.cpp
index 02438d0..431cebd 100644
--- a/test/is_member_pointer_test.cpp
+++ b/test/is_member_pointer_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_member_pointer.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_member_pointer)
 
diff --git a/test/is_object_test.cpp b/test/is_object_test.cpp
index 3288999..027a04b 100644
--- a/test/is_object_test.cpp
+++ b/test/is_object_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_object.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_object)
 
diff --git a/test/is_pod_test.cpp b/test/is_pod_test.cpp
index 94fd04a..54f0d51 100644
--- a/test/is_pod_test.cpp
+++ b/test/is_pod_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_pod.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_pod)
 
diff --git a/test/is_pointer_test.cpp b/test/is_pointer_test.cpp
index 2693e48..d38e128 100644
--- a/test/is_pointer_test.cpp
+++ b/test/is_pointer_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_pointer.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_pointer)
 
diff --git a/test/is_polymorphic_test.cpp b/test/is_polymorphic_test.cpp
index b200b5a..a606af8 100644
--- a/test/is_polymorphic_test.cpp
+++ b/test/is_polymorphic_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_polymorphic.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #include <exception>
 #include <new>
diff --git a/test/is_reference_test.cpp b/test/is_reference_test.cpp
index 4e561a4..39468ba 100644
--- a/test/is_reference_test.cpp
+++ b/test/is_reference_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_reference.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_reference)
 
diff --git a/test/is_rvalue_reference_test.cpp b/test/is_rvalue_reference_test.cpp
index 0804c43..c4e95be 100644
--- a/test/is_rvalue_reference_test.cpp
+++ b/test/is_rvalue_reference_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_rvalue_reference.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_rvalue_reference)
 
diff --git a/test/is_same_test.cpp b/test/is_same_test.cpp
index 4b40f92..396f6c3 100644
--- a/test/is_same_test.cpp
+++ b/test/is_same_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_same.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_same)
 
diff --git a/test/is_scalar_test.cpp b/test/is_scalar_test.cpp
index 99e484c..c4c4d1d 100644
--- a/test/is_scalar_test.cpp
+++ b/test/is_scalar_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_scalar.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_scalar)
 
diff --git a/test/is_signed_test.cpp b/test/is_signed_test.cpp
index 66b7e15..7ee762f 100644
--- a/test/is_signed_test.cpp
+++ b/test/is_signed_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_signed.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #include <climits>
 
diff --git a/test/is_stateless_test.cpp b/test/is_stateless_test.cpp
index ed5f1dd..805c921 100644
--- a/test/is_stateless_test.cpp
+++ b/test/is_stateless_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_stateless.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_stateless)
 
diff --git a/test/is_union_test.cpp b/test/is_union_test.cpp
index 9d3f37d..ee960f8 100644
--- a/test/is_union_test.cpp
+++ b/test/is_union_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_union.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 #include <iostream>
 
 TT_TEST_BEGIN(is_union)
diff --git a/test/is_unsigned_test.cpp b/test/is_unsigned_test.cpp
index 4323247..2ea8024 100644
--- a/test/is_unsigned_test.cpp
+++ b/test/is_unsigned_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_unsigned.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #include <climits>
 
diff --git a/test/is_virtual_base_of_test.cpp b/test/is_virtual_base_of_test.cpp
index 256e67c..bda0e59 100644
--- a/test/is_virtual_base_of_test.cpp
+++ b/test/is_virtual_base_of_test.cpp
@@ -5,9 +5,9 @@
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 
+#include <boost/type_traits/is_virtual_base_of.hpp>
 #include "test.hpp"
 #include "check_integral_constant.hpp"
-#include <boost/type_traits/is_virtual_base_of.hpp>
 
 // for bug report 3317: https://svn.boost.org/trac/boost/ticket/3317
 class B
diff --git a/test/is_void_test.cpp b/test/is_void_test.cpp
index 663702e..d9421d5 100644
--- a/test/is_void_test.cpp
+++ b/test/is_void_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_void.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_void)
 
diff --git a/test/is_volatile_test.cpp b/test/is_volatile_test.cpp
index 7708d63..f274534 100644
--- a/test/is_volatile_test.cpp
+++ b/test/is_volatile_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_volatile.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(is_volatile)
 
diff --git a/test/make_signed_test.cpp b/test/make_signed_test.cpp
index cb9da2d..8490046 100644
--- a/test/make_signed_test.cpp
+++ b/test/make_signed_test.cpp
@@ -4,14 +4,14 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/make_signed.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(make_signed)
 // signed types:
diff --git a/test/make_unsigned_test.cpp b/test/make_unsigned_test.cpp
index 117a8e6..836512d 100644
--- a/test/make_unsigned_test.cpp
+++ b/test/make_unsigned_test.cpp
@@ -4,14 +4,14 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/make_unsigned.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(make_unsigned)
 // signed types:
diff --git a/test/make_void_test.cpp b/test/make_void_test.cpp
index 986cdc4..f63b55e 100644
--- a/test/make_void_test.cpp
+++ b/test/make_void_test.cpp
@@ -7,14 +7,13 @@ Version 1.0. (See accompanying file LICENSE_1_0.txt
 or copy at http://www.boost.org/LICENSE_1_0.txt)
 */
 
-#include "test.hpp"
-#include "check_type.hpp"
-
 #ifdef TEST_STD
 #include <type_traits>
 #else
 #include <boost/type_traits/make_void.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 TT_TEST_BEGIN(make_void)
 
diff --git a/test/rank_test.cpp b/test/rank_test.cpp
index 2da7b64..4ae9511 100644
--- a/test/rank_test.cpp
+++ b/test/rank_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/rank.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(rank)
 
diff --git a/test/remove_all_extents_test.cpp b/test/remove_all_extents_test.cpp
index fe0d2d7..06666d1 100644
--- a/test/remove_all_extents_test.cpp
+++ b/test/remove_all_extents_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/remove_all_extents.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(remove_all_extents_test_1, ::tt::remove_all_extents, const, const)
 BOOST_DECL_TRANSFORM_TEST(remove_all_extents_test_2, ::tt::remove_all_extents, volatile, volatile)
diff --git a/test/remove_bounds_test.cpp b/test/remove_bounds_test.cpp
index cf0ab09..965937d 100644
--- a/test/remove_bounds_test.cpp
+++ b/test/remove_bounds_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/remove_bounds.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(remove_bounds_test_1, ::tt::remove_bounds, const, const)
 BOOST_DECL_TRANSFORM_TEST(remove_bounds_test_2, ::tt::remove_bounds, volatile, volatile)
diff --git a/test/remove_const_test.cpp b/test/remove_const_test.cpp
index 0271130..03c6525 100644
--- a/test/remove_const_test.cpp
+++ b/test/remove_const_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/remove_const.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST3(remove_const_test_1, ::tt::remove_const, const)
 BOOST_DECL_TRANSFORM_TEST(remove_const_test_2, ::tt::remove_const, volatile, volatile)
diff --git a/test/remove_cv_ref_test.cpp b/test/remove_cv_ref_test.cpp
index e825811..8e9e7be 100644
--- a/test/remove_cv_ref_test.cpp
+++ b/test/remove_cv_ref_test.cpp
@@ -5,13 +5,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/remove_cv_ref.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST3(remove_cv_ref_test_1, ::tt::remove_cv_ref, const)
 BOOST_DECL_TRANSFORM_TEST3(remove_cv_ref_test_2, ::tt::remove_cv_ref, volatile)
diff --git a/test/remove_cv_test.cpp b/test/remove_cv_test.cpp
index 946f5e5..805676b 100644
--- a/test/remove_cv_test.cpp
+++ b/test/remove_cv_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/remove_cv.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST3(remove_cv_test_1, ::tt::remove_cv, const)
 BOOST_DECL_TRANSFORM_TEST3(remove_cv_test_2, ::tt::remove_cv, volatile)
diff --git a/test/remove_extent_test.cpp b/test/remove_extent_test.cpp
index cf708a4..8501293 100644
--- a/test/remove_extent_test.cpp
+++ b/test/remove_extent_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/remove_extent.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(remove_extent_test_1, ::tt::remove_extent, const, const)
 BOOST_DECL_TRANSFORM_TEST(remove_extent_test_2, ::tt::remove_extent, volatile, volatile)
diff --git a/test/remove_pointer_test.cpp b/test/remove_pointer_test.cpp
index 6a74081..30d30aa 100644
--- a/test/remove_pointer_test.cpp
+++ b/test/remove_pointer_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/remove_pointer.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(remove_pointer_test_1, ::tt::remove_pointer, const, const)
 BOOST_DECL_TRANSFORM_TEST(remove_pointer_test_2, ::tt::remove_pointer, volatile, volatile)
diff --git a/test/remove_reference_test.cpp b/test/remove_reference_test.cpp
index 980c125..808c086 100644
--- a/test/remove_reference_test.cpp
+++ b/test/remove_reference_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/remove_reference.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(remove_reference_test_1, ::tt::remove_reference, const, const)
 BOOST_DECL_TRANSFORM_TEST(remove_reference_test_2, ::tt::remove_reference, volatile, volatile)
diff --git a/test/remove_volatile_test.cpp b/test/remove_volatile_test.cpp
index e8dcd4c..6730b17 100644
--- a/test/remove_volatile_test.cpp
+++ b/test/remove_volatile_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/remove_volatile.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(remove_volatile_test_1, ::tt::remove_volatile, const, const)
 BOOST_DECL_TRANSFORM_TEST3(remove_volatile_test_2, ::tt::remove_volatile, volatile)
diff --git a/test/tricky_abstract_type_test.cpp b/test/tricky_abstract_type_test.cpp
index 4713cac..f779d27 100644
--- a/test/tricky_abstract_type_test.cpp
+++ b/test/tricky_abstract_type_test.cpp
@@ -4,14 +4,14 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_empty.hpp>
 #  include <boost/type_traits/is_stateless.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(tricky_abstract_type_test)
 
diff --git a/test/tricky_add_pointer_test.cpp b/test/tricky_add_pointer_test.cpp
index 06a1db1..a6edb1e 100644
--- a/test/tricky_add_pointer_test.cpp
+++ b/test/tricky_add_pointer_test.cpp
@@ -4,13 +4,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/add_pointer.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(add_pointer_test_5, ::tt::add_pointer, const &, const*)
 BOOST_DECL_TRANSFORM_TEST(add_pointer_test_6, ::tt::add_pointer, &, *)
diff --git a/test/tricky_function_type_test.cpp b/test/tricky_function_type_test.cpp
index 5c339d1..8077c56 100644
--- a/test/tricky_function_type_test.cpp
+++ b/test/tricky_function_type_test.cpp
@@ -4,8 +4,6 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
@@ -23,6 +21,8 @@
 #  include <boost/type_traits/is_base_of.hpp>
 #  include <boost/type_traits/is_convertible.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(tricky_function_type_test)
 
diff --git a/test/tricky_incomplete_type_test.cpp b/test/tricky_incomplete_type_test.cpp
index 573b5a6..95a0c2e 100644
--- a/test/tricky_incomplete_type_test.cpp
+++ b/test/tricky_incomplete_type_test.cpp
@@ -4,13 +4,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 TT_TEST_BEGIN(tricky_incomplete_type_test)
 
diff --git a/test/tricky_is_enum_test.cpp b/test/tricky_is_enum_test.cpp
index b7c7d38..3dcb7be 100644
--- a/test/tricky_is_enum_test.cpp
+++ b/test/tricky_is_enum_test.cpp
@@ -3,13 +3,13 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/is_enum.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 struct convertible_to_anything
 {
diff --git a/test/tricky_partial_spec_test.cpp b/test/tricky_partial_spec_test.cpp
index 140797e..e6becc0 100644
--- a/test/tricky_partial_spec_test.cpp
+++ b/test/tricky_partial_spec_test.cpp
@@ -4,8 +4,6 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
@@ -23,6 +21,8 @@
 #include <boost/type_traits/is_member_function_pointer.hpp>
 #include <boost/type_traits/is_pointer.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 #include <stdexcept>
 #include <new>
 #include <exception>
diff --git a/test/tricky_rvalue_test.cpp b/test/tricky_rvalue_test.cpp
index 4edd44e..dce57b2 100644
--- a/test/tricky_rvalue_test.cpp
+++ b/test/tricky_rvalue_test.cpp
@@ -4,9 +4,6 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
-#include <boost/detail/workaround.hpp>
 #ifdef TEST_STD
 #  include <type_traits>
 #else
@@ -16,6 +13,9 @@
 #  include <boost/type_traits/is_reference.hpp>
 #  include <boost/type_traits/is_function.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
+#include <boost/detail/workaround.hpp>
 
 TT_TEST_BEGIN(rvalue_reference_test)
 
diff --git a/test/type_identity_test.cpp b/test/type_identity_test.cpp
index acc3061..36c1752 100644
--- a/test/type_identity_test.cpp
+++ b/test/type_identity_test.cpp
@@ -5,13 +5,13 @@
 //  Boost Software License, Version 1.0. (See accompanying file 
 //  LICENSE_1_0.txt or copy at http://www.tt.org/LICENSE_1_0.txt)
 
-#include "test.hpp"
-#include "check_type.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
 #  include <boost/type_traits/type_identity.hpp>
 #endif
+#include "test.hpp"
+#include "check_type.hpp"
 
 BOOST_DECL_TRANSFORM_TEST(type_identity_test_1, ::tt::type_identity, const, const)
 BOOST_DECL_TRANSFORM_TEST(type_identity_test_2, ::tt::type_identity, volatile, volatile)
diff --git a/test/type_with_alignment_test.cpp b/test/type_with_alignment_test.cpp
index 65a9232..8548ead 100644
--- a/test/type_with_alignment_test.cpp
+++ b/test/type_with_alignment_test.cpp
@@ -4,8 +4,6 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
@@ -13,6 +11,8 @@
 #  include <boost/type_traits/type_with_alignment.hpp>
 #  include <boost/type_traits/is_pod.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 #if defined(BOOST_MSVC) || (defined(BOOST_INTEL) && defined(_MSC_VER))
 #if (_MSC_VER >= 1400) && defined(_M_IX86)
diff --git a/test/udt_specialisations.cpp b/test/udt_specialisations.cpp
index 5636bfc..a6fe2dc 100644
--- a/test/udt_specialisations.cpp
+++ b/test/udt_specialisations.cpp
@@ -4,8 +4,6 @@
 //  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 "test.hpp"
-#include "check_integral_constant.hpp"
 #ifdef TEST_STD
 #  include <type_traits>
 #else
@@ -13,6 +11,8 @@
 #  include <boost/type_traits/is_class.hpp>
 #  include <boost/type_traits/is_union.hpp>
 #endif
+#include "test.hpp"
+#include "check_integral_constant.hpp"
 
 struct my_pod{};
 struct my_union