From b578294eb880bb26ad187bc5a3c13e1d0fd3bb0a Mon Sep 17 00:00:00 2001
From: bolero-MURAKAMI <bolero.murakami@gmail.com>
Date: Sun, 5 Apr 2015 01:32:49 +0900
Subject: [PATCH] arranged type_traits headers

---
 sprout/adl/not_found.hpp                      |   2 +-
 sprout/algorithm/cxx14/sort.hpp               |   3 +-
 sprout/bit/popcount.hpp                       |   3 +-
 sprout/cstdlib/abs.hpp                        |   3 +-
 sprout/cstdlib/ascii_to_int.hpp               |   3 +-
 sprout/cstdlib/str_to_int.hpp                 |   3 +-
 sprout/functional/hash/hash_value_traits.hpp  |   4 +-
 sprout/functional/ref.hpp                     |   3 +-
 sprout/integer/integer_digits.hpp             |   3 +-
 sprout/iterator/transform_iterator.hpp        |   2 +-
 .../type_traits/is_iterator_category_of.hpp   |   2 +-
 sprout/math/greater.hpp                       |   3 +-
 sprout/math/greater_equal.hpp                 |   3 +-
 sprout/math/less.hpp                          |   3 +-
 sprout/math/less_equal.hpp                    |   3 +-
 sprout/optional/optional.hpp                  |   2 +-
 sprout/string/int_to_string.hpp               |   4 +-
 sprout/type_traits.hpp                        |  31 +----
 sprout/type_traits/array_modification.hpp     |  16 +++
 sprout/type_traits/category.hpp               |  28 +++++
 sprout/type_traits/composite_category.hpp     |  21 ++++
 sprout/type_traits/composite_modification.hpp |  20 ++++
 sprout/type_traits/cv_modification.hpp        |  20 ++++
 sprout/type_traits/introspection.hpp          |  15 +++
 sprout/type_traits/is_nullptr_cast.hpp        |   6 +-
 sprout/type_traits/is_sint.hpp                |   3 +-
 .../is_trivially_copy_assignable.hpp          |   1 +
 .../is_trivially_copy_constructible.hpp       |   1 +
 .../is_trivially_default_constructible.hpp    |   1 +
 .../is_trivially_move_assignable.hpp          |   1 +
 .../is_trivially_move_constructible.hpp       |   1 +
 sprout/type_traits/is_uint.hpp                |   3 +-
 sprout/type_traits/is_upcast.hpp              |  10 +-
 sprout/type_traits/pointer_modification.hpp   |  16 +++
 sprout/type_traits/property.hpp               |  62 ++++++++++
 sprout/type_traits/property_query.hpp         |  17 +++
 sprout/type_traits/ref_modification.hpp       |  17 +++
 sprout/type_traits/relationship.hpp           |  21 ++++
 sprout/type_traits/remove_shallow_cvref.hpp   |   3 +-
 sprout/type_traits/sign_modification.hpp      |  16 +++
 sprout/type_traits/std.hpp                    |   1 -
 sprout/type_traits/std_type_traits.hpp        | 111 ++----------------
 sprout/type_traits/transformation.hpp         |  30 +++++
 sprout/utility/reinter_cast.hpp               |  12 +-
 sprout/utility/value_holder/value_holder.hpp  |   2 +-
 sprout/weed/attr_cnv/results/mem_ptr.hpp      |   2 +-
 46 files changed, 372 insertions(+), 165 deletions(-)
 create mode 100644 sprout/type_traits/array_modification.hpp
 create mode 100644 sprout/type_traits/category.hpp
 create mode 100644 sprout/type_traits/composite_category.hpp
 create mode 100644 sprout/type_traits/composite_modification.hpp
 create mode 100644 sprout/type_traits/cv_modification.hpp
 create mode 100644 sprout/type_traits/introspection.hpp
 create mode 100644 sprout/type_traits/pointer_modification.hpp
 create mode 100644 sprout/type_traits/property.hpp
 create mode 100644 sprout/type_traits/property_query.hpp
 create mode 100644 sprout/type_traits/ref_modification.hpp
 create mode 100644 sprout/type_traits/relationship.hpp
 create mode 100644 sprout/type_traits/sign_modification.hpp
 create mode 100644 sprout/type_traits/transformation.hpp

diff --git a/sprout/adl/not_found.hpp b/sprout/adl/not_found.hpp
index 98fdeec7..2b412691 100644
--- a/sprout/adl/not_found.hpp
+++ b/sprout/adl/not_found.hpp
@@ -10,7 +10,7 @@
 
 #include <sprout/config.hpp>
 #include <sprout/type_traits/integral_constant.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_same.hpp>
 
 namespace sprout {
 	//
diff --git a/sprout/algorithm/cxx14/sort.hpp b/sprout/algorithm/cxx14/sort.hpp
index fe94af26..241d989b 100644
--- a/sprout/algorithm/cxx14/sort.hpp
+++ b/sprout/algorithm/cxx14/sort.hpp
@@ -12,7 +12,8 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/algorithm/cxx14/detail/sort_tool.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_trivially_copy_constructible.hpp>
+#include <sprout/type_traits/is_trivially_copy_assignable.hpp>
 #include <sprout/utility/swap.hpp>
 #include HDR_FUNCTIONAL_SSCRISK_CEL_OR_SPROUT
 
diff --git a/sprout/bit/popcount.hpp b/sprout/bit/popcount.hpp
index cc6df992..bacb3384 100644
--- a/sprout/bit/popcount.hpp
+++ b/sprout/bit/popcount.hpp
@@ -10,7 +10,8 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_signed.hpp>
+#include <sprout/type_traits/is_unsigned.hpp>
 
 namespace sprout {
 	namespace detail {
diff --git a/sprout/cstdlib/abs.hpp b/sprout/cstdlib/abs.hpp
index fdd2fab6..f33c2179 100644
--- a/sprout/cstdlib/abs.hpp
+++ b/sprout/cstdlib/abs.hpp
@@ -13,7 +13,8 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_signed.hpp>
+#include <sprout/type_traits/is_unsigned.hpp>
 
 namespace sprout {
 
diff --git a/sprout/cstdlib/ascii_to_int.hpp b/sprout/cstdlib/ascii_to_int.hpp
index bbbdd2e7..9bb764c6 100644
--- a/sprout/cstdlib/ascii_to_int.hpp
+++ b/sprout/cstdlib/ascii_to_int.hpp
@@ -12,7 +12,8 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/limits.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_signed.hpp>
+#include <sprout/type_traits/is_unsigned.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/ctype/ascii.hpp>
 #include <sprout/detail/char_literal.hpp>
diff --git a/sprout/cstdlib/str_to_int.hpp b/sprout/cstdlib/str_to_int.hpp
index e7a27dc3..ceb75f20 100644
--- a/sprout/cstdlib/str_to_int.hpp
+++ b/sprout/cstdlib/str_to_int.hpp
@@ -13,7 +13,8 @@
 #include <sprout/config.hpp>
 #include <sprout/workaround/std/cstddef.hpp>
 #include <sprout/limits.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_signed.hpp>
+#include <sprout/type_traits/is_unsigned.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/ctype/ascii.hpp>
 #include <sprout/detail/char_literal.hpp>
diff --git a/sprout/functional/hash/hash_value_traits.hpp b/sprout/functional/hash/hash_value_traits.hpp
index 4d0c81ef..bd2ab2a5 100644
--- a/sprout/functional/hash/hash_value_traits.hpp
+++ b/sprout/functional/hash/hash_value_traits.hpp
@@ -15,7 +15,9 @@
 #include <sprout/limits.hpp>
 #include <sprout/functional/hash/hash_fwd.hpp>
 #include <sprout/functional/hash/detail/hash_float.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/integral_constant.hpp>
+#include <sprout/type_traits/is_signed.hpp>
+#include <sprout/type_traits/is_unsigned.hpp>
 
 namespace sprout {
 	namespace hash_detail {
diff --git a/sprout/functional/ref.hpp b/sprout/functional/ref.hpp
index f667d430..5b9e4d06 100644
--- a/sprout/functional/ref.hpp
+++ b/sprout/functional/ref.hpp
@@ -12,7 +12,8 @@
 #include <functional>
 #include <sprout/config.hpp>
 #include <sprout/utility/forward.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/integral_constant.hpp>
+#include <sprout/type_traits/result_of.hpp>
 #include <sprout/type_traits/identity.hpp>
 #include <sprout/type_traits/has_xxx.hpp>
 #include <sprout/type_traits/inherit_if_xxx.hpp>
diff --git a/sprout/integer/integer_digits.hpp b/sprout/integer/integer_digits.hpp
index b3328277..abb81b0b 100644
--- a/sprout/integer/integer_digits.hpp
+++ b/sprout/integer/integer_digits.hpp
@@ -12,7 +12,8 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/workaround/std/cstddef.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/integral_constant.hpp>
+#include <sprout/type_traits/is_signed.hpp>
 
 namespace sprout {
 	namespace detail {
diff --git a/sprout/iterator/transform_iterator.hpp b/sprout/iterator/transform_iterator.hpp
index 35527e19..01b57e38 100644
--- a/sprout/iterator/transform_iterator.hpp
+++ b/sprout/iterator/transform_iterator.hpp
@@ -17,7 +17,7 @@
 #include <sprout/iterator/distance.hpp>
 #include <sprout/iterator/type_traits/common.hpp>
 #include <sprout/utility/swap.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/result_of.hpp>
 
 namespace sprout {
 	//
diff --git a/sprout/iterator/type_traits/is_iterator_category_of.hpp b/sprout/iterator/type_traits/is_iterator_category_of.hpp
index e6dbf7e7..953ca1c0 100644
--- a/sprout/iterator/type_traits/is_iterator_category_of.hpp
+++ b/sprout/iterator/type_traits/is_iterator_category_of.hpp
@@ -10,7 +10,7 @@
 
 #include <iterator>
 #include <sprout/config.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_convertible.hpp>
 
 namespace sprout {
 	//
diff --git a/sprout/math/greater.hpp b/sprout/math/greater.hpp
index 34a5d7a3..68fcddd9 100644
--- a/sprout/math/greater.hpp
+++ b/sprout/math/greater.hpp
@@ -13,7 +13,8 @@
 #include <sprout/math/not_equal_to.hpp>
 #include <sprout/type_traits/arithmetic_promote.hpp>
 #include <sprout/type_traits/enabler_if.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_signed.hpp>
+#include <sprout/type_traits/is_unsigned.hpp>
 
 namespace sprout {
 	namespace math {
diff --git a/sprout/math/greater_equal.hpp b/sprout/math/greater_equal.hpp
index da111273..4cf6877e 100644
--- a/sprout/math/greater_equal.hpp
+++ b/sprout/math/greater_equal.hpp
@@ -13,7 +13,8 @@
 #include <sprout/math/equal_to.hpp>
 #include <sprout/type_traits/arithmetic_promote.hpp>
 #include <sprout/type_traits/enabler_if.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_signed.hpp>
+#include <sprout/type_traits/is_unsigned.hpp>
 
 namespace sprout {
 	namespace math {
diff --git a/sprout/math/less.hpp b/sprout/math/less.hpp
index 77265337..5f51988d 100644
--- a/sprout/math/less.hpp
+++ b/sprout/math/less.hpp
@@ -13,7 +13,8 @@
 #include <sprout/math/not_equal_to.hpp>
 #include <sprout/type_traits/arithmetic_promote.hpp>
 #include <sprout/type_traits/enabler_if.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_signed.hpp>
+#include <sprout/type_traits/is_unsigned.hpp>
 
 namespace sprout {
 	namespace math {
diff --git a/sprout/math/less_equal.hpp b/sprout/math/less_equal.hpp
index a9cf765f..e0cd90c5 100644
--- a/sprout/math/less_equal.hpp
+++ b/sprout/math/less_equal.hpp
@@ -13,7 +13,8 @@
 #include <sprout/math/equal_to.hpp>
 #include <sprout/type_traits/arithmetic_promote.hpp>
 #include <sprout/type_traits/enabler_if.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_signed.hpp>
+#include <sprout/type_traits/is_unsigned.hpp>
 
 namespace sprout {
 	namespace math {
diff --git a/sprout/optional/optional.hpp b/sprout/optional/optional.hpp
index 79065e7d..8ce98a38 100644
--- a/sprout/optional/optional.hpp
+++ b/sprout/optional/optional.hpp
@@ -17,7 +17,7 @@
 #include <sprout/utility/swap.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/utility/move.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_constructible.hpp>
 #include <sprout/type_traits/is_convert_constructible.hpp>
 #include <sprout/none.hpp>
 #include <sprout/optional/nullopt.hpp>
diff --git a/sprout/string/int_to_string.hpp b/sprout/string/int_to_string.hpp
index f115e8ad..b8d5dc38 100644
--- a/sprout/string/int_to_string.hpp
+++ b/sprout/string/int_to_string.hpp
@@ -15,7 +15,9 @@
 #include <sprout/string/string.hpp>
 #include <sprout/integer/integer_digits.hpp>
 #include <sprout/type_traits/enabler_if.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/integral_constant.hpp>
+#include <sprout/type_traits/is_signed.hpp>
+#include <sprout/type_traits/is_unsigned.hpp>
 #include <sprout/detail/char_literal.hpp>
 #include <sprout/detail/char_conversion.hpp>
 #include <sprout/detail/math/int.hpp>
diff --git a/sprout/type_traits.hpp b/sprout/type_traits.hpp
index d7bcb0a6..9527aefd 100644
--- a/sprout/type_traits.hpp
+++ b/sprout/type_traits.hpp
@@ -10,34 +10,7 @@
 
 #include <sprout/config.hpp>
 #include <sprout/type_traits/std.hpp>
-#include <sprout/type_traits/is_convert_constructible.hpp>
-#include <sprout/type_traits/is_const_unqualified.hpp>
-#include <sprout/type_traits/is_volatile_unqualified.hpp>
-#include <sprout/type_traits/is_cv_unqualified.hpp>
-#include <sprout/type_traits/is_sint.hpp>
-#include <sprout/type_traits/is_uint.hpp>
-#include <sprout/type_traits/is_char_type.hpp>
-#include <sprout/type_traits/is_c_str.hpp>
-#include <sprout/type_traits/is_nullptr_cast.hpp>
-#include <sprout/type_traits/is_upcast.hpp>
-#include <sprout/type_traits/has_type.hpp>
-#include <sprout/type_traits/has_value.hpp>
-#include <sprout/type_traits/identity.hpp>
-#include <sprout/type_traits/lvalue_reference.hpp>
-#include <sprout/type_traits/const_reference.hpp>
-#include <sprout/type_traits/remove_cvref.hpp>
-#include <sprout/type_traits/remove_shallow_const.hpp>
-#include <sprout/type_traits/remove_shallow_volatile.hpp>
-#include <sprout/type_traits/remove_shallow_cv.hpp>
-#include <sprout/type_traits/remove_shallow_cvref.hpp>
-#include <sprout/type_traits/common_decay.hpp>
-#include <sprout/type_traits/arithmetic_promote.hpp>
-#include <sprout/type_traits/float_promote.hpp>
-#include <sprout/type_traits/complex_promote.hpp>
-#include <sprout/type_traits/inherit_if_type.hpp>
-#include <sprout/type_traits/enable_if.hpp>
-#include <sprout/type_traits/enabler_if.hpp>
-#include <sprout/type_traits/has_xxx.hpp>
-#include <sprout/type_traits/inherit_if_xxx.hpp>
+#include <sprout/type_traits/composite_modification.hpp>
+#include <sprout/type_traits/introspection.hpp>
 
 #endif	// #ifndef SPROUT_TYPE_TRAITS_HPP
diff --git a/sprout/type_traits/array_modification.hpp b/sprout/type_traits/array_modification.hpp
new file mode 100644
index 00000000..91a18df4
--- /dev/null
+++ b/sprout/type_traits/array_modification.hpp
@@ -0,0 +1,16 @@
+/*=============================================================================
+  Copyright (c) 2011-2015 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_TRAITS_ARRAY_MODIFICATION_HPP
+#define SPROUT_TYPE_TRAITS_ARRAY_MODIFICATION_HPP
+
+#include <sprout/config.hpp>
+// 20.10.7.4 Array modifications
+#include <sprout/type_traits/remove_extent.hpp>
+#include <sprout/type_traits/remove_all_extents.hpp>
+
+#endif	// #ifndef SPROUT_TYPE_TRAITS_ARRAY_MODIFICATION_HPP
diff --git a/sprout/type_traits/category.hpp b/sprout/type_traits/category.hpp
new file mode 100644
index 00000000..058b00c6
--- /dev/null
+++ b/sprout/type_traits/category.hpp
@@ -0,0 +1,28 @@
+/*=============================================================================
+  Copyright (c) 2011-2015 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_TRAITS_CATEGORY_HPP
+#define SPROUT_TYPE_TRAITS_CATEGORY_HPP
+
+#include <sprout/config.hpp>
+// 20.10.4.1, primary type categories
+#include <sprout/type_traits/is_void.hpp>
+#include <sprout/type_traits/is_null_pointer.hpp>
+#include <sprout/type_traits/is_integral.hpp>
+#include <sprout/type_traits/is_floating_point.hpp>
+#include <sprout/type_traits/is_array.hpp>
+#include <sprout/type_traits/is_pointer.hpp>
+#include <sprout/type_traits/is_lvalue_reference.hpp>
+#include <sprout/type_traits/is_rvalue_reference.hpp>
+#include <sprout/type_traits/is_member_object_pointer.hpp>
+#include <sprout/type_traits/is_member_function_pointer.hpp>
+#include <sprout/type_traits/is_enum.hpp>
+#include <sprout/type_traits/is_union.hpp>
+#include <sprout/type_traits/is_class.hpp>
+#include <sprout/type_traits/is_function.hpp>
+
+#endif	// #ifndef SPROUT_TYPE_TRAITS_CATEGORY_HPP
diff --git a/sprout/type_traits/composite_category.hpp b/sprout/type_traits/composite_category.hpp
new file mode 100644
index 00000000..5fdecec9
--- /dev/null
+++ b/sprout/type_traits/composite_category.hpp
@@ -0,0 +1,21 @@
+/*=============================================================================
+  Copyright (c) 2011-2015 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_TRAITS_COMPOSITE_CATEGORY_HPP
+#define SPROUT_TYPE_TRAITS_COMPOSITE_CATEGORY_HPP
+
+#include <sprout/config.hpp>
+// 20.10.4.2 Composite type traits
+#include <sprout/type_traits/is_reference.hpp>
+#include <sprout/type_traits/is_arithmetic.hpp>
+#include <sprout/type_traits/is_fundamental.hpp>
+#include <sprout/type_traits/is_object.hpp>
+#include <sprout/type_traits/is_scalar.hpp>
+#include <sprout/type_traits/is_compound.hpp>
+#include <sprout/type_traits/is_member_pointer.hpp>
+
+#endif	// #ifndef SPROUT_TYPE_TRAITS_COMPOSITE_CATEGORY_HPP
diff --git a/sprout/type_traits/composite_modification.hpp b/sprout/type_traits/composite_modification.hpp
new file mode 100644
index 00000000..0a3fc3e8
--- /dev/null
+++ b/sprout/type_traits/composite_modification.hpp
@@ -0,0 +1,20 @@
+/*=============================================================================
+  Copyright (c) 2011-2015 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_TRAITS_COMPOSITE_MODIFICATION_HPP
+#define SPROUT_TYPE_TRAITS_COMPOSITE_MODIFICATION_HPP
+
+#include <sprout/config.hpp>
+#include <sprout/type_traits/lvalue_reference.hpp>
+#include <sprout/type_traits/const_reference.hpp>
+#include <sprout/type_traits/remove_cvref.hpp>
+#include <sprout/type_traits/remove_shallow_const.hpp>
+#include <sprout/type_traits/remove_shallow_volatile.hpp>
+#include <sprout/type_traits/remove_shallow_cv.hpp>
+#include <sprout/type_traits/remove_shallow_cvref.hpp>
+
+#endif	// #ifndef SPROUT_TYPE_TRAITS_COMPOSITE_MODIFICATION_HPP
diff --git a/sprout/type_traits/cv_modification.hpp b/sprout/type_traits/cv_modification.hpp
new file mode 100644
index 00000000..b62d5d64
--- /dev/null
+++ b/sprout/type_traits/cv_modification.hpp
@@ -0,0 +1,20 @@
+/*=============================================================================
+  Copyright (c) 2011-2015 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_TRAITS_CV_MODIFICATION_HPP
+#define SPROUT_TYPE_TRAITS_CV_MODIFICATION_HPP
+
+#include <sprout/config.hpp>
+// 20.10.7.1 Const-volatile modifications
+#include <sprout/type_traits/remove_const.hpp>
+#include <sprout/type_traits/remove_volatile.hpp>
+#include <sprout/type_traits/remove_cv.hpp>
+#include <sprout/type_traits/add_const.hpp>
+#include <sprout/type_traits/add_volatile.hpp>
+#include <sprout/type_traits/add_cv.hpp>
+
+#endif	// #ifndef SPROUT_TYPE_TRAITS_CV_MODIFICATION_HPP
diff --git a/sprout/type_traits/introspection.hpp b/sprout/type_traits/introspection.hpp
new file mode 100644
index 00000000..690b931d
--- /dev/null
+++ b/sprout/type_traits/introspection.hpp
@@ -0,0 +1,15 @@
+/*=============================================================================
+  Copyright (c) 2011-2015 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_TRAITS_INTROSPECTION_HPP
+#define SPROUT_TYPE_TRAITS_INTROSPECTION_HPP
+
+#include <sprout/config.hpp>
+#include <sprout/type_traits/has_xxx.hpp>
+#include <sprout/type_traits/inherit_if_xxx.hpp>
+
+#endif	// #ifndef SPROUT_TYPE_TRAITS_INTROSPECTION_HPP
diff --git a/sprout/type_traits/is_nullptr_cast.hpp b/sprout/type_traits/is_nullptr_cast.hpp
index 12ed3290..95a32c3a 100644
--- a/sprout/type_traits/is_nullptr_cast.hpp
+++ b/sprout/type_traits/is_nullptr_cast.hpp
@@ -8,10 +8,12 @@
 #ifndef SPROUT_TYPE_TRAITS_IS_NULLPTR_CAST_HPP
 #define SPROUT_TYPE_TRAITS_IS_NULLPTR_CAST_HPP
 
+#include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/workaround/std/cstddef.hpp>
 #include <sprout/type_traits/integral_constant.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_same.hpp>
+#include <sprout/type_traits/decay.hpp>
 
 namespace sprout {
 	//
@@ -20,7 +22,7 @@ namespace sprout {
 	template<typename From, typename To>
 	struct is_nullptr_cast
 		: public sprout::bool_constant<
-			sprout::is_pointer<To>::value && sprout::is_same<typename sprout::decay<From>::type, std::nullptr_t>::value
+			std::is_pointer<To>::value && sprout::is_same<typename sprout::decay<From>::type, std::nullptr_t>::value
 		>
 	{};
 }	// namespace sprout
diff --git a/sprout/type_traits/is_sint.hpp b/sprout/type_traits/is_sint.hpp
index aacab1eb..e33ecd29 100644
--- a/sprout/type_traits/is_sint.hpp
+++ b/sprout/type_traits/is_sint.hpp
@@ -10,7 +10,8 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/integral_constant.hpp>
+#include <sprout/type_traits/is_signed.hpp>
 
 namespace sprout {
 	//
diff --git a/sprout/type_traits/is_trivially_copy_assignable.hpp b/sprout/type_traits/is_trivially_copy_assignable.hpp
index 18490587..5eb60f16 100644
--- a/sprout/type_traits/is_trivially_copy_assignable.hpp
+++ b/sprout/type_traits/is_trivially_copy_assignable.hpp
@@ -10,6 +10,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
+#include <sprout/type_traits/is_trivially_assignable.hpp>
 #include <sprout/type_traits/detail/type_traits_wrapper.hpp>
 
 namespace sprout {
diff --git a/sprout/type_traits/is_trivially_copy_constructible.hpp b/sprout/type_traits/is_trivially_copy_constructible.hpp
index 1b810ab2..524b1e69 100644
--- a/sprout/type_traits/is_trivially_copy_constructible.hpp
+++ b/sprout/type_traits/is_trivially_copy_constructible.hpp
@@ -10,6 +10,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
+#include <sprout/type_traits/is_trivially_constructible.hpp>
 #include <sprout/type_traits/detail/type_traits_wrapper.hpp>
 
 namespace sprout {
diff --git a/sprout/type_traits/is_trivially_default_constructible.hpp b/sprout/type_traits/is_trivially_default_constructible.hpp
index 0e519108..1355596f 100644
--- a/sprout/type_traits/is_trivially_default_constructible.hpp
+++ b/sprout/type_traits/is_trivially_default_constructible.hpp
@@ -10,6 +10,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
+#include <sprout/type_traits/is_trivially_constructible.hpp>
 #include <sprout/type_traits/detail/type_traits_wrapper.hpp>
 
 namespace sprout {
diff --git a/sprout/type_traits/is_trivially_move_assignable.hpp b/sprout/type_traits/is_trivially_move_assignable.hpp
index c5fcaf7f..7fca4fb7 100644
--- a/sprout/type_traits/is_trivially_move_assignable.hpp
+++ b/sprout/type_traits/is_trivially_move_assignable.hpp
@@ -10,6 +10,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
+#include <sprout/type_traits/is_trivially_assignable.hpp>
 #include <sprout/type_traits/detail/type_traits_wrapper.hpp>
 
 namespace sprout {
diff --git a/sprout/type_traits/is_trivially_move_constructible.hpp b/sprout/type_traits/is_trivially_move_constructible.hpp
index b1f42b48..3d99ad08 100644
--- a/sprout/type_traits/is_trivially_move_constructible.hpp
+++ b/sprout/type_traits/is_trivially_move_constructible.hpp
@@ -10,6 +10,7 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
+#include <sprout/type_traits/is_trivially_constructible.hpp>
 #include <sprout/type_traits/detail/type_traits_wrapper.hpp>
 
 namespace sprout {
diff --git a/sprout/type_traits/is_uint.hpp b/sprout/type_traits/is_uint.hpp
index e0bd73e7..440128ec 100644
--- a/sprout/type_traits/is_uint.hpp
+++ b/sprout/type_traits/is_uint.hpp
@@ -10,7 +10,8 @@
 
 #include <type_traits>
 #include <sprout/config.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/integral_constant.hpp>
+#include <sprout/type_traits/is_unsigned.hpp>
 
 namespace sprout {
 	//
diff --git a/sprout/type_traits/is_upcast.hpp b/sprout/type_traits/is_upcast.hpp
index 21ec030b..e7a42f5e 100644
--- a/sprout/type_traits/is_upcast.hpp
+++ b/sprout/type_traits/is_upcast.hpp
@@ -8,9 +8,9 @@
 #ifndef SPROUT_TYPE_TRAITS_IS_UPCAST_HPP
 #define SPROUT_TYPE_TRAITS_IS_UPCAST_HPP
 
+#include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/type_traits/integral_constant.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
 #include <sprout/type_traits/is_nullptr_cast.hpp>
 
 namespace sprout {
@@ -21,11 +21,11 @@ namespace sprout {
 	struct is_upcast
 		: public sprout::bool_constant<
 			sprout::is_nullptr_cast<From, To>::value
-				|| (sprout::is_pointer<To>::value
-					&& sprout::is_base_of<typename sprout::remove_pointer<To>::type, typename sprout::remove_pointer<typename sprout::decay<From>::type>::type>::value
+				|| (std::is_pointer<To>::value
+					&& std::is_base_of<typename std::remove_pointer<To>::type, typename std::remove_pointer<typename std::decay<From>::type>::type>::value
 					)
-				|| (sprout::is_reference<To>::value
-					&& sprout::is_base_of<typename sprout::remove_reference<To>::type, typename sprout::remove_reference<From>::type>::value
+				|| (std::is_reference<To>::value
+					&& std::is_base_of<typename std::remove_reference<To>::type, typename std::remove_reference<From>::type>::value
 					)
 		>
 	{};
diff --git a/sprout/type_traits/pointer_modification.hpp b/sprout/type_traits/pointer_modification.hpp
new file mode 100644
index 00000000..befa0d70
--- /dev/null
+++ b/sprout/type_traits/pointer_modification.hpp
@@ -0,0 +1,16 @@
+/*=============================================================================
+  Copyright (c) 2011-2015 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_TRAITS_POINTER_MODIFICATION_HPP
+#define SPROUT_TYPE_TRAITS_POINTER_MODIFICATION_HPP
+
+#include <sprout/config.hpp>
+// 20.10.7.5 Pointer modifications
+#include <sprout/type_traits/remove_pointer.hpp>
+#include <sprout/type_traits/add_pointer.hpp>
+
+#endif	// #ifndef SPROUT_TYPE_TRAITS_POINTER_MODIFICATION_HPP
diff --git a/sprout/type_traits/property.hpp b/sprout/type_traits/property.hpp
new file mode 100644
index 00000000..79ed2d41
--- /dev/null
+++ b/sprout/type_traits/property.hpp
@@ -0,0 +1,62 @@
+/*=============================================================================
+  Copyright (c) 2011-2015 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_TRAITS_PROPERTY_HPP
+#define SPROUT_TYPE_TRAITS_PROPERTY_HPP
+
+#include <sprout/config.hpp>
+// 20.10.4.3 Type properties
+#include <sprout/type_traits/is_const.hpp>
+#include <sprout/type_traits/is_volatile.hpp>
+#include <sprout/type_traits/is_trivial.hpp>
+#include <sprout/type_traits/is_trivially_copyable.hpp>
+#include <sprout/type_traits/is_standard_layout.hpp>
+#include <sprout/type_traits/is_pod.hpp>
+#include <sprout/type_traits/is_literal_type.hpp>
+#include <sprout/type_traits/is_empty.hpp>
+#include <sprout/type_traits/is_polymorphic.hpp>
+#include <sprout/type_traits/is_abstract.hpp>
+#include <sprout/type_traits/is_final.hpp>
+#include <sprout/type_traits/is_signed.hpp>
+#include <sprout/type_traits/is_unsigned.hpp>
+#include <sprout/type_traits/is_constructible.hpp>
+#include <sprout/type_traits/is_default_constructible.hpp>
+#include <sprout/type_traits/is_copy_constructible.hpp>
+#include <sprout/type_traits/is_move_constructible.hpp>
+#include <sprout/type_traits/is_assignable.hpp>
+#include <sprout/type_traits/is_copy_assignable.hpp>
+#include <sprout/type_traits/is_move_assignable.hpp>
+#include <sprout/type_traits/is_destructible.hpp>
+#include <sprout/type_traits/is_trivially_constructible.hpp>
+#include <sprout/type_traits/is_trivially_default_constructible.hpp>
+#include <sprout/type_traits/is_trivially_copy_constructible.hpp>
+#include <sprout/type_traits/is_trivially_move_constructible.hpp>
+#include <sprout/type_traits/is_trivially_assignable.hpp>
+#include <sprout/type_traits/is_trivially_copy_assignable.hpp>
+#include <sprout/type_traits/is_trivially_move_assignable.hpp>
+#include <sprout/type_traits/is_trivially_destructible.hpp>
+#include <sprout/type_traits/is_nothrow_constructible.hpp>
+#include <sprout/type_traits/is_nothrow_default_constructible.hpp>
+#include <sprout/type_traits/is_nothrow_copy_constructible.hpp>
+#include <sprout/type_traits/is_nothrow_move_constructible.hpp>
+#include <sprout/type_traits/is_nothrow_assignable.hpp>
+#include <sprout/type_traits/is_nothrow_copy_assignable.hpp>
+#include <sprout/type_traits/is_nothrow_move_assignable.hpp>
+#include <sprout/type_traits/is_nothrow_destructible.hpp>
+#include <sprout/type_traits/has_virtual_destructor.hpp>
+
+#include <sprout/type_traits/is_const_unqualified.hpp>
+#include <sprout/type_traits/is_volatile_unqualified.hpp>
+#include <sprout/type_traits/is_cv_unqualified.hpp>
+#include <sprout/type_traits/is_sint.hpp>
+#include <sprout/type_traits/is_uint.hpp>
+#include <sprout/type_traits/is_char_type.hpp>
+#include <sprout/type_traits/is_c_str.hpp>
+#include <sprout/type_traits/has_type.hpp>
+#include <sprout/type_traits/has_value.hpp>
+
+#endif	// #ifndef SPROUT_TYPE_TRAITS_PROPERTY_HPP
diff --git a/sprout/type_traits/property_query.hpp b/sprout/type_traits/property_query.hpp
new file mode 100644
index 00000000..b4e6beff
--- /dev/null
+++ b/sprout/type_traits/property_query.hpp
@@ -0,0 +1,17 @@
+/*=============================================================================
+  Copyright (c) 2011-2015 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_TRAITS_PROPERTY_QUERY_HPP
+#define SPROUT_TYPE_TRAITS_PROPERTY_QUERY_HPP
+
+#include <sprout/config.hpp>
+// 20.10.5 Type property queries
+#include <sprout/type_traits/alignment_of.hpp>
+#include <sprout/type_traits/rank.hpp>
+#include <sprout/type_traits/extent.hpp>
+
+#endif	// #ifndef SPROUT_TYPE_TRAITS_PROPERTY_QUERY_HPP
diff --git a/sprout/type_traits/ref_modification.hpp b/sprout/type_traits/ref_modification.hpp
new file mode 100644
index 00000000..ce901b1a
--- /dev/null
+++ b/sprout/type_traits/ref_modification.hpp
@@ -0,0 +1,17 @@
+/*=============================================================================
+  Copyright (c) 2011-2015 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_TRAITS_REF_MODIFICATION_HPP
+#define SPROUT_TYPE_TRAITS_REF_MODIFICATION_HPP
+
+#include <sprout/config.hpp>
+// 20.10.7.2 Reference modifications
+#include <sprout/type_traits/remove_reference.hpp>
+#include <sprout/type_traits/add_lvalue_reference.hpp>
+#include <sprout/type_traits/add_rvalue_reference.hpp>
+
+#endif	// #ifndef SPROUT_TYPE_TRAITS_REF_MODIFICATION_HPP
diff --git a/sprout/type_traits/relationship.hpp b/sprout/type_traits/relationship.hpp
new file mode 100644
index 00000000..1c37a2a5
--- /dev/null
+++ b/sprout/type_traits/relationship.hpp
@@ -0,0 +1,21 @@
+/*=============================================================================
+  Copyright (c) 2011-2015 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_TRAITS_RELATIONSHIP_HPP
+#define SPROUT_TYPE_TRAITS_RELATIONSHIP_HPP
+
+#include <sprout/config.hpp>
+// 20.10.6 Relationships between types
+#include <sprout/type_traits/is_same.hpp>
+#include <sprout/type_traits/is_base_of.hpp>
+#include <sprout/type_traits/is_convertible.hpp>
+
+#include <sprout/type_traits/is_convert_constructible.hpp>
+#include <sprout/type_traits/is_nullptr_cast.hpp>
+#include <sprout/type_traits/is_upcast.hpp>
+
+#endif	// #ifndef SPROUT_TYPE_TRAITS_RELATIONSHIP_HPP
diff --git a/sprout/type_traits/remove_shallow_cvref.hpp b/sprout/type_traits/remove_shallow_cvref.hpp
index 4ab182dd..7d9b0489 100644
--- a/sprout/type_traits/remove_shallow_cvref.hpp
+++ b/sprout/type_traits/remove_shallow_cvref.hpp
@@ -8,6 +8,7 @@
 #ifndef SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_CVREF_HPP
 #define SPROUT_TYPE_TRAITS_REMOVE_SHALLOW_CVREF_HPP
 
+#include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/type_traits/remove_shallow_cv.hpp>
 
@@ -18,7 +19,7 @@ namespace sprout {
 	template<typename T>
 	struct remove_shallow_cvref
 		: public sprout::remove_shallow_cv<
-			typename sprout::remove_reference<T>::type
+			typename std::remove_reference<T>::type
 		>
 	{};
 
diff --git a/sprout/type_traits/sign_modification.hpp b/sprout/type_traits/sign_modification.hpp
new file mode 100644
index 00000000..01abfacb
--- /dev/null
+++ b/sprout/type_traits/sign_modification.hpp
@@ -0,0 +1,16 @@
+/*=============================================================================
+  Copyright (c) 2011-2015 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_TRAITS_SIGN_MODIFICATION_HPP
+#define SPROUT_TYPE_TRAITS_SIGN_MODIFICATION_HPP
+
+#include <sprout/config.hpp>
+// 20.10.7.3 Sign modifications
+#include <sprout/type_traits/make_signed.hpp>
+#include <sprout/type_traits/make_unsigned.hpp>
+
+#endif	// #ifndef SPROUT_TYPE_TRAITS_SIGN_MODIFICATION_HPP
diff --git a/sprout/type_traits/std.hpp b/sprout/type_traits/std.hpp
index dcdec3e4..fccac50f 100644
--- a/sprout/type_traits/std.hpp
+++ b/sprout/type_traits/std.hpp
@@ -9,7 +9,6 @@
 #define SPROUT_TYPE_TRAITS_STD_HPP
 
 #include <sprout/config.hpp>
-#include <sprout/type_traits/integral_constant.hpp>
 #include <sprout/type_traits/std_type_traits.hpp>
 #include <sprout/type_traits/std_type_aliases.hpp>
 #include <sprout/type_traits/std_value_variables.hpp>
diff --git a/sprout/type_traits/std_type_traits.hpp b/sprout/type_traits/std_type_traits.hpp
index a95c1f98..b030f65e 100644
--- a/sprout/type_traits/std_type_traits.hpp
+++ b/sprout/type_traits/std_type_traits.hpp
@@ -9,106 +9,17 @@
 #define SPROUT_TYPE_TRAITS_STD_TYPE_TRAITS_HPP
 
 #include <sprout/config.hpp>
-// 20.10.3, helper class:
 #include <sprout/type_traits/integral_constant.hpp>
-// 20.10.4.1, primary type categories:
-#include <sprout/type_traits/is_void.hpp>
-#include <sprout/type_traits/is_null_pointer.hpp>
-#include <sprout/type_traits/is_integral.hpp>
-#include <sprout/type_traits/is_floating_point.hpp>
-#include <sprout/type_traits/is_array.hpp>
-#include <sprout/type_traits/is_pointer.hpp>
-#include <sprout/type_traits/is_lvalue_reference.hpp>
-#include <sprout/type_traits/is_rvalue_reference.hpp>
-#include <sprout/type_traits/is_member_object_pointer.hpp>
-#include <sprout/type_traits/is_member_function_pointer.hpp>
-#include <sprout/type_traits/is_enum.hpp>
-#include <sprout/type_traits/is_union.hpp>
-#include <sprout/type_traits/is_class.hpp>
-#include <sprout/type_traits/is_function.hpp>
-// 20.10.4.2 Composite type traits
-#include <sprout/type_traits/is_reference.hpp>
-#include <sprout/type_traits/is_arithmetic.hpp>
-#include <sprout/type_traits/is_fundamental.hpp>
-#include <sprout/type_traits/is_object.hpp>
-#include <sprout/type_traits/is_scalar.hpp>
-#include <sprout/type_traits/is_compound.hpp>
-#include <sprout/type_traits/is_member_pointer.hpp>
-// 20.10.4.3 Type properties
-#include <sprout/type_traits/is_const.hpp>
-#include <sprout/type_traits/is_volatile.hpp>
-#include <sprout/type_traits/is_trivial.hpp>
-#include <sprout/type_traits/is_trivially_copyable.hpp>
-#include <sprout/type_traits/is_standard_layout.hpp>
-#include <sprout/type_traits/is_pod.hpp>
-#include <sprout/type_traits/is_literal_type.hpp>
-#include <sprout/type_traits/is_empty.hpp>
-#include <sprout/type_traits/is_polymorphic.hpp>
-#include <sprout/type_traits/is_abstract.hpp>
-#include <sprout/type_traits/is_final.hpp>
-#include <sprout/type_traits/is_signed.hpp>
-#include <sprout/type_traits/is_unsigned.hpp>
-#include <sprout/type_traits/is_constructible.hpp>
-#include <sprout/type_traits/is_default_constructible.hpp>
-#include <sprout/type_traits/is_copy_constructible.hpp>
-#include <sprout/type_traits/is_move_constructible.hpp>
-#include <sprout/type_traits/is_assignable.hpp>
-#include <sprout/type_traits/is_copy_assignable.hpp>
-#include <sprout/type_traits/is_move_assignable.hpp>
-#include <sprout/type_traits/is_destructible.hpp>
-#include <sprout/type_traits/is_trivially_constructible.hpp>
-#include <sprout/type_traits/is_trivially_default_constructible.hpp>
-#include <sprout/type_traits/is_trivially_copy_constructible.hpp>
-#include <sprout/type_traits/is_trivially_move_constructible.hpp>
-#include <sprout/type_traits/is_trivially_assignable.hpp>
-#include <sprout/type_traits/is_trivially_copy_assignable.hpp>
-#include <sprout/type_traits/is_trivially_move_assignable.hpp>
-#include <sprout/type_traits/is_trivially_destructible.hpp>
-#include <sprout/type_traits/is_nothrow_constructible.hpp>
-#include <sprout/type_traits/is_nothrow_default_constructible.hpp>
-#include <sprout/type_traits/is_nothrow_copy_constructible.hpp>
-#include <sprout/type_traits/is_nothrow_move_constructible.hpp>
-#include <sprout/type_traits/is_nothrow_assignable.hpp>
-#include <sprout/type_traits/is_nothrow_copy_assignable.hpp>
-#include <sprout/type_traits/is_nothrow_move_assignable.hpp>
-#include <sprout/type_traits/is_nothrow_destructible.hpp>
-#include <sprout/type_traits/has_virtual_destructor.hpp>
-// 20.10.5 Type property queries
-#include <sprout/type_traits/alignment_of.hpp>
-#include <sprout/type_traits/rank.hpp>
-#include <sprout/type_traits/extent.hpp>
-// 20.10.6 Relationships between types
-#include <sprout/type_traits/is_same.hpp>
-#include <sprout/type_traits/is_base_of.hpp>
-#include <sprout/type_traits/is_convertible.hpp>
-// 20.10.7.1 Const-volatile modifications
-#include <sprout/type_traits/remove_const.hpp>
-#include <sprout/type_traits/remove_volatile.hpp>
-#include <sprout/type_traits/remove_cv.hpp>
-#include <sprout/type_traits/add_const.hpp>
-#include <sprout/type_traits/add_volatile.hpp>
-#include <sprout/type_traits/add_cv.hpp>
-// 20.10.7.2 Reference modifications
-#include <sprout/type_traits/remove_reference.hpp>
-#include <sprout/type_traits/add_lvalue_reference.hpp>
-#include <sprout/type_traits/add_rvalue_reference.hpp>
-// 20.10.7.3 Sign modifications
-#include <sprout/type_traits/make_signed.hpp>
-#include <sprout/type_traits/make_unsigned.hpp>
-// 20.10.7.4 Array modifications
-#include <sprout/type_traits/remove_extent.hpp>
-#include <sprout/type_traits/remove_all_extents.hpp>
-// 20.10.7.5 Pointer modifications
-#include <sprout/type_traits/remove_pointer.hpp>
-#include <sprout/type_traits/add_pointer.hpp>
-// 20.10.7.6 Other transformations
-#include <sprout/type_traits/aligned_storage.hpp>
-#include <sprout/type_traits/aligned_union.hpp>
-#include <sprout/type_traits/decay.hpp>
-#include <sprout/type_traits/enable_if.hpp>
-#include <sprout/type_traits/conditional.hpp>
-#include <sprout/type_traits/common_type.hpp>
-#include <sprout/type_traits/underlying_type.hpp>
-#include <sprout/type_traits/result_of.hpp>
+#include <sprout/type_traits/category.hpp>
+#include <sprout/type_traits/composite_category.hpp>
+#include <sprout/type_traits/property.hpp>
+#include <sprout/type_traits/property_query.hpp>
+#include <sprout/type_traits/relationship.hpp>
+#include <sprout/type_traits/cv_modification.hpp>
+#include <sprout/type_traits/ref_modification.hpp>
+#include <sprout/type_traits/sign_modification.hpp>
+#include <sprout/type_traits/array_modification.hpp>
+#include <sprout/type_traits/pointer_modification.hpp>
+#include <sprout/type_traits/transformation.hpp>
 
 #endif	// #ifndef SPROUT_TYPE_TRAITS_STD_TYPE_TRAITS_HPP
diff --git a/sprout/type_traits/transformation.hpp b/sprout/type_traits/transformation.hpp
new file mode 100644
index 00000000..9d7b74cd
--- /dev/null
+++ b/sprout/type_traits/transformation.hpp
@@ -0,0 +1,30 @@
+/*=============================================================================
+  Copyright (c) 2011-2015 Bolero MURAKAMI
+  https://github.com/bolero-MURAKAMI/Sprout
+
+  Distributed under the Boost Software License, Version 1.0. (See accompanying
+  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+=============================================================================*/
+#ifndef SPROUT_TYPE_TRAITS_TRANSFORMATION_HPP
+#define SPROUT_TYPE_TRAITS_TRANSFORMATION_HPP
+
+#include <sprout/config.hpp>
+// 20.10.7.6 Other transformations
+#include <sprout/type_traits/aligned_storage.hpp>
+#include <sprout/type_traits/aligned_union.hpp>
+#include <sprout/type_traits/decay.hpp>
+#include <sprout/type_traits/enable_if.hpp>
+#include <sprout/type_traits/conditional.hpp>
+#include <sprout/type_traits/common_type.hpp>
+#include <sprout/type_traits/underlying_type.hpp>
+#include <sprout/type_traits/result_of.hpp>
+
+#include <sprout/type_traits/identity.hpp>
+#include <sprout/type_traits/common_decay.hpp>
+#include <sprout/type_traits/arithmetic_promote.hpp>
+#include <sprout/type_traits/float_promote.hpp>
+#include <sprout/type_traits/complex_promote.hpp>
+#include <sprout/type_traits/inherit_if_type.hpp>
+#include <sprout/type_traits/enabler_if.hpp>
+
+#endif	// #ifndef SPROUT_TYPE_TRAITS_TRANSFORMATION_HPP
diff --git a/sprout/utility/reinter_cast.hpp b/sprout/utility/reinter_cast.hpp
index c41cd468..7c847b8f 100644
--- a/sprout/utility/reinter_cast.hpp
+++ b/sprout/utility/reinter_cast.hpp
@@ -8,9 +8,9 @@
 #ifndef SPROUT_UTILITY_REINTER_CAST_HPP
 #define SPROUT_UTILITY_REINTER_CAST_HPP
 
+#include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/type_traits/integral_constant.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
 #include <sprout/type_traits/enabler_if.hpp>
 #include <sprout/utility/forward.hpp>
 
@@ -19,12 +19,12 @@ namespace sprout {
 		template<typename From, typename To>
 		struct is_same_reinterpret_cast
 			: public sprout::bool_constant<
-				(sprout::is_reference<To>::value
-					&& sprout::is_same<typename sprout::decay<From>::type, typename sprout::decay<To>::type>::value
-					&& sprout::is_convertible<From, To>::value
+				(std::is_reference<To>::value
+					&& std::is_same<typename std::decay<From>::type, typename std::decay<To>::type>::value
+					&& std::is_convertible<From, To>::value
 					)
-					|| ((sprout::is_integral<To>::type || sprout::is_enum<To>::type || sprout::is_pointer<To>::type)
-						&& sprout::is_same<typename sprout::decay<From>::type, To>::value
+					|| ((std::is_integral<To>::type || std::is_enum<To>::type || std::is_pointer<To>::type)
+						&& std::is_same<typename std::decay<From>::type, To>::value
 						)
 
 			>
diff --git a/sprout/utility/value_holder/value_holder.hpp b/sprout/utility/value_holder/value_holder.hpp
index 995b0271..a66e25fe 100644
--- a/sprout/utility/value_holder/value_holder.hpp
+++ b/sprout/utility/value_holder/value_holder.hpp
@@ -15,7 +15,7 @@
 #include <sprout/utility/swap.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/utility/move.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/is_constructible.hpp>
 #include <sprout/optional/in_place.hpp>
 
 namespace sprout {
diff --git a/sprout/weed/attr_cnv/results/mem_ptr.hpp b/sprout/weed/attr_cnv/results/mem_ptr.hpp
index 98f2a9f5..28a23e5a 100644
--- a/sprout/weed/attr_cnv/results/mem_ptr.hpp
+++ b/sprout/weed/attr_cnv/results/mem_ptr.hpp
@@ -9,7 +9,7 @@
 #define SPROUT_WEED_ATTR_CNV_RESULTS_MEM_PTR_HPP
 
 #include <sprout/config.hpp>
-#include <sprout/type_traits/std_type_traits.hpp>
+#include <sprout/type_traits/result_of.hpp>
 
 namespace sprout {
 	namespace weed {