diff --git a/sprout/algorithm/fixed/bogo_sort.hpp b/sprout/algorithm/fixed/bogo_sort.hpp
index f491f58f..62ffa878 100644
--- a/sprout/algorithm/fixed/bogo_sort.hpp
+++ b/sprout/algorithm/fixed/bogo_sort.hpp
@@ -4,6 +4,7 @@
 #include <sprout/config.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/utility/pair/pair.hpp>
+#include <sprout/utility/pair/access.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/bogo_sort_result.hpp>
 
diff --git a/sprout/algorithm/fixed/bogo_sort_result.hpp b/sprout/algorithm/fixed/bogo_sort_result.hpp
index 0fdebe82..1699dccf 100644
--- a/sprout/algorithm/fixed/bogo_sort_result.hpp
+++ b/sprout/algorithm/fixed/bogo_sort_result.hpp
@@ -8,6 +8,7 @@
 #include <sprout/iterator/operation.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/utility/pair/pair.hpp>
+#include <sprout/utility/pair/access.hpp>
 #include <sprout/algorithm/is_sorted.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/shuffle_result.hpp>
diff --git a/sprout/algorithm/fixed/bozo_sort.hpp b/sprout/algorithm/fixed/bozo_sort.hpp
index a3e70e7e..1aa71ae6 100644
--- a/sprout/algorithm/fixed/bozo_sort.hpp
+++ b/sprout/algorithm/fixed/bozo_sort.hpp
@@ -4,6 +4,7 @@
 #include <sprout/config.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/utility/pair/pair.hpp>
+#include <sprout/utility/pair/access.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/bozo_sort_result.hpp>
 
diff --git a/sprout/algorithm/fixed/bozo_sort_result.hpp b/sprout/algorithm/fixed/bozo_sort_result.hpp
index 125d2184..13eeaa2f 100644
--- a/sprout/algorithm/fixed/bozo_sort_result.hpp
+++ b/sprout/algorithm/fixed/bozo_sort_result.hpp
@@ -8,6 +8,7 @@
 #include <sprout/iterator/operation.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/utility/pair/pair.hpp>
+#include <sprout/utility/pair/access.hpp>
 #include <sprout/algorithm/is_sorted.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/random_swap_result.hpp>
diff --git a/sprout/algorithm/fixed/random_swap_result.hpp b/sprout/algorithm/fixed/random_swap_result.hpp
index 59a523bc..59323f54 100644
--- a/sprout/algorithm/fixed/random_swap_result.hpp
+++ b/sprout/algorithm/fixed/random_swap_result.hpp
@@ -12,6 +12,7 @@
 #include <sprout/iterator/operation.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/utility/pair/pair.hpp>
+#include <sprout/utility/pair/access.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/swap_element.hpp>
 #include <sprout/workaround/detail/uniform_int_distribution.hpp>
diff --git a/sprout/algorithm/fixed/shuffle_result.hpp b/sprout/algorithm/fixed/shuffle_result.hpp
index a7dd433a..eaa17021 100644
--- a/sprout/algorithm/fixed/shuffle_result.hpp
+++ b/sprout/algorithm/fixed/shuffle_result.hpp
@@ -12,6 +12,7 @@
 #include <sprout/iterator/operation.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/utility/pair/pair.hpp>
+#include <sprout/utility/pair/access.hpp>
 #include <sprout/algorithm/fixed/result_of.hpp>
 #include <sprout/algorithm/fixed/swap_element.hpp>
 #include <sprout/numeric/fixed/iota.hpp>
diff --git a/sprout/cstring/strcmp.hpp b/sprout/cstring/strcmp.hpp
index c58ec23b..13eaf3c9 100644
--- a/sprout/cstring/strcmp.hpp
+++ b/sprout/cstring/strcmp.hpp
@@ -6,7 +6,8 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/utility/pair/pair.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/type_traits/is_char_type.hpp>
 
 namespace sprout {
diff --git a/sprout/cstring/strcspn.hpp b/sprout/cstring/strcspn.hpp
index 8a5cf43c..f0f66105 100644
--- a/sprout/cstring/strcspn.hpp
+++ b/sprout/cstring/strcspn.hpp
@@ -6,7 +6,8 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/type_traits/is_char_type.hpp>
 #include <sprout/cstring/strchr.hpp>
 
diff --git a/sprout/cstring/strspn.hpp b/sprout/cstring/strspn.hpp
index 3e75926c..1c64f9bf 100644
--- a/sprout/cstring/strspn.hpp
+++ b/sprout/cstring/strspn.hpp
@@ -6,7 +6,8 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/type_traits/is_char_type.hpp>
 #include <sprout/cstring/strchr.hpp>
 
diff --git a/sprout/cstring/strstr.hpp b/sprout/cstring/strstr.hpp
index 3a869726..2ebd5dae 100644
--- a/sprout/cstring/strstr.hpp
+++ b/sprout/cstring/strstr.hpp
@@ -6,7 +6,8 @@
 #include <sprout/config.hpp>
 #include <sprout/iterator/operation.hpp>
 #include <sprout/utility/pair/pair.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/type_traits/is_char_type.hpp>
 #include <sprout/detail/str.hpp>
 
diff --git a/sprout/functional/bind/bind.hpp b/sprout/functional/bind/bind.hpp
index 7f7afd63..94b552b4 100644
--- a/sprout/functional/bind/bind.hpp
+++ b/sprout/functional/bind/bind.hpp
@@ -9,7 +9,8 @@
 #include <sprout/index_tuple.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/utility/lvalue_forward.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/functional/ref.hpp>
 #include <sprout/functional/mem_fn.hpp>
 #include <sprout/functional/type_traits/weak_result_type.hpp>
diff --git a/sprout/numeric/inner_product.hpp b/sprout/numeric/inner_product.hpp
index 6efda8e8..730b887d 100644
--- a/sprout/numeric/inner_product.hpp
+++ b/sprout/numeric/inner_product.hpp
@@ -9,7 +9,8 @@
 #include <sprout/iterator/type_traits/common.hpp>
 #include <sprout/functional/plus.hpp>
 #include <sprout/functional/multiplies.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 
 namespace sprout {
 	namespace detail {
diff --git a/sprout/range/adaptor/piped.hpp b/sprout/range/adaptor/piped.hpp
index 3d9a9325..b1ad7d11 100644
--- a/sprout/range/adaptor/piped.hpp
+++ b/sprout/range/adaptor/piped.hpp
@@ -7,7 +7,8 @@
 #include <sprout/index_tuple.hpp>
 #include <sprout/utility/forward.hpp>
 #include <sprout/utility/lvalue_forward.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 
 namespace sprout {
 	namespace adaptors {
diff --git a/sprout/tuple/fused.hpp b/sprout/tuple/fused.hpp
index 29fcb48c..8ab5bb09 100644
--- a/sprout/tuple/fused.hpp
+++ b/sprout/tuple/fused.hpp
@@ -5,7 +5,8 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/index_tuple.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 #include <sprout/utility/forward.hpp>
 
 namespace sprout {
diff --git a/sprout/tuple/indexes.hpp b/sprout/tuple/indexes.hpp
index e6fb7a55..5eac5939 100644
--- a/sprout/tuple/indexes.hpp
+++ b/sprout/tuple/indexes.hpp
@@ -4,7 +4,8 @@
 #include <sprout/config.hpp>
 #include <sprout/index_tuple.hpp>
 #include <sprout/index_tuple/detail/make_indexes_helper.hpp>
-#include <sprout/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/tuple.hpp>
+#include <sprout/tuple/tuple/get.hpp>
 
 namespace sprout {
 	namespace tuples {
diff --git a/sprout/utility/pair/first.hpp b/sprout/utility/pair/first.hpp
index e49a2df9..761bfdea 100644
--- a/sprout/utility/pair/first.hpp
+++ b/sprout/utility/pair/first.hpp
@@ -4,6 +4,7 @@
 #include <sprout/config.hpp>
 #include <sprout/tuple/tuple/get.hpp>
 #include <sprout/utility/forward.hpp>
+#include <sprout/utility/pair/tuple.hpp>
 
 namespace sprout {
 	//
diff --git a/sprout/utility/pair/second.hpp b/sprout/utility/pair/second.hpp
index b9600690..5a18a4c9 100644
--- a/sprout/utility/pair/second.hpp
+++ b/sprout/utility/pair/second.hpp
@@ -4,6 +4,7 @@
 #include <sprout/config.hpp>
 #include <sprout/tuple/tuple/get.hpp>
 #include <sprout/utility/forward.hpp>
+#include <sprout/utility/pair/tuple.hpp>
 
 namespace sprout {
 	//